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 84172302a2 fix bug in mutex extraction, reported by Patrick Trentin
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-01 00:16:16 +01:00
Nikolaj Bjorner ff75f88c4f fix memory abuse in internalization in inc-sat-solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-31 22:25:58 +01:00
Nikolaj Bjorner 3714e520be fix performance bottlnecks: gc of literals walk through potentially huge watch-lists, avoid user-push/pop around calls to solver2tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-28 08:27:11 -07:00
Nikolaj Bjorner ca309341c3 fixing cancellation code paths for inc_sat_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-27 22:07:46 -07:00
Nikolaj Bjorner 24fc19ed58 speed up consequence finding by avoiding local search whenver assumption level is reached during the initial phase
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-27 08:15:39 -07:00
Nikolaj Bjorner 4bd83724dd remove conflict on false disequality, introduced regression
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-26 19:15:05 -07: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 e4d2c5867a remove dead (and incorrect) code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-24 15:52:47 -07:00
Christoph M. Wintersteiger f97ffce479 Silenced GCC warning about empty loop body. 2016-10-19 12:31:35 +01:00
Christoph M. Wintersteiger f9bd8f674d whitespace 2016-10-19 12:31:06 +01:00
Nikolaj Bjorner d060359f01 add fd solver for finite domain queries
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-18 22:34:34 -04:00
Nikolaj Bjorner aec59e4ff7 add consequence finding to inc-sat-solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-16 15:43:28 -04:00
Nikolaj Bjorner 8d2b70a5e2 better encodings for at-most-1, #755
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-10 23:46:03 -07:00
Nikolaj Bjorner 619cce0a52 add mutex preprocessing to maxsat, add parsing functions to C++ API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-07 12:42:08 -07:00
Christoph M. Wintersteiger 27ea7d8e9d style/formatting 2016-09-16 19:34:48 +01:00
Christoph M. Wintersteiger b70cc47a9d x64 clause allocator fix for del_clause 2016-09-16 19:25:41 +01:00
Christoph M. Wintersteiger 5b1cb49973 x64 clause allocator bug fix 2016-09-16 19:25:41 +01:00
Nikolaj Bjorner 424a8c69bd Merge branch 'master' of https://github.com/Z3Prover/z3 2016-09-02 03:05:23 -07:00
Nikolaj Bjorner f2b5c11d1c add option for prettier proof printing, Issue #706
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-08-20 03:52:45 -07:00
Nikolaj Bjorner 5069da62a3 safe sat clause_offset in debug mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-08-19 08:45:06 -07:00
Nikolaj Bjorner e132c5eae8 safe sat clause_offset in debug mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-08-19 08:42:40 -07:00
Nikolaj Bjorner 665fccf07a addressing max-segment issue for AMD64 + Debug
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-08-18 18:01:29 -07:00
Nikolaj Bjorner 491b3b34aa tune consequence finding. Factor solver pretty-printing as SMT-LIB into top-level
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-08-03 11:14:29 -07:00
Nikolaj Bjorner 3581f6de42 remove stale SLS option
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-07-21 18:18:42 -07:00
Nikolaj Bjorner 8f862f8fed fix core extraction for QF_BV theory/inc_sat_solver based on regressions pointed out by Matthias Heizmann and Tjark Weber
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-07-09 12:35:11 -07:00
Nikolaj Bjorner 5b497b6249 reduce set of mainly verbose warnings raised by -Wmaybe-uninitialized and unused variable warnings from release mode builds
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-06-22 20:25:47 -07:00
Nikolaj Bjorner c7ff05cc78 enable core minimization with qsat in case it turns out to be useful
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-06-12 15:58:12 -07:00
Nikolaj Bjorner 3a6e6df4f5 fix unused-but-set-variable warnings reported in #579
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-05-18 11:02:10 -07:00
Nikolaj Bjorner 09b8c0e7fa removing warnings for unused variables, #579
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-05-17 15:59:06 -07:00
Nikolaj Bjorner 96e157e201 fix warnings for unused variables
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-05-17 13:54:22 -07:00
Nikolaj Bjorner 91af947863 adding checks for #570
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-05-03 11:09:05 -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 ed1a5797fb check that a clause was not removed to fix issue #551
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-04-04 20:15:49 +02: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 f951372f03 fix regression in internalizing bit-vectors, reported by Mikolas Janota
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-18 13:54:42 -07:00
Christoph M. Wintersteiger 9dd53c091a guard on m_preprocess in inc_sat_solver 2016-03-11 12:02:49 +00:00
Nikolaj Bjorner 335a1dba6e guarding bb_rewriter now that it gets reset
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-08 16:50:06 -08:00
Nikolaj Bjorner 5994c5a948 fix partial model tracking over cancellation/exceptions, reported by August Shi. Fix regression test for fp-to-real, reset the pre-processor in inc_sat_solver on exceptions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-07 16:42:29 -08:00
Christoph M. Wintersteiger a51201298c Bugfix for assumptions in inc_sat_solver 2016-03-04 14:42:38 +00:00
Christoph M. Wintersteiger 1aeea763ff Assertion fix in inc_sat_solver 2016-03-02 18:39:28 +00:00
Christoph M. Wintersteiger bf40bb8005 Bugfix for inc_sat_solver 2016-03-02 18:27:01 +00:00
Christoph M. Wintersteiger 68416bf6bc whitespace 2016-03-02 18:25:56 +00:00
Nikolaj Bjorner 9efc7f4aea turn on model completion in validation code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-29 09:06:20 -08:00
Dan Liew 6c966bba59 Fix incorrect (off by one) bound check. Also assert that we don't
increment ``m_num_segments`` beyond the maximum value
(``c_max_segments``).

