3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-07 15:55:46 +00:00
Commit graph

87 commits

Author SHA1 Message Date
Nikolaj Bjorner
33f74b9c9f sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-15 22:49:21 -07:00
Nikolaj Bjorner
ee1a1b1135 refactor sat/sls interface. Remove wpm2 and bvsls dependencies
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-15 10:40:44 -07:00
Nikolaj Bjorner
e832bdd257 fix bug in blocked clause elimination that was enabled for external variables, fix other bugs in maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-10 21:23:05 -07:00
Nikolaj Bjorner
d429e72e92 v2 of dual maxres engine
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-03 18:50:21 -07:00
Nikolaj Bjorner
6a4c08c7cb moving to maxres consolidation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-03 00:17:55 -07:00
Nikolaj Bjorner
8814ba0629 testing maxres with sat core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-02 12:27:57 -07:00
Nikolaj Bjorner
39414d8b8d testing inc_sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-31 22:29:47 -07:00
Nikolaj Bjorner
e8056e066d enable bvsat, multi disjoint cores for dual-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-30 12:57:30 -07:00
Nikolaj Bjorner
3fefed69b7 incremental sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-30 11:12:15 -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
582dbe509c first implementation of maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-21 22:24:34 +02: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
4dc71acde0 add logging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 11:31:54 -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
7237be768b fixing bugs in refactored code exposed from White's example
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-17 11:06:43 -07:00
Nikolaj Bjorner
00f45579cc refactor weighted maxsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-14 16:24:23 -07:00
Nikolaj Bjorner
ede9549818 fix compilation errors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-25 13:43:45 -07:00
Nikolaj Bjorner
51cb63b6c0 adding simplex
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-02-12 20:20:52 -08:00
Nikolaj Bjorner
5adb4a22d1 enable partial results
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-06 16:23:37 -08:00
Nikolaj Bjorner
0deb951873 different strategies for weighted
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-20 12:04:17 +01:00
Nikolaj Bjorner
02f74f1028 trying Cezary's example
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-17 05:03:20 +02:00
Nikolaj Bjorner
fe5c42c90f fixes to bugs exposed by regressions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-15 05:23:47 +02:00
Nikolaj Bjorner
ac893e907f fixes to maxsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-14 16:06:03 +02:00
Nikolaj Bjorner
04824d86df fixes to model generation of weighted maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-14 09:37:42 +02:00
Nikolaj Bjorner
2c577a304d bug fixes to pb; working on model extraction
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-10 15:16:58 -08:00
Nikolaj Bjorner
ddb30c51b5 debugging lia2maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-08 12:17:33 -08:00
Nikolaj Bjorner
370a4b66de update lower bounds from feasible solutiosn
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-07 22:09:57 -08:00
Nikolaj Bjorner
af5d989d6c change verbosity level
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-02 21:51:20 -08:00
Nikolaj Bjorner
2b2d0e155c debugged new pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-18 18:03:49 -08:00
Nikolaj Bjorner
86e22c1186 add validation option
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-18 09:44:20 -08:00
Nikolaj Bjorner
293a97bdfc working on core-maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-09 15:54:38 -08:00
Nikolaj Bjorner
ba05f79415 bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 22:40:43 -08:00
Nikolaj Bjorner
6e1c186017 enable answer generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 20:55:01 -08:00
Nikolaj Bjorner
816029c862 missing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 20:04:30 -08:00