3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-13 20:38:43 +00:00
Commit graph

105 commits

Author SHA1 Message Date
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)