3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-18 05:20:26 +00:00
Commit graph

496 commits

Author SHA1 Message Date
Nikolaj Bjorner
352f8b6cb9 fixing local search
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-17 13:04:57 -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
2afd45b3c2 working on lookahead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-27 04:53:27 +02:00
Christoph M. Wintersteiger
0399e5e2d3 Fixed variable initialization warning 2017-03-24 14:49:24 +00: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
ac59e7b6d3 enable multiple local search threads
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-06 11:48:23 -08:00
Nikolaj Bjorner
cd4a2701db adding ability to ahve multiple local search threads
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-06 10:48:58 -08: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
c6f943e4d6 updates to local search integration
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-02 11:23:06 -08:00
Nikolaj Bjorner
40df1949f5 tweaking local search
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-02 10:18:12 -08:00
Nikolaj Bjorner
2c7a978c16 debugging local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-01 20:37:07 -08:00
Nikolaj Bjorner
59baaea219 integrating local search, supporting top-level inequalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-01 19:49:59 -08:00
Nikolaj Bjorner
fb4f6d654a add local search parameters and co-processor mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-27 23:35:50 -08:00
Nikolaj Bjorner
31c68b6e23 updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-27 23:19: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
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
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
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
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
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
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
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
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
37ee4c95c3 adding parallel threads
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 02:09:08 -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