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

2442 commits

Author SHA1 Message Date
Ken McMillan
c007a5e5bd merged with unstable 2014-08-06 11:16:06 -07:00
Ken McMillan
7bf87e76ea fix for tree interpolation 2014-08-05 11:11:43 -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
Christoph M. Wintersteiger
39646bac3e added operator[] to obj_map for convenience
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-07-31 16:32:25 +01: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
Christoph M. Wintersteiger
06a4a3599d Added git hashcode information to (get-info :version)
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-07-29 18:04:54 +01:00
Nikolaj Bjorner
0e9511b597 unsat core for SAT solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-29 08:39:34 -07:00
Nikolaj Bjorner
66f626b50e local changes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-29 07:41:08 -07:00
Nikolaj Bjorner
e98acf4ece working on adding basic cores to efficient SAT solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-29 07:22:59 -07:00
Nikolaj Bjorner
19050d1c4c merge Fixedpoint.cs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-28 12:20:48 -07:00
Nikolaj Bjorner
0c750bc714 update sat solver signature
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-28 12:19:46 -07:00
Christoph M. Wintersteiger
e10f256100 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2014-07-28 19:38:53 +01:00
Christoph M. Wintersteiger
b423418810 FPA fixed omissions reported by user xor88 (codeplex discussion 554193)
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-07-28 19:37:58 +01:00
Christoph M. Wintersteiger
1944283253 FPA unified function names 2014-07-28 19:36:11 +01:00
Nikolaj Bjorner
4ab9c8fd00 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2014-07-28 09:59:40 -07:00
Nikolaj Bjorner
3ca8591347 take theory explanation into account
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-28 09:59:35 -07:00
Nikolaj Bjorner
96dc933c99 merging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-28 08:33:16 -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
ff64adf292 rename hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-26 12:45:21 -07:00
Leonardo de Moura
24961dc5f1 feat(ast/ast_smt_pp): display quantifier QID when printing proofs, feature requested by Dan Rosen
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2014-07-25 14:42:00 -07:00
Christoph M. Wintersteiger
1abf3beaba bugfix for Python 3
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-07-24 16:52:32 +01:00
Christoph M. Wintersteiger
5b1a98a155 Bugfix for Python 3 2014-07-24 13:53:56 +01:00
Nikolaj Bjorner
44751c0ef8 Add missing .NET API functions for parsing rules into fixedpoint object
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-23 15:27:24 -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
bf35a62da7 adding mus extraction
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-21 23:28:19 +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
4957e71408 make get_vars populate all indices with sorts even if variable does not occur in rule. This makes the use of get_vars less prone to callers having to double check for null pointers
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-21 17:12:39 +02:00
Nikolaj Bjorner
72fe197bda fix model generation bug reported by Saga Chaki
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-14 17:06:36 +02:00
Nikolaj Bjorner
752a6b2e33 fix quantifier elimination bugs reported by Berdine and Bornat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-14 16:46:27 +02:00
Nikolaj Bjorner
dd786bb5bf fix quantifier elimination bugs reported by Berdine and Bornat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-14 15:41:03 +02:00
Nikolaj Bjorner
e4dedbbefc fix quantifier elimination bugs reported by Berdine and Bornat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-14 15:38:22 +02:00
Nikolaj Bjorner
465eafbf45 fix assertion for integrality, lax noprogress bail out code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-09 05:04:00 +02:00
Nikolaj Bjorner
4f7d872d59 fix model transformation bug in bit blaster rule transformer, reported by Sagar Chaki
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-08 11:21:19 +02:00
Nikolaj Bjorner
d6de73a2d1 fix model converter in inliner. Bug reported by Sagar Chaki
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-06 18:11:57 +02:00