3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Commit graph

7063 commits

Author SHA1 Message Date
Nikolaj Bjorner
e306287d7b updates to nra_solver integration to call it directly from theory_lra instead of over lar_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-25 14:04:48 -07:00
Nikolaj Bjorner
d2b2aedef3 Merge branch 'dev' of https://github.com/nikolajbjorner/z3 2017-05-25 08:54:00 -07:00
Nikolaj Bjorner
1086eaaa1f debugging nra
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-24 21:46:19 -07:00
Lev Nachmanson
73e919c002 test
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-05-24 17:31:17 -07:00
Nikolaj Bjorner
b18dc7d052 adding nra
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-24 17:24:36 -07:00
Nikolaj Bjorner
4726d32e2f Dev (#51)
* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding more nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* nlsat integration

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding constraints

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* add missing initialization

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-24 16:32:14 -07:00
Nikolaj Bjorner
7a809fe4f0 adding nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-24 14:56:59 -07:00
Nikolaj Bjorner
80bb084611 add missing initialization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-24 14:47:09 -07:00
Nikolaj Bjorner
d45c56da3f adding nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-24 14:44:16 -07:00
Nikolaj Bjorner
fc53c5b638 adding nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-24 14:41:02 -07:00
Lev Nachmanson
09530bb6bc adding some content to the new check_int_feasibility()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2017-05-24 10:12:42 -07:00
Nikolaj Bjorner
dcc6284557 adding constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-24 08:57:10 -07:00
Nikolaj Bjorner
b9ca8b435f nlsat integration
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 20:45:58 -07:00
Nikolaj Bjorner
f3a0b7e0cd change command-line experience for pareto fronts. It now requires multiple check-sat calls to loop over the fronts. This allows querying each model in turn. #1008 2017-05-23 20:05:10 -07:00
Nikolaj Bjorner
e231f4bc87 adding more nlsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 18:50:18 -07:00
Lev Nachmanson
93a3c486b0 small fix in lar_solver.cpp
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2017-05-23 18:32:08 -07:00
Nikolaj Bjorner
8ecd8a2a52 Dev (#50)
* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 18:07:58 -07:00
Nikolaj Bjorner
db54cab8b2 initial skeletons for nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 16:26:46 -07:00
Nikolaj Bjorner
f1ca1de408 initial skeletons for nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 16:12:46 -07:00
Lev Nachmanson
1f425824ff adding stub check_int_feasibility()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2017-05-23 15:46:53 -07:00
Nikolaj Bjorner
49faaaa8f1 allowing non-literal assumptions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 15:01:00 -07:00
Nikolaj Bjorner
6f2cd4817b ensure arith.reflect has default true
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 14:09:45 -07:00
Nikolaj Bjorner
3f89c1418b fix test build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 12:51:14 -07:00
Nikolaj Bjorner
23ff580a67 get rid of timeb dependencies, pull request #1040
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 12:16:43 -07:00
Nikolaj Bjorner
db4bbecb27 Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-05-23 10:52:27 -07:00
Nikolaj Bjorner
9633c16d75 local updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 10:52:14 -07:00
Nikolaj Bjorner
edb164587f get rid of a simplifier dependency
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 10:12:32 -07:00
Nikolaj Bjorner
af4346f16a expose arith reflection, get rid of long m_manager attribute in asserted fromulas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 10:04:29 -07:00
Nikolaj Bjorner
2834fea9b3 fix x64 warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 08:58:21 -07:00
Nikolaj Bjorner
90af406338 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-05-23 08:51:38 -07:00
Nikolaj Bjorner
8e9739d3b0 work around crash #1039
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 08:51:26 -07:00
Nikolaj Bjorner
2cbeedec69 accept hereditarily finite sorts in datalog engine
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-22 19:32:43 -07:00
Nikolaj Bjorner
77b2a015a2 rewrite pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-22 17:47:46 -07:00
Nikolaj Bjorner
622d8c951c remove redundant data-type function declarations from pretty-printed output. #1034
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-22 14:40:42 -07:00
Nikolaj Bjorner
f9f0b2221d bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-22 14:27:34 -07:00
Nikolaj Bjorner
f698efa403 Merge branch 'master' of https://github.com/z3prover/z3 into opt 2017-05-22 12:59:36 -07:00
Nikolaj Bjorner
f90ae40480 Merge branch 'master' of https://github.com/NikolajBjorner/z3 into opt 2017-05-22 12:53:19 -07:00
Nikolaj Bjorner
71eb7e81b5 bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-22 12:52:53 -07:00
Nikolaj Bjorner
cfd598fabb Merge pull request #1036 from delcypher/cmake_remove_foci2_stub
[CMake] Remove FOCI2 stub code.
2017-05-22 09:20:54 -07:00
Nikolaj Bjorner
2a26c2c65f Merge pull request #1037 from delcypher/cmake_log_sync
[CMake] Add CMake option `API_LOG_SYNC` that corresponds to the
2017-05-22 09:20:33 -07:00
Dan Liew
702347ddac [CMake] Add CMake option API_LOG_SYNC that corresponds to the
`--log-sync` option added to the python/Makefile build system
added in dee7c29b19 .
2017-05-22 17:11:25 +01:00
Dan Liew
a15419cf46 [CMake] Remove FOCI2 stub code.
The CMake build system doesn't need to support FOCI2 because it
has been removed from Z3's codebase in 4b61a864e2 .
2017-05-22 16:45:13 +01:00
Nikolaj Bjorner
d1fec7c029 bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-21 15:39:05 -07:00
Nikolaj Bjorner
b782ec35cc avoid print statements from assertions when the assertion does not trigger. Stackoverflow question http://stackoverflow.com/questions/44094927/creating-formula-taking-too-much-time-in-z3py
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-21 10:35:59 -07:00
Nikolaj Bjorner
2d0ab6a615 pb propagation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-19 22:45:17 -07:00
Nikolaj Bjorner
691788f449 remove stale references to foci
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-19 20:21:08 -07:00
Nikolaj Bjorner
f1f0f78617 remove foci reference from cmakelist.txt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-19 18:31:34 -07:00
Nikolaj Bjorner
4b61a864e2 Merge pull request #1033 from kenmcmil/remove_foci
removing FOCI2 interface from interp
2017-05-19 18:29:23 -07:00
Ken McMillan
bf7c6292bd removing FOCI2 interface from interp 2017-05-19 16:21:57 -07:00
Christoph M. Wintersteiger
a258236229 Disabled debug output 2017-05-19 18:51:52 +01:00