mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 05:18:44 +00:00
Code Activity
11299 commits 23 branches 48 tags 157 MiB
Commit graph

913 commits

Author SHA1 Message Date
Nikolaj Bjorner 73060ecaec remove debug code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-22 13:57:09 +01:00
Nikolaj Bjorner bceff4b3fa Merge branch 'master' of https://github.com/z3prover/z3 2019-02-22 11:17:03 +01:00
Nikolaj Bjorner 4c799c144a fix gc to not remove ternary clauses that are on assignment trail. This addresses issue with drat proofs that don't pass drat-trim due to deletion during gc, but use in conflicts 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-22 11:14:20 +01:00
Nuno Lopes 6598aedbb2 fix VS build, take 2 2019-02-21 15:52:52 +00:00
Nuno Lopes 2f33bafd5a stopwatches: fix a few places that would call start/stop multiple times 2019-02-21 14:59:31 +00:00
Nikolaj Bjorner 3548057bd1 fix detection of arithmetic operations 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-20 14:00:05 +01:00
Nikolaj Bjorner caa15ea04d enable cardinality constraints in nla2bv 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-19 18:17:07 +01:00
Nikolaj Bjorner 2138a5232f fix #2142 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-19 10:16:50 +01:00
Nikolaj Bjorner 7fb2c6a908 turn off model validation unless specified by parameter 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-18 15:55:24 +01:00
Nikolaj Bjorner 0aafa8b7ce optimize binary output 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-18 15:52:42 +01:00
Nikolaj Bjorner c1402ad70f tone down verbosity of integrity checking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-16 20:39:15 -08:00
Nikolaj Bjorner f84de9400e also deal with initializing boolean variables in smt context 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-15 17:58:26 -08:00
Nikolaj Bjorner 39f73fa595 ensure that activity works for sat solver from cold state 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-15 16:56:55 -08:00
Nikolaj Bjorner 89bf2d4368 add API for setting variable activity 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-15 12:05:24 -08:00
Nikolaj Bjorner 5cdfa7cd1c variations on unit-walk 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-13 17:43:15 -08:00
Nikolaj Bjorner eec1da5a15 move restart test to after propagation, clean up drat generation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-12 15:49:12 -08:00
Nikolaj Bjorner 72b220e84a import improvements to lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-11 13:28:13 -08:00
Nikolaj Bjorner 6d893e0599 revise unit walk 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-11 13:16:17 -08:00
Nikolaj Bjorner 5fe40a25dc revise local search 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-11 13:14:20 -08: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 93ee05648e add shortcuts for unit assertions, conflicts 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-11 10:56:36 -08:00
Nikolaj Bjorner 24dfdfe9bc disable fixes for #2128 and related as it breaks model evaluation time in regressions, set longer delay for inprocessing in sat solver, report stats 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-09 16:06:02 -08:00
Nikolaj Bjorner d2d42f9810 fix #2127 fix #2128 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-09 08:23:22 -08:00
Nikolaj Bjorner c9ffe7417c mark destructors virtual 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-07 07:55:17 +01:00
Nikolaj Bjorner c6a7dc7b44 formatting 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-06 20:05:45 +01: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 6c464f8aec add assert_and_track to optimize for #2116 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-01 14:59:36 -08:00
Nikolaj Bjorner e07f0c0284 tune generation of drat files, add helpful binary clause in lookahead simplification 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-01 13:35:54 -08:00
Nikolaj Bjorner 7fa9768c36 improving drat output perf 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-02-01 09:16:46 -08:00
Nikolaj Bjorner 1e90be62bc fix drat for lookahead, fixes for binary drat format 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-31 14:58:51 -08:00
Nikolaj Bjorner 35eb21bc35 fix extraction of trail 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-30 09:06:41 -08:00
Nikolaj Bjorner 08ce6f7ac1 working on binary drat format 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-30 08:54:59 -08:00
Nikolaj Bjorner 8d20310758 adding trail/levels 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-29 14:45:51 -08:00
Nikolaj Bjorner 58f5531cff fix #2114 introduced while working on #2095 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-29 08:18:03 -08: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 ad81fee118 adding maxlex, throttle use of asymmetric literal addition 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-24 19:26:44 -08:00
Nikolaj Bjorner 8da1d6070b throttle big-reductions #2101 #2098 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-24 14:00:56 -08:00
Nikolaj Bjorner 498864c582 adding dump facility for cancelation #2095, easing dimacs in/out 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-24 12:21:23 -08:00
Nikolaj Bjorner f7746e2284 address perf #2098 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-23 16:58:00 -08:00
Nikolaj Bjorner 412eee0dac throttle number of rounds of ba simplification 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-22 18:12:39 -08:00
Nikolaj Bjorner f2e636c598 record simplified input clauses as lemmas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-16 16:37:21 -08:00
Nikolaj Bjorner 247980c5a2 don't assign already assigned literals 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-16 11:41:32 -08:00
Nikolaj Bjorner e01a668da0 coordinate drat with clause removal 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-16 02:29:33 -08:00
Nikolaj Bjorner 3298486136 don't reach max conflicts if state is inconsistent 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-15 08:40:38 -08:00
Nikolaj Bjorner 5328454c77 const 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-15 08:37:23 -08:00
Nikolaj Bjorner 161c83795f remember inconsistent states when cloning 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-15 08:34:55 -08:00
Nikolaj Bjorner 65bd427e46 neatify statistics 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-14 16:48:48 -08:00
Nikolaj Bjorner f238460597 neatify statistics 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-14 16:45:04 -08:00
Nikolaj Bjorner ed7cac8cc0 neatify logging 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-14 16:42:13 -08:00
Nikolaj Bjorner b11ec3bfbf merge sat_tactic from csp 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-14 15:17:42 -08:00
Nikolaj Bjorner a686aa7f56 produce binary clauses for DRAT for units produced by probing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-14 10:56:10 -08:00
Nikolaj Bjorner dc5e4ca1c5 fix drat generation in asymmetric branch simplification 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-12 13:19:09 -08:00
Nikolaj Bjorner f835a3c2b2 revert assumption tracking choice in unit literals inferred from binary clauses 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-12 11:08:35 -08:00
Nikolaj Bjorner e4d6aa07dc use vectors instead of hash-tables in dimacs serialization to avoid hash-table contention 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-12 11:05:00 -08:00
Nikolaj Bjorner e623f1e9c9 restoring clause sizes after deletion 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-12 01:01:49 -08:00
Nikolaj Bjorner 3c96b51e97 lvl -> _lvl 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-12 00:40:36 -08:00
Nikolaj Bjorner 0b8dbf2854 fixing drat proofs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-12 00:30:21 -08:00
Nikolaj Bjorner 836f156d54 fix drat for units learned from binary clause resolution 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-12 00:12:20 -08:00
Nikolaj Bjorner 63d480fd92 fix cnf check 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-11 21:17:39 -08:00
Nikolaj Bjorner b8d18c6c6d speed-up handling of cnf input to inc_sat_solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-11 20:52:19 -08:00
Nikolaj Bjorner 6e60926cc3 fix drat output for elim_eqs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-10 15:25:10 -08:00
Nikolaj Bjorner b12c1b1cba set a throttle on ala 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-10 13:38:45 -08:00
Nikolaj Bjorner 59b0b56b42 add checkpoints to blocked clause elimination to handle timeouts, #2080 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-10 12:08:38 -08:00
Nikolaj Bjorner efaab6d8fd have sat cleaner use a fixed-point 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-10 11:38:35 -08:00
Bruce Mitchener 44bc00f13d Fix typos. 2018-12-23 21:58:57 -05:00
Nikolaj Bjorner 99cc4747c5 fixing #1971 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-12-21 17:21:04 -08:00
Nikolaj Bjorner b0b6394c6c fixing #1971 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-12-21 17:10:37 -08:00
Bruce Mitchener 51a947b73d Change how 64 bit builds are detected. 
Instead of doing this at configure time, we look at the actual
compile time status. This also avoids hardcoding checks based on
what CPU architecture is present, which doesn't work when Z3 is
being built on non-x86_64 platforms.
 2018-12-09 16:16:20 +07:00
