3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Commit graph

266 commits

Author SHA1 Message Date
Nikolaj Bjorner
e407b81f70 update for layout
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 15:56:04 -08:00
Nikolaj Bjorner
411dcc8925 working on pre-selection
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-23 17:05:08 -08:00
Nikolaj Bjorner
db9e8d96d4 working on lookahead solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-23 16:00:20 -08:00
Nikolaj Bjorner
54f145b364 initialize
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-22 15:11:18 -08:00
Nikolaj Bjorner
43ddad0ecd initial pass
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-22 14:57:25 -08:00
Nikolaj Bjorner
748ada2acc adding unit test entry point
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-22 11:46:47 -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
eec10c6e32 porting more code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-21 21:33:18 -08:00
Nikolaj Bjorner
eec1d9ef84 porting more code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-21 21:19:13 -08:00
Nikolaj Bjorner
747ff19aba adding skeleton for local search
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-21 20:34:39 -08:00
Nikolaj Bjorner
77aac8d96f fix handling of global parameters, exceptions when optimization call gets cancelled
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-21 17:04:10 -08:00
Nikolaj Bjorner
98c5a779b4 add xor parity solver feature
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-20 16:55:00 -08:00
Nikolaj Bjorner
cb050998e5 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-02-19 11:35:46 -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
0cf5af121a Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-02-19 11:32:18 -08:00
Nikolaj Bjorner
dc588b54f7 add sorting-based pb encoding in the style of minisat+
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-19 11:31:34 -08:00
Nikolaj Bjorner
2bcb875559 add option to disable cardinality solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-16 08:36:16 -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
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