3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-05 15:33:59 +00:00
Commit graph

359 commits

Author SHA1 Message Date
Nikolaj Bjorner
4f0de9a0cf implement user scopes for sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-30 09:27:03 -07:00
Nikolaj Bjorner
2b1af8fd50 updated sat solver for cores
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-29 14:38:17 -07:00
Nikolaj Bjorner
4ab27eff78 refactor weighted-maxsat into separate files
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-28 08:31:57 -07:00
Nikolaj Bjorner
9f1b2ccfc4 restructure maxsmt solvers, flatten weighted/non-weighted versions, fix bugs and simplify mus/max-res
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-23 23:53:03 +02:00
Nikolaj Bjorner
5e9bf2ef53 maxres revised to handle weighted constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-22 15:42:08 +02:00
Nikolaj Bjorner
bf35a62da7 adding mus extraction
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-21 23:28:19 +02:00
Nikolaj Bjorner
582dbe509c first implementation of maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-21 22:24:34 +02:00
Nikolaj Bjorner
53f82e3239 update model during Lex
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-06 17:33:54 +02:00
Nikolaj Bjorner
519c9dba25 update hitting set implementation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-23 11:28:38 -07:00
Nikolaj Bjorner
04407938be custom HS solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-18 17:31:00 -07:00
Nikolaj Bjorner
d7d85aa18a working on HS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-17 22:32:32 -07:00
Nikolaj Bjorner
84d971b69a working on HS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-17 17:05:05 -07:00
Nikolaj Bjorner
b64b12cae3 working on HS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-17 12:54:50 -07:00
Nikolaj Bjorner
bad03822b4 working on HS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-16 16:55:48 -07:00
Nikolaj Bjorner
63550d8a1a bug fixes in hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-15 05:44:03 -07:00
Nikolaj Bjorner
ef62a52fff cleanup
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-14 18:45:16 -07:00
Nikolaj Bjorner
7fbe7124f9 bugfixes to hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-14 17:29:53 -07:00
Nikolaj Bjorner
5427964c54 use approximate hitting set implementation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-14 14:08:55 -07:00
Nikolaj Bjorner
960e8ea1d5 working on hitting sets
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-08 14:12:54 +01:00
Nikolaj Bjorner
4415df3fcf various fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-02 19:10:20 +05:30
Nikolaj Bjorner
57fc0f3f55 bug fixes to min-max, and experiments with hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-28 15:44:39 -07:00
Nikolaj Bjorner
2071029bb3 hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-27 15:45:33 -07:00
Nikolaj Bjorner
e370fbb7ed updated maxhs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-27 11:38:43 -07:00
Nikolaj Bjorner
698705b7fa initial version of HS maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-24 18:39:43 -07:00
Nikolaj Bjorner
61dcdcb9d1 separate inc sat solver for now
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-15 11:25:05 -07:00
Nikolaj Bjorner
33e2f2012d inc sat experiment
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-15 08:46:20 -07:00
Nikolaj Bjorner
d849b5c637 experiment with sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-14 19:40:58 -07:00
Nikolaj Bjorner
81c2560854 experimenting with inc-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-14 15:13:26 -07:00
Nikolaj Bjorner
6d6abb4dde experimenting with inc_sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-14 09:27:47 -07:00
Nikolaj Bjorner
6821d61ac4 working on incremental sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-13 17:19:19 -07:00
Nikolaj Bjorner
03979fd580 fix up pareto callback mechanism
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-13 12:48:17 -07:00
Nikolaj Bjorner
1ea376e310 edits
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-13 10:33:09 -07:00
Nikolaj Bjorner
cad1e5cab3 move to scoped state, change default parameter for sls until bv is debugged
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-11 18:39:36 -07:00
Nikolaj Bjorner
e9a11bd93b fix emptines check
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-10 17:43:42 -07:00
Nikolaj Bjorner
fb0305d5ec update timeout logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 22:27:35 -07:00
Nikolaj Bjorner
cf55854d22 adding scoped state
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 17:21:16 -07:00
Nikolaj Bjorner
252b9e8819 fix lower/upper bound estimate with respect to offset
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 16:32:17 -07:00
Nikolaj Bjorner
02b419c939 add logging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 11:36:08 -07:00
Nikolaj Bjorner
f1194ffeaa add logging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 11:34:15 -07:00
Nikolaj Bjorner
4dc71acde0 add logging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 11:31:54 -07:00
Nikolaj Bjorner
05a39cb2cf fix wrong simplex backtracking
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 08:51:07 -07:00
Nikolaj Bjorner
d2db8007d8 tuning pb/max
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-06 04:01:10 -07:00
Nikolaj Bjorner
7ade3f2c04 fix sls based on pkb120
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-05 19:22:34 -07:00
Nikolaj Bjorner
f1ebf2002a tuning sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-05 16:40:54 -07:00
Nikolaj Bjorner
25ad9d2ee1 tuning based on benchmarks from Robert White
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-05 14:43:06 -07:00
Nikolaj Bjorner
182fea2d7b fix bcd2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-05 10:21:16 -07:00
Nikolaj Bjorner
20cb8a3092 added pareto utility
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-25 03:00:31 +02:00
Nikolaj Bjorner
55863b4bb5 fix build problems, fix scoping
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-23 14:05:59 +02:00
Nikolaj Bjorner
27fa7077a6 fix compiler warnings/errors reported by Robert White
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-23 09:22:31 +02:00
Nikolaj Bjorner
23a74b3c26 fix assertions reported by Christoph
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-23 08:07:37 +02:00