3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-18 14:49:01 +00:00
Commit graph

1081 commits

Author SHA1 Message Date
Nikolaj Bjorner 301f441801 bypass simplifier if (m_is_clausal) {
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-22 09:02:08 -07:00
Nikolaj Bjorner ce18421a7a fix box
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-15 14:29:39 -07:00
Nikolaj Bjorner cbf470422e remove extra verbose output
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-05 12:10:23 -07:00
Nikolaj Bjorner c706e91019 merge with unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-05 10:37:55 -07:00
Nikolaj Bjorner db20b2502d try qx
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-04 19:50:42 -07:00
Nikolaj Bjorner 6a3f75822d fix format bug (issue 126) and smaller nits in sat solver (const annotation, disable elimination of external or already elimianted variables)
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-04 18:35:18 -07:00
Nikolaj Bjorner cb88968588 tuning maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-02 17:10:51 -07:00
Nikolaj Bjorner 83a0611cb9 adding option to selectively enable bcd
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-29 22:15:24 -07:00
Nikolaj Bjorner 60d7872cc8 adding simple BCE
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-29 18:00:34 -07:00
Nikolaj Bjorner 2cfa4dcb53 add bceq experiment
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-29 10:58:31 -07:00
Nikolaj Bjorner 989569b154 add bceq experiment
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-29 10:57:31 -07:00
Nikolaj Bjorner 08dcd51594 fix bugs in incremental operation of sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-27 12:04:54 -07:00
Nikolaj Bjorner e57e5328ce configuration update to SAT solver on creation time. Adding random_seed to sat parameters to enable command-line and module mode to work at the level of sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-26 16:42:11 -07:00
Nikolaj Bjorner 73070585b8 fix bug in core generation in legacy core: it ignores complementary literals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-14 13:06:01 -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 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 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 9e7cef7d6b working on product sets
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-26 16:45:45 -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 16bffab8fd add saner Shannon decomposition
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-24 14:21:15 -07:00
Nikolaj Bjorner aa695f6a6c improve incremental use of sat solver: carry over simplification threshold
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-24 12:47:57 -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 8822bc1755 fix bug in unsat core finding
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-20 16:03:25 -07:00
Nikolaj Bjorner 78c03ed835 fix crash on delete clauses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-19 19:36:15 -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 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 a02cab2194 wsls code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-13 16:58:02 -07:00
Nikolaj Bjorner 999db1e280 sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-13 01:22:45 -07:00
Nikolaj Bjorner cafb31ff94 sls updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-12 22:14:57 -07:00
Nikolaj Bjorner 1412c183d4 finish sls code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-12 21:42:33 -07:00
Nikolaj Bjorner 311183e19a local updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-12 19:26:06 -07:00
Nikolaj Bjorner 276bef1c20 local updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-12 19:25:39 -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 470b5c11b9 mus logging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-11 08:06:29 -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 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 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 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
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 0c750bc714 update sat solver signature
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-28 12:19:46 -07:00
Nikolaj Bjorner 7fbe7124f9 bugfixes to hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-14 17:29:53 -07:00
Nikolaj Bjorner 5427964c54 use approximate hitting set implementation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-14 14:08:55 -07:00
Nikolaj Bjorner d849b5c637 experiment with sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-14 19:40:58 -07:00
Christoph M. Wintersteiger e8dde34353 removed unnecessary changes for bvsls
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-26 13:10:06 +00:00
Christoph M. Wintersteiger 52390989dd Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-03-26 13:06:05 +00:00
Nikolaj Bjorner 0181f0f9df add bvmax tactic, add proviso for non-0 lower bounds in elim01
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-23 18:03:20 -07:00
Andreas Froehlich 853ce522cc plenty of new stuff 2014-03-09 15:42:51 +00:00
Nikolaj Bjorner 23e811d136 merge with unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-05 20:44:56 -08:00
Anh-Dung Phan 074e851d49 Display Fu Malik statistics 2013-11-15 12:58:11 -08:00
Leonardo de Moura 063f6fe15f fix assertion violations (reported by Christoph Wintersteiger) at sage\app8\bench_2174.smt2, sage\app9\bench_1450.smt2, sage\app9\bench_1546.smt2
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-11-04 12:26:20 -08:00
Leonardo de Moura 88675ec728 fix assertion violations (reported by Christoph Wintersteiger) at sage/bench_1300.smt2 and sage/bench/2861.smt2
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-11-04 12:24:25 -08:00
Leonardo de Moura 825b72719c fix https://z3.codeplex.com/workitem/62
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-11-04 11:57:29 -08:00
Christoph M. Wintersteiger ff265c6c6c bugfix for variable unmarking in the sat solver.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-10-24 17:48:03 +01:00
Leonardo de Moura 894fd8b967 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-06-13 13:45:55 -07:00
Leonardo de Moura 40b1137b30 Fix issue https://z3.codeplex.com/workitem/47
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-13 13:45:14 -07:00
Leonardo de Moura 2c8b314a15 Fix issue https://z3.codeplex.com/workitem/48
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-13 13:34:20 -07:00
Leonardo de Moura f4f1c63abb Fix issue https://z3.codeplex.com/workitem/38
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-06 13:20:43 -07:00
Leonardo de Moura d26f0e1c28 Fix bug in the SAT solver.
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-04-09 08:42:14 -07:00
Leonardo de Moura 0934cb06d8 exposed sat params
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-02 16:38:33 -08: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
Leonardo de Moura f57d4b1b19 reorganizing the code
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-10-25 11:28:03 -07:00
Leonardo de Moura 69ce24a6ce checkpoint
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-10-24 11:11:07 -07:00
Leonardo de Moura 9e299b88c4 reorganizing the code
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-10-23 21:53:34 -07:00
Leonardo de Moura efff6db567 checkpoint
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-10-23 12:12:59 -07:00
Leonardo de Moura 6fd63cd05a checkpoint
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-10-21 20:04:34 -07:00
Leonardo de Moura add684d8e9 checkpoint
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-10-21 13:32:12 -07:00
Leonardo de Moura 9a84cba6c9 Reorganizing the code. Moved nlsat to its own directory.
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-10-20 15:48:18 -07:00
Leonardo de Moura c66b9ab615 Reorganizing the code
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-10-20 15:30:42 -07:00