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

307 commits

Author SHA1 Message Date
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
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
9e7cef7d6b working on product sets
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-26 16:45:45 -07:00
Nikolaj Bjorner
3ae10abf04 remove extra qualifier
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-25 13:15:29 -07:00
Nikolaj Bjorner
ff501986f1 remove extra qualifier
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-25 13:15:01 -07:00
Nikolaj Bjorner
2dcbf192cc remove extra qualifier
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-25 13:14:20 -07:00
Nikolaj Bjorner
4d589de970 remove extra qualifier
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-25 13:13:43 -07:00
Nikolaj Bjorner
20728535e8 remove extra qualifier
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-25 13:12:49 -07:00
Nikolaj Bjorner
15734398d8 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-08-25 12:11:49 -07:00
Nikolaj Bjorner
8938de2ba2 fix build error reported by Ari
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-25 12:11:34 -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
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
Nikolaj Bjorner
33f74b9c9f sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-15 22:49:21 -07:00
Nikolaj Bjorner
ddb9e6e8d4 fix flipper
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-15 18:30:06 -07:00
Nikolaj Bjorner
be1cceba34 fix scope and mus with user-scopes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-15 11:29:08 -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
180b0d4ec9 add sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-12 19:24:31 -07:00
Nikolaj Bjorner
1652c16163 add missing code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-10 22:13:55 -07:00
Nikolaj Bjorner
39d90f914d NA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-10 21:27:07 -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
317e76a11b mss and mss-mus-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-03 20:23:10 -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
622d8b5cd1 moving to maxres consolidation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-03 00:18:09 -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
a41b1d34ce moving dual solver to maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-03 00:08:57 -07:00
Nikolaj Bjorner
5e026b7897 mss and maxres tuning
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-02 23:34:43 -07:00
Nikolaj Bjorner
9681dc12b1 tuning auxiliary literals and clauses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-02 14:25:04 -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
b928734348 perf improvements, mus
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-01 16:11:52 -07:00
Nikolaj Bjorner
6438c477b3 working on maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-31 23:35:41 -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
365f05b41a testing inc-sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-30 17:49:51 -07:00
Nikolaj Bjorner
bfc0af7820 testing inc-sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-30 16:35:46 -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
4f0de9a0cf implement user scopes for sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-30 09:27:03 -07:00
Nikolaj Bjorner
2b1af8fd50 updated sat solver for cores
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-29 14:38:17 -07:00