mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 19:35:50 +00:00
Code Activity
5087 commits 24 branches 48 tags 158 MiB
Commit graph

62 commits

Author SHA1 Message Date
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
c58e640563 extract labels for optimal model. Fix to #325 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-11-18 14:53:08 -08:00
Nikolaj Bjorner
c2108f74f1 fix uninitialized variable 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-11-14 10:35:06 -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
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
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
552cbd840f adding soft-assertions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-01-23 13:06:11 -08:00
Nikolaj Bjorner
e24db56650 integrating new integer primal loop 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-01-20 16:38:45 -08: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
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
e6725b2344 merge unstable into opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-09-26 12:12:24 -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
75c114feab fix regression on push/pop 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-09-01 14:37:58 -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
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
b82a68f4d4 fix bug in sls 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-24 19:53:55 -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
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