This is related to #436.

When doing an AddressSanitized build and running the ``c_example``
it looks like Z3 tries to create too many segments and index out of
bounds. Fixing the checks here causes them to fail which should help
us narrow down the problem.
2016-02-16 14:04:21 +00:00
Nikolaj Bjorner 5ce85aba40 removing const qualifiers, perhaps this helps for #420 and adding assert to enable Clang analysis earlier for issue #440
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-09 22:23:37 +00:00
Nikolaj Bjorner 85d44c5d66 fix axioms for extract, add extensionality checking for shared variables, convert exceptions to unknown status per #419
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-18 11:09:41 +05:30
Nikolaj Bjorner 00f3a1fe81 fix memory leak in SAT solver exposed by regression tests
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-06 11:47:45 -08:00
Nikolaj Bjorner aec5a38b14 fix memory leak in SAT solver exposed by regression tests
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-06 11:44:55 -08: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 c1a6163bda disable aig tactic in inc_sat_solver (it can blow up the size of formulas significantly without sharing) and fix configuration update bug for optimization context exposed in example by Corina
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-20 14:34:31 -08:00
Nikolaj Bjorner c58e640563 extract labels for optimal model. Fix to #325
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-18 14:53:08 -08:00
Nikolaj Bjorner 1758799ef4 add translate facility to inc_sat_solver. Limit lemma copying to unit lemmas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-07 10:00:14 -08:00
Nikolaj Bjorner b4cb51cdb3 working on Forking/Serializing a z3 Solver #209
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-06 17:29:24 -08:00
Nikolaj Bjorner 9b3e242990 adding rlimit resource limit facility to provide platform and architecture independent method for canceling activities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-09-28 13:37:59 -07:00
Christoph M. Wintersteiger 79d69cd5f0 Added FP to_ieee_bv to fpa_rewriter to enable model evaluation. 2015-09-16 12:57:05 +01:00
Nikolaj Bjorner f94152c857 fix build warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-09-15 10:54:01 +02:00
Nikolaj Bjorner 2bff98ca5d enable incremental bit-vector solving
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-09-01 09:52:48 -07: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 0ed38ed59b add option for using corr set and use partial cores
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-30 14:48:24 -07:00
Nikolaj Bjorner dd01f6be46 fix blockers for pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-29 15:42:19 -07:00
Nikolaj Bjorner e4ce6b6d74 update pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-29 14:23:32 -07:00
Nikolaj Bjorner 2fe0c05556 tuning pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-28 20:25:25 -07:00
Nikolaj Bjorner 78313c614d updateing pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-27 15:43:35 -07:00
Nikolaj Bjorner 8622356375 working on pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-27 08:09:46 -07:00
Nikolaj Bjorner 7c47809973 reworking pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-26 16:33:53 -07:00
Nikolaj Bjorner af9143b64a tune initial propagation for pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-25 17:15:31 -07:00
Nikolaj Bjorner b2ebd095cb fix for unintialized variable m_conflict_lvl
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-24 17:01:46 -07:00
unknown 42c7277ea8 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-08-23 12:09:51 -07:00
Nikolaj Bjorner ee458fa601 revising pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-23 12:09:07 -07:00
Nikolaj Bjorner 76c9abada2 remove dbg pp
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-23 11:00:19 -07:00
unknown b06c4d985e Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-08-23 10:58:28 -07:00
unknown 2b48092541 local sat solver change
Signed-off-by: unknown <nbjorner@nikolaj-z.redmond.corp.microsoft.com>
2015-08-23 10:58:12 -07:00
Nikolaj Bjorner 546a9b8f03 revising pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-23 10:53:39 -07:00
Nikolaj Bjorner a78fc031bc adding facility to dump wcnf benchmarks
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-21 07:26:49 -07:00
Nikolaj Bjorner 954e612188 redoing pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-20 18:09:43 -07:00
Nikolaj Bjorner a9807878ea reworking pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-20 12:20:30 -07:00
Nikolaj Bjorner e3cb0e2d8b reworking pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-20 12:06:27 -07:00
Nikolaj Bjorner 655b44c07b make :weight understand both decimal and integral values, remove dweight, remove deprecated commands for optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-15 00:48:22 +02:00
Nikolaj Bjorner 94d83b7be9 n/a
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-14 14:12:14 +02:00
Nikolaj Bjorner cd838e5cf4 fix bug reported in issue #193: MBQI needs to avoid instantiating data-types that contain model values in nested positions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-13 14:29:48 +02:00
Christoph M. Wintersteiger 5e0aaee2c7 Made num_clauses in sat_solver public 2015-08-04 15:26:03 +01:00
Nikolaj Bjorner 4bc044c982 update header guards to be C++ style. Fixes issue #9
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-07-08 23:18:40 -07:00
Nikolaj Bjorner 5aee077d55 enable incremental sat for QF_BV
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-06-24 17:06:10 +01:00
Nikolaj Bjorner 0518e69d2a isolate inc_sat_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-06-24 17:06:09 +01:00
Christoph M. Wintersteiger 9a62d989e6 Revert "Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable"
This reverts commit d3db21ccde, reversing
changes made to e463d5d899.
2015-06-24 17:06:04 +01:00
Aleksandar Zeljic f6f16c1e92 Added smallFloats files. 2015-05-28 14:31:34 +02: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 64bd62b17e fix gcc compiler warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-16 11:56:04 +01:00
Nikolaj Bjorner 52619b9dbb pull unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-01 14:57:11 -07:00
Nuno Lopes 89c43676d5 save memory in the sat solver to tentatively speed things up.
I get a slight speedup on my benchmarks. There's still one extra sign extend, which will be removed in a follow-up patch

Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
2015-03-02 09:50:35 +00:00
nikolajbjorner 0d9f949ab2 Fix memory smash on double free of clauses
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
2015-02-23 10:28:32 -08:00
nikolajbjorner aa40316268 rewrite terminology for policheck
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
2015-02-19 19:09:12 -08:00
Nikolaj Bjorner 8141dadc89 break on small cores
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-08 10:22:06 +01:00
Nikolaj Bjorner 761c7d9a40 adding annotation to logging to show number of columns and rows, adding dual propagation sketch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-25 04:01:18 -08:00
Nikolaj Bjorner 552cbd840f adding soft-assertions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-23 13:06:11 -08:00
Nikolaj Bjorner f1d9228b94 fix bug in context push/pop for sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-20 16:30:46 -08:00
Christoph M. Wintersteiger f1a00da401 BV-SLS Cosmetics
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:43:56 +00:00
Andreas Froehlich e310ab5cd7 plenty of new stuff 2015-01-12 17:13:12 +00:00
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