Nikolaj Bjorner dc77579707 delta faction to control double lookahead eagerness 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-12-04 23:41:03 -08:00
Nikolaj Bjorner 226497e530 Merge branch 'master' of https://github.com/z3prover/z3 2018-12-03 08:45:28 -08:00
Nikolaj Bjorner 2aa7ccc4a9 hide bit-vector dependencies under seq_util 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-12-03 08:45:17 -08:00
Nikolaj Bjorner 1cfd14fd74
Merge pull request #1995 from waywardmonkeys/fix-typos 
Fix typos.
 2018-11-30 07:45:24 -08:00
Nikolaj Bjorner dbfeeb8b1c fix #1994 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-11-30 07:43:42 -08:00
Bruce Mitchener 3149d7f7a4 Fix typos. 2018-11-30 22:19:30 +07:00
Bruce Mitchener 090f14e7bc Fix a couple of typos. 2018-11-28 14:58:04 +07: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 e83e9b02df increment version number to 4.8.4 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-11-19 15:17:55 -08:00
Nikolaj Bjorner 9b4cf1559d recover error stream from dimacs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-11-12 15:33:46 -08:00
Nikolaj Bjorner 4d0bc8c8b3 ignore propagation on units 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-11-11 15:10:44 -08:00
Nikolaj Bjorner cf4bf7b591 more consistent use of parallel mode when enabled, takes care of example test from #1898 that didn't trigger parallel mode 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-11-02 18:44:53 -05:00
Nikolaj Bjorner 2a6fa4af39 deal with compiler warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-31 16:30:42 -05:00
Nikolaj Bjorner 719bc5cd5d merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-30 17:23:31 -05:00
Nikolaj Bjorner 3c1c3d5987 fix #1908 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-30 14:15:29 -05:00
Nikolaj Bjorner ccca063e54 Merge branch 'master' of https://github.com/Z3Prover/z3 into csp 2018-10-21 12:26:53 -07:00
Florian Pigorsch 326bf401b9 Fix some spelling errors (mostly in comments). 2018-10-20 17:07:41 +02:00
Michał Janiszewski cfd0486582 Catch exceptions by const-reference 
Exceptions caught by value incur needless cost in C++, most of them can
be caught by const-reference, especially as nearly none are actually
used. This could allow compiler generate a slightly more efficient code.
 2018-10-16 19:16:07 +02:00
