3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-17 01:46:39 +00:00
Commit graph

81 commits

Author SHA1 Message Date
Nikolaj Bjorner
e0a86ccc1a add lrb/chb and experiment with them
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-28 10:48:31 -07:00
Nikolaj Bjorner
b915f78281 merge with master
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-07 17:05:57 -07:00
Nikolaj Bjorner
d14f2af5ae deal with subtraction that manages to sneak in. Issue #996
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-01 15:22:06 -07:00
Nikolaj Bjorner
aff02ca905 include 'stopwatch.h' to avoid ODR warnings, #994 2017-04-30 11:28:11 -07:00
Nikolaj Bjorner
8205b45839 initial integration of opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-27 19:13:00 -07:00
Nikolaj Bjorner
8032217fd1 tuning and fixing consequence finding, adding dimacs evaluation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-26 13:53:37 -07:00
Nikolaj Bjorner
d052155f6e parallelizing ccc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-23 14:46:46 -07:00
Nikolaj Bjorner
86a54dfec8 debugging ccc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-21 08:18:25 -07:00
Nikolaj Bjorner
e65f106a83 ccc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-19 08:59:49 -07:00
Nikolaj Bjorner
a3f4d58b00 use lookahead for simplification
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-18 16:58:56 -07:00
Nikolaj Bjorner
ec29a03c8f add facility to dispense with cancellation (not activated at this point). Address #961 by expanding recurisve function definitions that are not tautologies if the current model does not validate
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-07 21:22:38 -07:00
Nikolaj Bjorner
e47e8c67c0 introducing scoped detacth/attach of clauses to enforce basic sat solver invariants. Part of investigating #939:
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-22 14:12:47 -07:00
Nikolaj Bjorner
fda5809c89 local search updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-05 14:40:58 -08:00
Nikolaj Bjorner
88e7c240b7 working on lookahead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-27 10:59:59 -08:00
Nikolaj Bjorner
d8bb10d37f porting more code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-21 22:43:23 -08:00
Nikolaj Bjorner
2885ca7714 tune cardinalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-19 11:35:31 -08:00
Nikolaj Bjorner
42deeb3498 testing lookahead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-12 11:49:07 -08:00
Nikolaj Bjorner
8b4f3ac6f0 fix drat checker
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-10 18:04:54 -05:00
Nikolaj Bjorner
b6b6035cfb tuning and fixing drat checker
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-07 16:50:39 -08:00
Nikolaj Bjorner
61ade5e6cb tune cardinality solver for cache misses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-06 20:57:08 -08:00
Nikolaj Bjorner
7aeaf11ee4 adding clause sharing to par mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-05 22:24:20 -08:00
Nikolaj Bjorner
15283e4e7c expose extension conflict resolution as plugin to sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-05 10:08:57 -08:00
Nikolaj Bjorner
61341b8879 adding drat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-03 17:56:22 -08:00
Nikolaj Bjorner
0b711c5ef8 adding drat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-03 15:41:08 -08:00
Nikolaj Bjorner
c21b860d4e local updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-01 18:04:08 -08:00
Nikolaj Bjorner
256a0e2d82 move exchange par
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-01 12:12:26 -08:00
Nikolaj Bjorner
becce1d043 local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-01 12:09:16 -08:00
Nikolaj Bjorner
8b7bafbd9f updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 21:23:53 -08:00
Nikolaj Bjorner
92e2d920fd working on card for sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 14:03:27 -08:00
Nikolaj Bjorner
37ee4c95c3 adding parallel threads
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 02:09:08 -08:00
Nikolaj Bjorner
962979b09c rework sat.mus to use restart count for bounded minimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-26 13:28:40 -08:00
Nikolaj Bjorner
873d975c77 fix bug in consequence extraction: the order of bcp is not fixed between restarts, so the order of unit literals may not be preserved. This is relatively rare, so we optimize for the case where we assume bcp preserves order (and maybe miss some consequences)
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-17 13:41:15 -08:00
Nikolaj Bjorner
7df803c131 Fix unsound handling of upper bounds in wmax, thanks to Patrick Trentin for report and careful repros #847
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-15 11:52:48 -08:00
Nikolaj Bjorner
bc6b3007de remove unused features related to weighted check-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-13 20:53:22 -08:00
Nikolaj Bjorner
c69a86e647 fix bug in antecedent collection for consequence finding: once an antecedent is set, it should not be cleared
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-06 19:34:50 -05:00
Nikolaj Bjorner
74d3de01b3 enable incremental consequence finding with restart timeout
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-02 10:07:02 -08:00
Nikolaj Bjorner
aaf6e67ec8 add restart.max parameter to control cancellation based on restart count
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-25 17:43:47 -08:00
Nikolaj Bjorner
ea601dd403 fix and coallesce clique functionality
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-19 03:55:48 -08:00
Christoph M. Wintersteiger
bfaa9ddf63 Fixed potential SAT solver cleanup problem. Renamed functions for consistency. Relates to #570. 2016-11-14 17:42:21 +00:00
Christoph M. Wintersteiger
520e868add Fixed interruption cleanup bug in sat_solver. Relates to #570. 2016-11-14 17:42:20 +00:00
Nikolaj Bjorner
aec59e4ff7 add consequence finding to inc-sat-solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-16 15:43:28 -04:00
Nikolaj Bjorner
619cce0a52 add mutex preprocessing to maxsat, add parsing functions to C++ API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-07 12:42:08 -07:00
Nikolaj Bjorner
baee4225a7 reworking cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 16:21:24 -08:00
Nikolaj Bjorner
9b3e242990 adding rlimit resource limit facility to provide platform and architecture independent method for canceling activities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-09-28 13:37:59 -07:00
Nikolaj Bjorner
cc5d719d9e enable incremental bit-vector solving
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-09-01 09:48:35 -07:00
Nikolaj Bjorner
2fe0c05556 tuning pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-28 20:25:25 -07:00
Nikolaj Bjorner
78313c614d updateing pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-27 15:43:35 -07:00
Nikolaj Bjorner
8622356375 working on pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-27 08:09:46 -07:00
Nikolaj Bjorner
7c47809973 reworking pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-26 16:33:53 -07:00
Nikolaj Bjorner
af9143b64a tune initial propagation for pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-25 17:15:31 -07:00