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

8297 commits

Author SHA1 Message Date
Nikolaj Bjorner
a4dc68766d preparing for more efficient asymmetric branching
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-29 17:16:15 -08:00
Miguel Angelo Da Terra Neves
cba0599046 model converter fixes
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-11-29 17:14:49 -08:00
Nikolaj Bjorner
7e56d05dcf translation?
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-28 15:17:00 -08:00
Nikolaj Bjorner
a57628fbcc fix missing conversions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-28 14:12:05 -08:00
Nikolaj Bjorner
b5ff4602e9 fix model converter to include negation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-27 17:50:51 -08:00
Nikolaj Bjorner
f009dfcc00 update scoring approach
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-27 17:05:08 -08:00
Nikolaj Bjorner
99f2d916d5 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-11-27 16:24:24 -08:00
Nikolaj Bjorner
fbae881ece add option to bypass model converter during constraint addition. Simplify model definitions that come from blocked clauses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-27 16:24:14 -08:00
Nikolaj Bjorner
62e3906957 add options to perform transitive reduction and add hyper binary clauses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-27 10:53:22 -08:00
Nikolaj Bjorner
15d8532d27 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-11-22 14:38:57 -08:00
Nikolaj Bjorner
1101c927c9 prepare for transitive reduction / hyper-binary clause addition
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-22 13:46:02 -08:00
Nikolaj Bjorner
5f0a02b5f7 remove output
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-22 09:05:17 -08:00
Nikolaj Bjorner
8230cbef4c fix mc efficiency issues
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-22 08:55:21 -08:00
Nikolaj Bjorner
107bfb1438 print model-add in display method
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-21 21:26:07 -08:00
Nikolaj Bjorner
2313b14210 include mc0 for display method
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-21 20:40:43 -08:00
Nikolaj Bjorner
433239d5e9 add solver_from_string to APIs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-21 18:39:16 -08:00
Nikolaj Bjorner
46a96127be add solver_from_string to APIs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-21 18:37:20 -08:00
Nikolaj Bjorner
70b344513a add notes about quantifier ordering, bypass
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-21 16:15:02 -08:00
Nikolaj Bjorner
edffdf857c use expr-vectors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-21 16:07:10 -08:00
Nikolaj Bjorner
87a1e2b30e Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-11-21 13:32:44 -08:00
Nikolaj Bjorner
ef30868ad7 change lookahead equivalence filter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-21 13:32:40 -08:00
Nikolaj Bjorner
2d4d51d1e9
Merge pull request #9 from TheRealNebus/opt
Opt
2017-11-21 13:32:05 -08:00
Miguel Angelo Da Terra Neves
773d938925 re-adding simplified constraints based on model converter
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-11-21 13:24:14 -08:00
Miguel Angelo Da Terra Neves
d2f52ca359 Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-11-21 13:23:40 -08:00
Nikolaj Bjorner
c6cb739b44 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-11-20 12:09:46 -08:00
Nikolaj Bjorner
92cd92e690 expose probing configuration parameters
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-20 12:09:37 -08:00
Miguel Angelo Da Terra Neves
37c39f4073 merge
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-11-20 11:55:18 -08:00
Miguel Angelo Da Terra Neves
8cb5bb25f4 re-addition of simplified formulas by generic model converter
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-11-20 09:39:47 -08:00
Nikolaj Bjorner
bdbaf68f8b adding handlers for dimacs for solver_from_file, and opb, wncf for opt_from_file, #1361
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-19 15:21:09 -08:00
Nikolaj Bjorner
2f6283e1ed add converters
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-19 13:06:30 -08:00
Nikolaj Bjorner
2f218b0bdc remove also cores as arguments to tactics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-19 12:18:50 -08:00
Nikolaj Bjorner
4bbece6616 re-organize proof and model converters to be associated with goals instead of external
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-18 16:33:54 -08:00
Miguel Angelo Da Terra Neves
f476f94954 merge commit
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-11-18 15:07:18 -08:00
Nikolaj Bjorner
00f5308a0e fix copy function
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-17 23:50:48 -08:00
Nikolaj Bjorner
df6b1a707e remove proof_converter from tactic application, removing nlsat_tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-17 23:32:29 -08:00
Nikolaj Bjorner
b3bd9b89b5 prepare for inverse model conversion for formulas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-17 19:55:23 -08:00
Nikolaj Bjorner
dc0b2a8acf remove extension model converter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-17 17:25:35 -08:00
Nikolaj Bjorner
0d15b6abb7 add stubs for converting assertions, consolidate filter_model_converter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-17 14:51:13 -08:00
Nikolaj Bjorner
53e36c9cf9 re-organize iterators
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-16 09:29:44 -08:00
Nikolaj Bjorner
d8a2e9d008 initialize glue in constructor to ensure it gets set
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-15 15:57:07 -08:00
Nikolaj Bjorner
f7e14b3283 add global autarky option, update translation of solvers to retain vsids, remove stale code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-14 18:19:21 -08:00
Nikolaj Bjorner
38e4fb307c add useful shorthands to Solver interface
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-13 00:00:06 -08:00
Nikolaj Bjorner
0f4afc4536 fix bug in contains function
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-12 13:45:27 -08:00
Nikolaj Bjorner
37b94f1f90 fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-11 17:22:33 -08:00
Nikolaj Bjorner
6f273e7b8f bug fixes in uninitialized variables
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-11 12:09:33 -08:00
Nikolaj Bjorner
d7f9a3b37d fix crash bugs in sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-11 11:27:10 -08:00
Nikolaj Bjorner
a6da207b65 fix crash bugs in sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-11 11:25:43 -08:00
Nikolaj Bjorner
c522487a86 add iterators to C++ vectors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-10 16:59:35 -08:00
Nikolaj Bjorner
454e12fc49 update to vector format
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-10 15:28:16 -08:00
Nikolaj Bjorner
cb7e53aae4 reset backtrack level at each cube
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-09 10:04:32 -08:00