Nikolaj Bjorner 5b51e69137 fix #1874 by removing nnf.skolemize option 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-14 18:17:34 -07:00
Nikolaj Bjorner e9d615e309 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-14 15:16:22 -07:00
Bruce Mitchener 5bd93b8a77 Typo fixes. 2018-10-12 23:38:53 +07:00
Nikolaj Bjorner f5fea8ae30 add parameter to force sat-cleaning on initialization and on simplification phases 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-11 22:05:04 -07:00
Nikolaj Bjorner 46cdefac4d fix memory leak when cuber isn't run to completion. Found by Daniel Selsam 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-03 10:57:02 -07:00
Nikolaj Bjorner 5bf57c2700 fix cubing semantics 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-02 08:14:19 -07:00
Nikolaj Bjorner 7082d85115
Merge pull request #1860 from waywardmonkeys/modernize-use-override 
Use 'override' where possible.
 2018-10-01 20:43:56 -07:00
Bruce Mitchener 373b691709 Use 'override' where possible. 2018-10-02 10:26:38 +07:00
Nikolaj Bjorner 9d0aa4d02d update empty cube case for sat/undef cases 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-01 20:22:02 -07:00
Nikolaj Bjorner b0dac346dc
Merge pull request #1857 from waywardmonkeys/modernize-use-nullptr 
Use nullptr.
 2018-10-01 19:28:58 -07:00
Bruce Mitchener 489582f7fa Remove unused sat_par files. 
These look like they were replaced by `sat_parallel` files and
aren't currently built or used.
 2018-10-02 09:19:14 +07:00
Bruce Mitchener cdfc19a885 Use nullptr. 2018-10-02 09:11:19 +07:00
Nikolaj Bjorner 08c58ae614 make the unsat/sat verdicts from cubing produce empty clause and models respectively 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-01 15:52:22 -07:00