3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 00:55:31 +00:00
Commit graph

346 commits

Author SHA1 Message Date
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
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
8141dadc89 break on small cores
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-08 10:22:06 +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
e50e02e656 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2015-01-20 16:38:55 -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
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
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
e9baaa0900 rename 'or' to 'fml' toe mae gcc happy, reported by Geroge Karpenkov
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-11-25 10:23:41 -08:00
Nikolaj Bjorner
2dccfc0ce2 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-11-24 16:17:41 -08: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
444879db5f fix bug reported on stackoverflow on crash for unconstrained variables
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-11-05 13:51:27 +01: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
ce18421a7a fix box
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-15 14:29:39 -07:00
Nikolaj Bjorner
ff69ee049b fix non-termination
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-14 16:45:54 -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
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
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
caa35f6270 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-09-27 09:59:00 -07:00
Nikolaj Bjorner
1392dc020f local debug update
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-27 09:58:43 -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
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
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
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