mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-13 20:38:43 +00:00
Code Activity
17320 commits 23 branches 48 tags 157 MiB
Commit graph

203 commits

Author SHA1 Message Date
Nikolaj Bjorner 41ca956012 expose import model converter over Python, document it, add partial order axioms for lex, disable linear order axioms, prepare ground for re-adding clauses from reconstruction stack 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-07-18 13:45:13 -07:00
Nikolaj Bjorner 333b32b0d2 disable adding redundant ite clauses as lemma. Add as non-redundant 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-06-21 16:32:45 +02:00
Nikolaj Bjorner cbe52e298b remove tracing, fix doctext 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-06-21 15:08:26 +02:00
Nikolaj Bjorner e0d8cefde4 remove cooperate 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-06-12 20:15:46 -07:00
Nikolaj Bjorner a74ac93bcc fix #2196 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-03-22 13:34:31 -07:00
Nikolaj Bjorner 057151c7a8 fix #2188 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-03-18 07:56:25 -07:00
Nikolaj Bjorner 22783a4bcb import more from csp 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-11 13:09:28 -08:00
Nikolaj Bjorner d04e72819a abstract solver API 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-06 19:42:01 +01:00
Nikolaj Bjorner d3d392da41 adding maxlex, delay mk_true() calls in goal2sat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-24 21:36:40 -08:00
Nikolaj Bjorner 074ed0d874 fix warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-11-24 17:39:19 -08:00
Nikolaj Bjorner ec36a9c495 fix user push/pop with ba constraints 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-11-22 12:40:23 -08:00
Nikolaj Bjorner e9d615e309 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-14 15:16:22 -07:00
Bruce Mitchener cdfc19a885 Use nullptr. 2018-10-02 09:11:19 +07:00
Nikolaj Bjorner c8730daea7 fix memory leak, add strengthening 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-09-03 16:56:07 -07:00
Nikolaj Bjorner 96d3b98a44 fix #1783, wronge clausification of negated pb inequalities. Signs were ignored 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-08-11 13:33:09 -07:00
Nikolaj Bjorner 84c7df75d6 record statistics setting in config_params so that fp engine can access them, fix serialization bug when check-assumptions returns unsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-08-06 16:21:27 -07:00
Nuno Lopes cef17c22a1 remove some allocs from exceptions 2018-07-02 17:08:02 +01:00
Nikolaj Bjorner 335d672bf1 fix #1675, regression in core processing in maxres 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-19 23:23:19 -07:00
Nikolaj Bjorner ff0f257102 remove iff 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:48 -07:00
Nikolaj Bjorner c513f3ca09 merge with master 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-25 14:57:01 -07:00
Nikolaj Bjorner f04e805fa4 add hiding to auxiliary declarations created in mc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-06 18:02:37 -08:00
Nikolaj Bjorner 718e5a9b6c add unit extraction 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-06 01:08:17 -08:00
Nikolaj Bjorner 4c1379e8c9 bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-19 21:49:03 -08:00
Bruce Mitchener 76eb7b9ede Use nullptr. 2018-02-12 14:05:55 +07:00
Nikolaj Bjorner 8fb7fb9f98 add missing caching of PB/cardinality constraints, increase limit for compiling cardinalities to circuits 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-11 19:27:00 -08:00
Bruce Mitchener 7167fda1dc Use override rather than virtual. 2018-02-10 09:56:33 +07:00
Nikolaj Bjorner 5e482def18 fix local search encoding bug 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-08 07:27:32 -08:00
Nikolaj Bjorner 61f99b242e xor to xr to avoid clang issue 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-07 15:25:02 -08:00
Nikolaj Bjorner 20fe08d80c fix more bugs with compilation of pb equalities 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-04 09:51:45 -08:00
Nikolaj Bjorner 354c16454a fix bug in translation of pbeq into sat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-03 22:19:25 -08:00
Nikolaj Bjorner 3b1810d893 fix hidden tautology bug on non-learned clauses 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-21 23:18:41 -08:00
Nikolaj Bjorner 7fc1b75cb8 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2018-01-19 21:36:24 -08:00
Nikolaj Bjorner e4f29a7b8a debugging mc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-19 21:09:52 -08:00
Nikolaj Bjorner 67de30ca4a Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2018-01-19 13:57:25 -08:00
Nikolaj Bjorner d6c49adddb local 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-19 13:57:21 -08:00
Nikolaj Bjorner c7ee532173 fix static 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-18 10:44:40 -08:00
Nikolaj Bjorner 7b8101c502 fix bugs related to model-converter 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-17 12:25:24 -08:00
Nikolaj Bjorner 3047d930e1 fix xor processing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-13 19:53:50 -08:00
Nikolaj Bjorner d79c33fb21 fix model bugs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-13 16:12:38 -08:00
Nikolaj Bjorner 1c2966f8e9 updates to model generation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-11 11:20:23 -08:00
Nikolaj Bjorner b1724b2f62 fix update to variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-28 14:39:16 -08:00
Nikolaj Bjorner 0b424942ab bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-23 14:42:21 -08:00
Nikolaj Bjorner 8198a8ce7b bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-23 14:41:16 -08:00
Nikolaj Bjorner c199344bbf fix sat model converter to work with incrementality 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-18 11:12:27 -08:00
Nikolaj Bjorner 427b5ef002 set eliminated to false on literals used in clauses 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-30 11:20:19 -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 a57628fbcc fix missing conversions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-28 14:12:05 -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 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
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
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
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 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 7c743b3d16 add direct FromFile method to solvers so that model transformations are loaded along with assertions. 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-02 09:25:18 -05:00
Nikolaj Bjorner fd49a0c89c added facility to persist model transformations 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-02 00:05:52 -05:00
Nikolaj Bjorner caaf0ba33c model-add/del 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-01 22:32:22 -05:00
Nikolaj Bjorner 3de8c193ea implementing model updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-30 16:11:51 -05:00
Nikolaj Bjorner 829c140087 ensure that bca takes also lemmas into account 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-27 15:40:25 -07:00
Nikolaj Bjorner ac0202630e fix non-termination bug with retained clauses 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-25 15:40:11 -07:00
Nikolaj Bjorner 32711790e8 bug fixes reported by Miguel 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-25 13:36:48 -07:00
Nikolaj Bjorner 4d48811efd updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-13 11:22:47 -07:00
Nikolaj Bjorner 81ad69214c fixing lookahead/ba + parallel 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-11 17:06:28 -07:00
Nikolaj Bjorner 79ceaa1d13 fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-11 13:17:57 -07:00
Nikolaj Bjorner 6c4cadd223 tidy 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-28 00:33:56 -07:00
Nikolaj Bjorner 651587ce01 merge with master branch 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 09:39:22 -07:00
Nikolaj Bjorner 394d54fa8b fix missin clause generation for ad-hoc handling of conjunction #1245 2017-09-05 09:54:52 -07:00
Nikolaj Bjorner b19f94ae5b make include paths uniformly use path relative to src. #534 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-31 13:24:11 -07:00
Nikolaj Bjorner e176c4ba9a rename to ba_solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 17:54:16 -07:00
Nikolaj Bjorner 6fad478a18 reorg 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 17:46:29 -07:00
Nikolaj Bjorner ce592d7716 add facility to add lemmas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-12 19:44:02 -07:00
Nikolaj Bjorner c33dce1161 extract lemmas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-04 14:12:55 -07:00
Nikolaj Bjorner 7d245be4e1 enable exposing internal solver state on interrupted solvers 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-30 17:33:27 -07:00
Nikolaj Bjorner c49550ff2d enable pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-07 18:03:38 -07:00
Nikolaj Bjorner 59baaea219 integrating local search, supporting top-level inequalities 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-01 19:49:59 -08:00
Nikolaj Bjorner 388b025d9e expose xor solver separate from cardinality solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-25 16:29:46 -08:00
Nikolaj Bjorner 43ddad0ecd initial pass 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-22 14:57:25 -08:00
Nikolaj Bjorner 77aac8d96f fix handling of global parameters, exceptions when optimization call gets cancelled 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-21 17:04:10 -08:00
Nikolaj Bjorner 98c5a779b4 add xor parity solver feature 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-20 16:55:00 -08:00
Nikolaj Bjorner 2885ca7714 tune cardinalities 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-19 11:35:31 -08:00
Nikolaj Bjorner 61ade5e6cb tune cardinality solver for cache misses 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-06 20:57:08 -08:00
Nikolaj Bjorner 0b711c5ef8 adding drat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-03 15:41:08 -08:00
Nikolaj Bjorner d889fcdca6 fix translation of <= 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-01-31 19:26:54 -08:00
Nikolaj Bjorner 8b7bafbd9f updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-01-30 21:23:53 -08:00
Nikolaj Bjorner 685fb5d7c4 preparing for cardinality 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-01-30 18:42:39 -08:00
Nikolaj Bjorner 189d449cff fix generation of wcnf 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-18 14:49:45 -08:00
Nikolaj Bjorner 461e88e34c additional robustness check for incremental sat solver core when it recieves interpreted constants, added PB equality to interface and special handling of equalities to adddress performance gap documented in #755 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-25 20:32:13 -07:00
Nikolaj Bjorner c3f4124a9f trace down recent exposed regression in goal2sat, incorporate Scott's suggestion on making vector<std::string inaccessible 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-18 14:50:10 -07:00
Nikolaj Bjorner d614fedde2 more merges with qsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-19 12:41:41 -07:00
Nikolaj Bjorner a7e2fb31e3 updates to resource exceptions, update master possibly handle pull request issue 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-12-12 11:36:49 -08:00
Nikolaj Bjorner 2a051719d8 cleanup deprecated critical sections, fix cancellation for par_or_else tactic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-12-12 09:43:00 -08:00
Nikolaj Bjorner baee4225a7 reworking cancellation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-12-11 16:21:24 -08:00
Nikolaj Bjorner cc5d719d9e enable incremental bit-vector solving 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-09-01 09:48:35 -07:00
Nikolaj Bjorner 203c5015c8 fix debian amd64 warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-05-18 15:17:21 -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 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 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 2b1af8fd50 updated sat solver for cores 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-07-29 14:38:17 -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
Leonardo de Moura cf28cbab0a saved params work 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-29 17:19:12 -08:00
Leonardo de Moura a274cac2a0 bindings --> api; and moved nlsat/sat/subpaving tactics 2012-10-31 13:25:36 -07:00
Renamed from src/tactic/sat/goal2sat.cpp (Browse further)