mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-27 05:26:01 +00:00
Code Activity
7709 commits 64 branches 52 tags 178 MiB
Commit graph

430 commits

Author SHA1 Message Date
Nikolaj Bjorner
41ac4ff308 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-09-27 07:20:36 -07:00
Nikolaj Bjorner
340b460f74 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-27 07:20:34 -07:00
Nikolaj Bjorner
0833a9ee14 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-27 07:15:06 -07:00
Nikolaj Bjorner
3a832e5b24 tidy 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-26 20:14:49 -07:00
Nikolaj Bjorner
1149955893 working on new clause organization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-26 14:39:33 -07:00
Nikolaj Bjorner
7b9156dd5b adding new clause management 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-26 10:17:57 -07:00
Nikolaj Bjorner
e2ed658c6c working on new clause management 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-26 08:31:10 -07:00
Nikolaj Bjorner
e7449f3811 working on new clause management 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-26 00:05:53 -07:00
Nikolaj Bjorner
d41696b91e adding new clause management 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-25 20:29:53 -07:00
Nikolaj Bjorner
ced2029ae9 local changes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-25 16:37:15 -07:00
Nikolaj Bjorner
82922d92f7 add cube functionality 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-24 13:29:46 -07:00
Nikolaj Bjorner
ae9a6664d4 add cube mode 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-24 10:53:57 -07:00
Nikolaj Bjorner
2751cbc270 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-23 22:36:36 -05:00
Nikolaj Bjorner
edb3569599 updates to sorting networks 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-23 22:36:19 -05:00
Nikolaj Bjorner
cab4e4b461 add feature to display benchmark in format seen by SAT solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-21 18:32:46 -05:00
Nikolaj Bjorner
3c4ac9aee5 add HS and unit literal reward schemes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 12:02:50 -07:00
Nikolaj Bjorner
651587ce01 merge with master branch 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 09:39:22 -07:00
Nikolaj Bjorner
d03e3765b9 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-09-19 08:31:56 -07:00
Nikolaj Bjorner
d1a227493a n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 08:31:31 -07:00
Nikolaj Bjorner
4813bcc11f merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 08:31:01 -07:00
Nikolaj Bjorner
431d318958 experiments with ccc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 08:19:08 -07:00
Nikolaj Bjorner
394d54fa8b fix missin clause generation for ad-hoc handling of conjunction #1245 2017-09-05 09:54:52 -07:00
Nikolaj Bjorner
5db349f6fa raise an exception if trying proof generation for the SAT solver. Stackoverflow question https://stackoverflow.com/questions/45885321/check-function-while-qf-fd-logic-is-set-throws-accessviolationexception 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-27 23:52:27 -07:00
Nikolaj Bjorner
2b82fd5d0c updated include directives 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-01 10:51:47 -07:00
Nikolaj Bjorner
b19f94ae5b make include paths uniformly use path relative to src. #534 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-31 13:24:11 -07:00
Nikolaj Bjorner
b1090f4399 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-31 09:49:11 -07:00
Nikolaj Bjorner
b70da2a555 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-07-28 10:32:02 -07:00
Nikolaj Bjorner
b2b2c636f8 update for equivalences 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-28 10:30:23 -07:00
Nikolaj Bjorner
1946441e17 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-07-27 18:42:16 -07:00
Nikolaj Bjorner
b482dbd589 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-27 17:02:27 -07:00
Nikolaj Bjorner
30b0d5ba13 Merge branch 'master' of https://github.com/z3prover/z3 2017-07-24 10:49:54 -07:00
Nikolaj Bjorner
8c67e958ff n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-16 18:51:01 +02:00
Christoph M. Wintersteiger
da34de340d Fixed bug in sat model converter. Fixes #1148. 2017-07-15 20:25:13 +01:00
Nikolaj Bjorner
55f54b4fdc fixing overflow checking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-07 13:53:26 -07:00
Nikolaj Bjorner
53c38f02d5 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-06 22:12:18 -07:00
Nikolaj Bjorner
da263601e6 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-05 19:19:36 -07:00
Nikolaj Bjorner
b419a0e4a4 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-05 14:32:13 -07:00
Nikolaj Bjorner
5262248823 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-04 11:13:05 -07:00
Nikolaj Bjorner
4132c44f8d update to avoid difference in debug/release builds 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-02 16:24:59 -07:00
Nikolaj Bjorner
480296ed96 updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-02 11:27:02 -07:00
Nikolaj Bjorner
9b631f982b n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-30 17:48:04 -07:00
Nikolaj Bjorner
bcf0ee7709 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-29 18:53:58 -07:00
Nikolaj Bjorner
7580644d15 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-29 08:11:27 -07:00
Nikolaj Bjorner
085c18a92a add pb to local search 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 20:29:13 -07:00
Nikolaj Bjorner
5c83dfee06 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 18:04:08 -07:00
Nikolaj Bjorner
e176c4ba9a rename to ba_solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 17:54:16 -07:00
Nikolaj Bjorner
6fad478a18 reorg 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 17:46:29 -07:00
Nikolaj Bjorner
a28a8304b7 Dev (#56) 
* introduce int_solver.h

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* add int_solver class

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* track which var is an integer

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add queries for integrality of vars

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* resurrect lp_tst in its own director lp

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add file

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add_constraint has got a body

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* fix add_constraint and substitute_terms_in_linear_expression

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* after merge with Z3Prover

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* adding stub check_int_feasibility()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* 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>

* small fix in lar_solver.cpp

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* adding some content to the new check_int_feasibility()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* 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>

* test

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* Dev (#53)

* change in a comment

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Disabled debug output

* removing FOCI2 interface from interp

* remove foci reference from cmakelist.txt

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

* 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>

* adding nra

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

* debugging nra

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

* 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>

* n/a

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

* integrate nlsat

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

* tidy

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

* preserve is_int flag

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* remove a debug printout

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Dev (#54)

* change in a comment

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Disabled debug output

* removing FOCI2 interface from interp

* remove foci reference from cmakelist.txt

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

* 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>

* adding nra

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

* debugging nra

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

* 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>

* n/a

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

* integrate nlsat

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

* tidy

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

* use integer test from lra solver, updated it to work on term variables

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

* fix equality check in assume-eq

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

* fix model_is_int_feasible

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* untested gcd_test()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* call fill_explanation_from_fixed_columns()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add the call to pivot_fixed_vars_from_basis() to int_solver.cpp::check()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* port more of theory_arith_int.h

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* use statistics of lar_solver by theory_lra.cpp

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* port more code to int_solver.cpp

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add an assert

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* more int porting

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* fix a bug in pivot_fixed_vars_from_basis

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* small change

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* implement find_inf_int_base_column()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* catch unregistered vars in add_var_bound

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add a file

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* compile for vs2012

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* fix asserts in add_var_bound

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* fix the lp_solver init when workig on an mps file

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* towards int_solver::check()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* change in int_solver::check() signature

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add handlers for lia moves

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

* spacing

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 13:12:12 -07:00
Nikolaj Bjorner
6f4c873b29 debugging 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-27 13:18:20 -07:00
Nikolaj Bjorner
94416bea52 fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-27 09:07:55 -07:00