3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-28 22:18:56 +00:00
Commit graph

248 commits

Author SHA1 Message Date
Nikolaj Bjorner
690689424d fix parallel solving bugs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-11 15:35:13 -05: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
6b4aec9b74 fixing bugs in dealing with non-0 based cardinality constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-07 20:59:28 -08:00
Nikolaj Bjorner
eaf845c2f4 updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-07 18:04:24 -08: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
54f2063c81 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-02-06 21:20:01 -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
66089a7aef fix compiler errors and memory issue with drat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-06 16:09:46 -08:00
Nikolaj Bjorner
4831c45ad8 fix issues in par
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-06 13:38:07 -08:00
Nikolaj Bjorner
fe105d94a0 fixes to sat-par
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-06 12:00:35 -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
5f70e4823d adding drat forward checking
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-03 22:41:40 -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
505133a4b3 debugging card
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-02 17:06:15 -08:00
Nikolaj Bjorner
6bb0b196e2 fix conflict level detection bug with plugins
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-02 11:04:15 -08:00
Nikolaj Bjorner
e9e0293d1a local updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-02 10:19:51 -08:00
Nikolaj Bjorner
bd0bd6052a Merge branch 'master' of https://github.com/Z3Prover/z3 2017-02-02 10:19:21 -08:00
Nikolaj Bjorner
9ca52a3361 fix bug in lexicographic handling in maxres: previous assumptions were not committed in corner cases
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-02 10:19:11 -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
9cfd412cd0 enable pb theory always as pb terms can be introduced during transformations. Issue #884
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-01 15:28:29 -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
cfff592a7f Merge branch 'master' of https://github.com/z3prover/z3 into opt 2017-02-01 12:09:31 -08:00
Nikolaj Bjorner
becce1d043 local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-01 12:09:16 -08:00
Nikolaj Bjorner
669c018242 updates on cardinality solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-01 07:43:43 -08:00
Nikolaj Bjorner
d889fcdca6 fix translation of <=
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-31 19:26:54 -08:00
Nikolaj Bjorner
7faa35ebdb fixing card
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-31 18:47:30 -08:00
Nikolaj Bjorner
f015e3e4cc fix bug in propagation of parameters to combined solvers
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-31 17:17:58 -08:00
Nikolaj Bjorner
bdfa84c6fe fix issues with running parallel solver: random strategy should not be a default on all solvers. Also reuse base solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-31 13:22:03 -08:00
Nikolaj Bjorner
ff72e3114b Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-01-31 06:46:06 -08:00
Nikolaj Bjorner
9f461dbe7b local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-31 06:46:01 -08:00
Nikolaj Bjorner
c12ee4ea1a memory allocate
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-31 06:45:19 -08:00
Nikolaj Bjorner
b4dd2f07b2 testing card_extension
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 21:53:26 -08:00
Nikolaj Bjorner
8b7bafbd9f updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 21:23:53 -08:00
Nikolaj Bjorner
1a95c33775 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-01-30 18:42:53 -08:00
Nikolaj Bjorner
685fb5d7c4 preparing for cardinality
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 18:42:39 -08:00
Nikolaj Bjorner
1d1949e395 ensure that parallel threads are only invoked when thread count > 1
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 18:30:06 -08:00
Nikolaj Bjorner
32b5e54c8d working on card extension
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 17:22:06 -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
76bc4f0b38 refine parsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 11:30:42 -08:00
Nikolaj Bjorner
a412a554eb merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 09:39:23 -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
0123b63f8a experimenting with cardinalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-27 16:12:46 -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
4782e19086 fix bug in sat-simplifier decreasing heap values of variables that are not in the heap
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-25 16:21:51 -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