mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-02-17 14:21:45 +00:00
Code Activity
20696 commits 55 branches 57 tags 176 MiB
Commit graph

332 commits

Author SHA1 Message Date
Nikolaj Bjorner
d06207f072 remove ite terms from objectives to synchronize values in tableau with objective value. Fixes part of (three repros) from issue #120 
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
 2015-06-02 10:38:22 -07:00
Nikolaj Bjorner
1714182c38 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-29 11:08:25 -07:00
Nikolaj Bjorner
a2448be0cd print pareto model in check-sat too 
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
 2015-05-29 08:55:44 -07:00
Nikolaj Bjorner
ed7e0e11a8 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-05-28 20:55:13 -07:00
Nuno Lopes
6c22edc988 fix assorted compiler warnings 
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
 2015-05-16 11:44:58 +01:00
Nikolaj Bjorner
a0f0b53686 fixes to #52, #53 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-04-28 14:48:59 -07:00
Nikolaj Bjorner
e944f89505 fix bug introduced when clearing state between calls to Pareto/Box 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-04-02 02:36:01 -07:00
Nikolaj Bjorner
fc36d861a7 update default to maxres for MaxSAT, reset pareto and box state on every constraint update 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-04-01 19:32:50 -07:00
Nikolaj Bjorner
f8d04118d8 switch models for multiple box objectives. Feature request at codeplex issue 194, George Karpenov. Usage model is same as Pareto fronts you call check-sat multiple times until retrieving unsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
 2015-04-01 16:21:56 -07:00
nikolajbjorner
fbf8289394 probe also hard constraints before enabling SAT solver. Bug reported by Zvonimir Pavlinovic 
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
 2015-02-24 14:02:23 -08:00
Nikolaj Bjorner
c3232693f0 use PB solver instead of full arithmetic for bouding Pareto fronts so that difference logic theory isn't broken. Codeplex issue 175 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-02-22 09:46:21 -08: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
ef57e4abe5 extract theory symbols from Boolean objectives 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-01-05 19:42:06 -08:00
Nikolaj Bjorner
21ea48bfd8 epsilon should have real type, reported by GeorgeKarpenkov, codeplex issue 145 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-12-15 16:27:35 -08:00
Nikolaj Bjorner
f4dfb9ac82 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-12-09 20:57:34 +01:00
Nikolaj Bjorner
08cb8b8de8 address divergence in the case of shared theory symbols. Codeplex issue 147, thanks to George Karpenkov 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-12-09 16:04:25 +01:00
Nikolaj Bjorner
f71fd2afb5 disable unconstrained elimination pre-processing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-11-24 16:17:22 -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
630a3d6ea8 integrate bounds from original model 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-10-15 15:11:31 -07:00
Nikolaj Bjorner
69a5634e7e adding symba designated strategy (back?) to optsmt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-10-14 16:33:55 -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
cb88968588 tuning maxres 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-10-02 17:10:51 -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
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
72f09e4729 better verbose pretty printing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-09-09 16:57:43 -07:00
Nikolaj Bjorner
f151879c0b enable neat vs. less neat pretty priting as an option 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-09-09 16:25:41 -07:00
Nikolaj Bjorner
c1580fb85a follow logic annotation/enable diff logic when configured 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-09-07 11:52:14 -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
3f8083dfa6 fix push/pop bugs in optimize context, add example to c++, fix bug in arithemtic bounds axiom addition 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-09-02 09:32:38 -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
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
f748a03ac7 opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-16 22:31:54 -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
53f82e3239 update model during Lex 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-07-06 17:33:54 +02:00
Nikolaj Bjorner
4415df3fcf various fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-06-02 19:10:20 +05:30
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
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
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
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