mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-24 20:16:00 +00:00
Code Activity
16461 commits 61 branches 52 tags 177 MiB
Commit graph

204 commits

Author SHA1 Message Date
Jamey Sharp
426306376f
CNF conversion refactoring (#5547) 
* split sat2goal out of goal2sat

These two classes need different things out of the sat::solver class,
and separating them makes it easier to fiddle with their dependencies
independently.

I also fiddled with some headers to make it possible to include
sat_solver_core.h instead of sat_solver.h.

* limit solver_core methods to those needed by goal2sat

And switch sat2goal and sat_tactic over to relying on the derived
sat::solver class instead. There were no other uses of solver_core.

I'm hoping this makes it feasible to reuse goal2sat's CNF conversion
from places like the tseitin-cnf tactic, so they can be unified into a
single implementation.
 2021-09-20 08:53:10 -07:00
Nikolaj Bjorner
f3f83d0445 #5429 2021-07-30 13:43:02 -07:00
Nikolaj Bjorner
4a6083836a call it data instead of c_ptr for approaching C++11 std::vector convention. 2021-04-13 18:17:35 -07:00
Nikolaj Bjorner
a1f484fa35 na 2021-03-19 16:42:45 -07:00
Nikolaj Bjorner
026065ff71 streamline pb solver interface and naming after removal of xor 2021-02-28 12:32:04 -08:00
Nikolaj Bjorner
083d09aa81 fix #5016 2021-02-14 13:52:10 -08:00
Nikolaj Bjorner
0ec567fe15 integrate v2 of lns 2021-02-04 15:47:40 -08:00
Nikolaj Bjorner
fb1509d011 expose internal API for set_phase 2021-02-02 14:29:06 -08:00
Nikolaj Bjorner
b87405cc92 tune user-pop 2021-01-18 16:51:34 -08:00
Nikolaj Bjorner
12198d13ac fix #4794 2020-12-02 12:24:35 -08:00
Nikolaj Bjorner
9f34af5e18 update justifications only at level 0 2020-11-20 11:12:55 -08:00
Nikolaj Bjorner
367e5fdd52
delay internalize (#4714) 
* adding array solver

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

* use default in model construction

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

* debug delay internalization

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

* bv

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

* arrays

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

* get rid of implied values and bounds

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

* redo egraph

* remove out

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

* remove files

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-09-28 19:24:16 -07:00
Nikolaj Bjorner
b7ec4489a6
bv fixes and tuning (#4703) 
* heap size information

* bv tuning

* fix #4701

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

* throw on set-has-size #4700

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-09-21 19:54:53 -07:00
Nikolaj Bjorner
6f63f8761c
optimizations to bv-solver and euf-egraph (#4698) 
* additional bit-vector propagators

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

* rename restrict (not a keyword, but well) #4694, tune euf

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

* merge

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

* add pb rewriting to pb2bv #4697

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-09-20 06:47:27 -07:00
Nikolaj Bjorner
8691ef1d4d
additional bit-vector propagators (#4695) 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-09-18 12:38:29 -07:00
Nikolaj Bjorner
549753845e
bv and gc of literals (#4692) 
* bv and gc of literals

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

* overload

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

* diseq

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

* diseq

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-09-17 14:24:07 -07:00
Nikolaj Bjorner
2328a6e839 add a way to use new smt core for selected logics 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-09-14 10:43:52 -07:00
Nikolaj Bjorner
796e2fd9eb
arrays (#4684) 
* arrays

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

* arrays

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

* na

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

* arrays

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

* na

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

* fill

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

* update drat and fix euf bugs

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

* na

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

* na

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

* na

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

* const qualifiers

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

* na

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

* reorg ba

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

* reorg

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

* build warnings

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-09-13 19:29:59 -07:00
Nikolaj Bjorner
7327023c88
add variable replay, remove MacOS from Travis (#4681) 
* na

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

* na

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

* na

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

* na

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

* na

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

* na

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

* na

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

* na

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

* dbg

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

* bv

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

* drat and fresh

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

* move ackerman functionality

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

* na

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

* debugability

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

* towards debugability

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

* missing file

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

* na

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

* na

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

* remove csp

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

* replay variables created by solver

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

* remove old function

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

* fix scoped-limit

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-09-08 05:57:07 -07:00
Nikolaj Bjorner
d02b0cde7a
running updates to bv_solver (#4674) 
* na

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

* na

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

* na

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

* na

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

* na

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

* na

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

* na

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

* na

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

* dbg

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

* bv

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

* drat and fresh

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

* move ackerman functionality

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

* na

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

* debugability

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

* towards debugability

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

* missing file

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

* na

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

* na

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

* remove csp

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-09-07 20:35:32 -07:00
Nikolaj Bjorner
116390833b prepare for theory plugins 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-09-02 10:42:18 -07:00
Nikolaj Bjorner
ecddaeae66 na 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-09-01 07:15:13 -07:00
Nikolaj Bjorner
ed7d969366 elaborate on smt/drat format outline, expose euf mode as config 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-08-31 19:29:23 -07:00
Nikolaj Bjorner
4d41db3028 adding euf 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-08-31 14:36:16 -07:00
Nikolaj Bjorner
93ee2a68a4 persist fields 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-08-28 13:41:50 -07:00
Nikolaj Bjorner
4244ce4aad adding ack/model 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-08-28 12:55:47 -07:00
Nikolaj Bjorner
c21a2fcf9f sat solver setup 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-08-26 09:40:42 -07:00
Nikolaj Bjorner
d0e20e44ff booyah 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-07-04 15:56:30 -07:00
Nikolaj Bjorner
b889b110ee bool_vector, some spacer tidy 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-04-05 12:59:04 -07:00
Nikolaj Bjorner
945cd3169e fix #3440 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-03-22 10:43:52 -07:00
Mathias Soeken
4d0519fe3c Initial NPN3 finder with MUX and MAJ finder. 2020-02-27 11:13:24 -08:00
Nikolaj Bjorner
dd3e77107e rename aig_simplifier to cut_simplifier 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-02-18 18:29:59 -08:00
Nikolaj Bjorner
d4d3971ecd add LUT finder 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-02-04 09:59:01 -08:00
Nuno Lopes
d79692b185 remove unused file & hide a few symbols 2020-01-31 17:13:28 +00:00
Nikolaj Bjorner
93d1091ad9 bcd 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-01-16 20:37:22 -08:00
Nikolaj Bjorner
e0a41a18c3 add validation to aig_simplifier, start BIG-based masking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-01-11 20:47:38 -08:00
Nikolaj Bjorner
ca243428f8 make cutset maintainance incremental, expose option for goal2sat to populate aig 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-01-08 16:39:49 -08:00
Nikolaj Bjorner
57846e50fa use variable id as level, separate cut-set updates, add missing reset in pdd 2020-01-08 02:15:45 -08:00
Nikolaj Bjorner
d27a949ae9 add anf and aig simplifier modules, cut-set enumeration, aig_finder, hoist out xor_finder from ba_solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-01-05 16:46:49 -08:00
Nikolaj Bjorner
40a4326ad4 add anf 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-01-05 16:46:49 -08:00
Nikolaj Bjorner
5dfe4a4b48 ensure relevancy isn't increased between calls 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-11-23 15:42:44 -08:00
Nikolaj Bjorner
604e6b2705 fix #2418, change types in sat_solver to avoid cast 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-07-24 11:52:28 -07:00
Nikolaj Bjorner
41ca956012 expose import model converter over Python, document it, add partial order axioms for lex, disable linear order axioms, prepare ground for re-adding clauses from reconstruction stack 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-07-18 13:45:13 -07:00
Nikolaj Bjorner
cd93cdd819 na 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-07-09 07:40:29 +01:00
Nikolaj Bjorner
d17248821a include chronological backtracking, two-phase sat, xor inprocessing, probsat, ddfw 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-06-13 08:45:21 -07:00
Nikolaj Bjorner
4c799c144a fix gc to not remove ternary clauses that are on assignment trail. This addresses issue with drat proofs that don't pass drat-trim due to deletion during gc, but use in conflicts 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-22 11:14:20 +01:00
Nikolaj Bjorner
3548057bd1 fix detection of arithmetic operations 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-20 14:00:05 +01:00
Nikolaj Bjorner
caa15ea04d enable cardinality constraints in nla2bv 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-19 18:17:07 +01:00
Nikolaj Bjorner
89bf2d4368 add API for setting variable activity 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-15 12:05:24 -08:00
Nikolaj Bjorner
eec1da5a15 move restart test to after propagation, clean up drat generation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-12 15:49:12 -08:00