3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-16 17:36:39 +00:00
Commit graph

68 commits

Author SHA1 Message Date
Nikolaj Bjorner
23b9d3ef55 fix at-most-1 constraint compiler bug
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-22 18:50:16 -07:00
Nikolaj Bjorner
619cce0a52 add mutex preprocessing to maxsat, add parsing functions to C++ API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-07 12:42:08 -07:00
Nikolaj Bjorner
f452895f5f add mutex pass
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-04 14:45:23 -07:00
Nikolaj Bjorner
5d5004193b avoid crash on box models under cancellation. Issue #654
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-06-29 04:54:31 -07:00
Nikolaj Bjorner
0fdf01e410 avoid crash on box models under cancellation. Issue # SASSERT(!m_box_models.empty());
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-06-29 04:53:28 -07:00
Nikolaj Bjorner
c72ed3e6b4 update core minimization code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-06-23 21:39:28 -07:00
Nikolaj Bjorner
c7ff05cc78 enable core minimization with qsat in case it turns out to be useful
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-06-12 15:58:12 -07:00
Nikolaj Bjorner
9f5a117443 move mus to solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-06-10 16:24:14 -07:00
Nikolaj Bjorner
5994c5a948 fix partial model tracking over cancellation/exceptions, reported by August Shi. Fix regression test for fp-to-real, reset the pre-processor in inc_sat_solver on exceptions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-07 16:42:29 -08:00
Nikolaj Bjorner
32b6b2da44 moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 13:13:11 -08:00
Nikolaj Bjorner
653416153d use appropriate MaxSAT solver even if there are no soft constraints. Also avoid PB constraints when all soft constraints are false. Reported by Klaus Becker
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-02 08:18:51 -08:00
Nikolaj Bjorner
b25e8e2288 tune lexicographic products, avoid push/pop and ensure correction sets are not used for multiple objectives
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-09-13 16:00:45 +02:00
Nikolaj Bjorner
0ed38ed59b add option for using corr set and use partial cores
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-30 14:48:24 -07:00
Nikolaj Bjorner
b2ebd095cb fix for unintialized variable m_conflict_lvl
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-24 17:01:46 -07:00
Nikolaj Bjorner
149549dd52 fix wcnf front-end and unsat case in pd
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-23 14:24:51 -07:00
Nikolaj Bjorner
ee458fa601 revising pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-23 12:09:07 -07:00
Nikolaj Bjorner
546a9b8f03 revising pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-23 10:53:39 -07:00
Nikolaj Bjorner
da0c12cdba move display method to before first SAT call
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-21 18:29:36 -07:00
Nikolaj Bjorner
a78fc031bc adding facility to dump wcnf benchmarks
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-21 07:26:49 -07:00
Nikolaj Bjorner
a9807878ea reworking pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-20 12:20:30 -07:00
Nikolaj Bjorner
e3cb0e2d8b reworking pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-20 12:06:27 -07:00
Nikolaj Bjorner
911ffc370a separate MaxSMT functionality to enable using this independently (and incrementally) of overall context
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-16 09:11:28 +01:00
Nikolaj Bjorner
761c7d9a40 adding annotation to logging to show number of columns and rows, adding dual propagation sketch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-25 04:01:18 -08:00
Nikolaj Bjorner
f1d9228b94 fix bug in context push/pop for sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-20 16:30:46 -08:00
Nikolaj Bjorner
301f441801 bypass simplifier if (m_is_clausal) {
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-22 09:02:08 -07:00
Nikolaj Bjorner
f7f4feaa47 fix lex bug for maxres case
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-11 01:05:30 -07:00
Nikolaj Bjorner
e1c2049343 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-10-06 08:37:41 -07:00
Nikolaj Bjorner
db20b2502d try qx
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-04 19:50:42 -07:00
Nikolaj Bjorner
f3d2535b46 another unit test for Nuno
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-03 16:58:46 -07:00
Nikolaj Bjorner
0b1c180808 fix lexicographic product for MaxSMT
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-01 13:49:23 -07:00
Nikolaj Bjorner
08dcd51594 fix bugs in incremental operation of sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-27 12:04:54 -07:00
Nikolaj Bjorner
99ff13b651 opt + udoc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-17 11:39:25 -07:00
Nikolaj Bjorner
73070585b8 fix bug in core generation in legacy core: it ignores complementary literals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-14 13:06:01 -07:00
Nikolaj Bjorner
a96fa0c555 remove deprecated maxsat solvers, adjust values inline
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-14 11:55:47 -07:00
Nikolaj Bjorner
019ff77613 fix sorting network bug, add network compilation,...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-11 18:47:21 -07:00
Nikolaj Bjorner
18b491eee0 fixes to maxres/mss
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-03 10:03:56 -07:00
Nikolaj Bjorner
b5bbf83847 update core generation to be partial, update maxres to use current model too
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-02 19:05:28 -07:00
Nikolaj Bjorner
afe7fc367b working on maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-30 12:40:37 -07:00
Nikolaj Bjorner
83a7d1a658 adding options to maxres for experiments, include option to pretty print module parameters in smt2 style
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-30 11:46:29 -07:00
Nikolaj Bjorner
b45b2872d8 basic primal/dual
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-29 16:24:46 -07:00
Nikolaj Bjorner
5fdb58348e working on mus-mss
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-29 15:34:48 -07:00
Nikolaj Bjorner
3da60804fc basic primal/dual
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-29 09:52:56 -07:00
Nikolaj Bjorner
c928f776da working on mss/mus v2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-29 08:39:31 -07:00
Nikolaj Bjorner
1b9529e1e1 fix scope bugs per Klaus Becker's examples
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-29 01:55:32 -07:00
Nikolaj Bjorner
bd8875bf5f add MUS/MCS plan
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-28 21:18:17 -07:00
Nikolaj Bjorner
16e0ad14aa add MUS/MCS plan
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-28 20:56:41 -07:00
Nikolaj Bjorner
b596828d23 add DDNF based engine
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-21 18:04:46 -07:00
Nikolaj Bjorner
a47f3df703 fix bug in unsat core extraction in sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-18 23:43:51 -07:00
Nikolaj Bjorner
1c56d6ee95 align lengths of weights and soft constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-18 01:17:26 -07:00
Nikolaj Bjorner
f748a03ac7 opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-16 22:31:54 -07:00