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

464 commits

Author SHA1 Message Date
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 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 6e60926cc3 fix drat output for elim_eqs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-10 15:25:10 -08:00
Bruce Mitchener 44bc00f13d Fix typos. 2018-12-23 21:58:57 -05:00
Nikolaj Bjorner b0b6394c6c fixing #1971 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-12-21 17:10:37 -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 4d0bc8c8b3 ignore propagation on units 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-11-11 15:10:44 -08: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
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
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 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
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
Nikolaj Bjorner 13abf5c6a6 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-09-06 17:49:52 -07:00
Nikolaj Bjorner fed977b492 fix #1782 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-08-02 10:08:16 -07:00
Nikolaj Bjorner 1918395f0e fix bug in sat-solver where frozen clauses get re-attached 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-05 12:19:03 -07:00
Nikolaj Bjorner 2e4fb8d356 work around VS2012 compiler bug 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-23 16:33:27 -07:00
Nikolaj Bjorner 278fd03f19 GLU -> GNU fix #1643 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-23 13:31:55 -07:00
Nikolaj Bjorner 87ae679db6 delay dereferencing justification 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-22 17:03:35 -07:00
Nikolaj Bjorner dfeb4b5235 updated sat state 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-17 16:45:12 -07:00
Nikolaj Bjorner 2aedaf315a fix removal bug, tune all-interval usage 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-09 16:32:38 +01:00
Nikolaj Bjorner 75ae58f49e fix parenthesis 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-09 09:25:01 +01:00
Nikolaj Bjorner 41072e3125 use __builtin_prefetch for clang/gcc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-08 19:09:59 +01:00
Nikolaj Bjorner 13b54f379c fix ema 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-05 13:58:47 +02:00
Nikolaj Bjorner 43403fafcd adding ema 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-03 13:23:59 -07:00
Nikolaj Bjorner fa93bc419d fix build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-01 10:53:36 -07:00
Nikolaj Bjorner 3de2feb84a fix build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-01 09:46:54 -07:00
Nikolaj Bjorner e4d24fd2c3 fix build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-01 09:39:19 -07:00
Nikolaj Bjorner f525f43e43 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-30 09:30:43 -07:00
Nikolaj Bjorner 859c68c2ac merge with opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-30 08:27:54 -07:00
Nikolaj Bjorner e940f53e9c n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-30 07:57:33 -07:00
Nikolaj Bjorner 2f025f52c0 fix local search initialization of units, encode offset in clauses 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-28 22:26:01 +02:00
Nikolaj Bjorner 563f337997 testing memory defragmentation, prefetch, delay ate 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-27 17:59:03 +02:00
Nikolaj Bjorner 252fb4af6e add backtracking conquer 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-14 15:34:33 -07:00
Nikolaj Bjorner a954ab7d8d flip literals in ATEs produced using RI 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-06 08:38:01 -07:00
Nikolaj Bjorner 528dc8a3f8 disable bdd variable elimination 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-31 17:05:22 -07:00
Nikolaj Bjorner 55eb11d91b fix bug in blocked clause elimination: it was ignoring unit literals 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-31 13:26:20 -07:00
Nikolaj Bjorner aa2721517b model conversion and acce tracking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-30 16:24:22 -07:00
Nikolaj Bjorner 96b717f494 propagate during asymmetric branching 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-26 15:17:41 -07:00
Nikolaj Bjorner a9f2ffd928 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2018-03-25 14:57:14 -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 a79400a01b fix bugs in scc_tr 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-25 14:55:42 -07:00
Nikolaj Bjorner bd7ba4b612 fix mac build error 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-20 20:16:47 -07:00
Nikolaj Bjorner 59b142f803 fixing local search 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-15 06:48:26 -07:00
Nikolaj Bjorner 64954cc551 fix pbge and reduce_tr 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-13 09:07:58 -07:00
Nikolaj Bjorner e7d43ed516 fix pb rewriter 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-12 11:22:05 -07:00
Nikolaj Bjorner 9279cbfbac don't reinit assumptions when the solver is unsat. fixes #1502 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-24 16:30:08 +09: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 bb4888ce31 support self-subsumption, remove verbose log 0 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-11 21:21:55 -08:00
Nikolaj Bjorner e183f8b743 disable lookahead simplification when external solver is used 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-09 21:46:45 -08:00
Nikolaj Bjorner 19b858dbea fix reset code for level marking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-09 04:00:32 -08:00
Nikolaj Bjorner 72a7164e2d add model checker to external 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-08 13:03:57 -08:00
Nikolaj Bjorner cb6896087d fix #1468 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-06 10:21:02 -08:00
Nikolaj Bjorner b2bd4dd3b4 fix #1471 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-05 18:54:14 -08:00
Nikolaj Bjorner 885dfad237 fix #1458 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-04 20:54:21 -08:00
Nikolaj Bjorner 20d6543538 set uninitialized fields. Maybe related to #1468 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-04 12:56:21 -08:00
Nikolaj Bjorner 2739342aba fix updates to cce 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-30 23:41:04 -08:00
Nikolaj Bjorner ede12553f2 fix learned annotation on ternary 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-30 03:31:28 -08:00
Nikolaj Bjorner 5a2b072ddf working on completing ATE/ALA for acce and abce 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-29 20:32:06 -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 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 a5b663c52d add unit walk engine 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-17 16:09:07 -08:00
Miguel Angelo Da Terra Neves 0f1286adae restored commented out code 
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
 2017-12-15 14:00:20 -08:00
Miguel Angelo Da Terra Neves 2bb2ea59e9 merge 
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
 2017-12-15 09:51:17 -08:00
Nikolaj Bjorner 6b258578f9 fix uninitialized variable m_gc_burst in config, have cuber accept and receive optional vector of variables indicating splits and global autarky as output 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-14 02:38:45 -08:00
Miguel Angelo Da Terra Neves 3edf0590bc Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-12-13 16:55:18 -08:00
Miguel Angelo Da Terra Neves 42499eac1c pre-merge 
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
 2017-12-13 16:55:16 -08:00
Nikolaj Bjorner aeabdb4aae add checks for flipping externals / assumptions in model converter, fix scc converter bug 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-13 14:06:35 -08:00
Nikolaj Bjorner caaad8825d merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-13 02:58:45 -08:00
Nikolaj Bjorner 71c52396cb fix transitive reduction bug, eliminate blocked tag on binary clauses, separate BIG structure from scc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-13 02:38:06 -08:00
Nikolaj Bjorner 921423ec80 fix model conversions for incremental SAT, fix lookahead with ba_solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-12 10:43:23 -08:00
Nikolaj Bjorner 7afbf8165e snapshot 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-12 01:36:44 -08:00
Nikolaj Bjorner fc3cbcbe02 remove deprecated options 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-02 10:16:35 -08:00
Nikolaj Bjorner b98c864d76 fixes to inprocessing code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-01 18:06:26 -08:00
Nikolaj Bjorner c8e655830f add statistics to cubing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-01 10:13:54 -08:00
Nikolaj Bjorner a4dc68766d preparing for more efficient asymmetric branching 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-29 17:16:15 -08:00
Nikolaj Bjorner 53e36c9cf9 re-organize iterators 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-16 09:29:44 -08:00
Nikolaj Bjorner d8a2e9d008 initialize glue in constructor to ensure it gets set 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-15 15:57:07 -08:00
Nikolaj Bjorner f7e14b3283 add global autarky option, update translation of solvers to retain vsids, remove stale code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-14 18:19:21 -08:00
Nikolaj Bjorner 6f273e7b8f bug fixes in uninitialized variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-11 12:09:33 -08:00
Nikolaj Bjorner d7f9a3b37d fix crash bugs in sat solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-11 11:27:10 -08:00
Nikolaj Bjorner a6da207b65 fix crash bugs in sat solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-11 11:25:43 -08:00
Nikolaj Bjorner 75b8d10f48 add backtrack level to cuber interface 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-08 21:44:21 -08:00
Nikolaj Bjorner 2746528aab fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-07 17:16:36 -08:00
Nikolaj Bjorner 9a4fb4ff76 remove ad-hoc parameters, deprecating dimacs cube mode 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-05 14:08:55 -08:00
Nikolaj Bjorner 70ee030228 updates to parallel tactic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-05 10:53:25 -08: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 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 0919fd4075 fix bca condition for tautology check 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-25 16:46:22 -07:00
Nikolaj Bjorner ee6cfb8eef updates to simplifier 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-23 01:00:06 -04:00
Nikolaj Bjorner 76eed064eb bug fixes, prepare for retaining blocked clauses 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-19 22:19:05 -07:00
Nikolaj Bjorner 9f9ae4427d add cce 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-15 15:13:43 -07:00
Nikolaj Bjorner c12439fe1e fix #1306 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-13 07:29:16 -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 1a6f8c2fad working on parallel solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-10 16:35:05 -07:00
Nikolaj Bjorner f85c02600f remove verificaiton code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-08 16:07:58 -07:00
Nikolaj Bjorner 10e4235b4c bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-08 14:35:31 -07:00
Nikolaj Bjorner d6327d69d2 bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-29 15:35:11 -07:00
Nikolaj Bjorner e507a6ccd1 adding incremental cubing from API 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-28 09:06:17 -07:00
Miguel Angelo Da Terra Neves ff2cdc0e3f local updates 
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
 2017-09-27 17:18:28 -07:00
Nikolaj Bjorner a1e4fc3e98 fix new clause encoding 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-27 11:13:35 -07:00
Nikolaj Bjorner 82922d92f7 add cube functionality 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-24 13:29:46 -07:00
Nikolaj Bjorner ae9a6664d4 add cube mode 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-24 10:53:57 -07:00
Nikolaj Bjorner 9cd974e334 remove display 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-24 09:40:35 -07:00
Nikolaj Bjorner 2751cbc270 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-23 22:36:36 -05:00
Nikolaj Bjorner cab4e4b461 add feature to display benchmark in format seen by SAT solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-21 18:32:46 -05: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 431d318958 experiments with ccc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 08:19:08 -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 b482dbd589 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-27 17:02:27 -07:00
Christoph M. Wintersteiger da34de340d Fixed bug in sat model converter. Fixes #1148. 2017-07-15 20:25:13 +01:00
Nikolaj Bjorner da263601e6 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-05 19:19:36 -07:00
Nikolaj Bjorner b419a0e4a4 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-05 14:32:13 -07:00
Nikolaj Bjorner 5262248823 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-04 11:13:05 -07:00
Nikolaj Bjorner 9b631f982b n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-30 17:48:04 -07:00
Nikolaj Bjorner bcf0ee7709 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-29 18:53:58 -07:00
Nikolaj Bjorner 7580644d15 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-29 08:11:27 -07:00
Nikolaj Bjorner 6fad478a18 reorg 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 17:46:29 -07:00
Nikolaj Bjorner 6f4c873b29 debugging 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-27 13:18:20 -07:00
Nikolaj Bjorner 66f0de6785 added in-processing features to card/pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-25 16:26:47 -07:00
Nikolaj Bjorner c3d29e75ef adding in-processing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-24 18:27:32 -07:00
Nikolaj Bjorner fb84ba8c34 updates and fixes to copying and cardinalities 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-23 14:00:33 -07:00
Nikolaj Bjorner 5752830f71 bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-22 15:01:12 -07:00
Nikolaj Bjorner 9ebe980b44 cleaning up lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-22 07:42:44 -07:00
Nikolaj Bjorner 5e2f7f7177 fixes top lookahead simplification 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-21 20:22:31 -07:00
Nikolaj Bjorner c6fbe38f78 disable anti-exploration by default 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-19 23:56:50 -05: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 af6ebbcd92 init search before returning 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-11 13:08:05 -07:00
Nikolaj Bjorner f3b0ede6e8 update lookahead to include extensions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-07 16:35:35 -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 e37a6dd809 add tracking for reason unknown 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-01 17:04:37 -07:00
Nikolaj Bjorner 55ba1e9178 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-06-01 14:50:37 -07:00
Nikolaj Bjorner 4e65c13726 adding lookahead and lemmas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-01 14:49:54 -07:00
Nikolaj Bjorner e0a86ccc1a add lrb/chb and experiment with them 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-28 10:48:31 -07:00
Nikolaj Bjorner db4bbecb27 Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-05-23 10:52:27 -07:00
Nikolaj Bjorner f9f0b2221d bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-22 14:27:34 -07:00
Nikolaj Bjorner 1507ab5d4b merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-15 09:34:41 -07:00
Nikolaj Bjorner f253b20820 local changes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-15 09:34:11 -07:00
Nikolaj Bjorner 2033e649b5 fix bugs related to use of lookahead equivalences and encoding of pb constraints 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-15 09:33:27 -07:00
Nikolaj Bjorner b915f78281 merge with master 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-07 17:05:57 -07:00
Nikolaj Bjorner 21cda27f5e fix quadratic behavior of extract_assumptions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 15:57:31 -07:00
Nikolaj Bjorner ed0b2be618 fix bug in tracking levels of variables: levels are not cleared, only truth assignment 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 14:10:07 -07:00
Nikolaj Bjorner f9105edb14 revert to native chunker 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-01 15:22:52 -07:00
Nikolaj Bjorner d14f2af5ae deal with subtraction that manages to sneak in. Issue #996 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-01 15:22:06 -07:00
Nikolaj Bjorner d6e2e1f28f Merge branch 'master' of https://github.com/Z3Prover/z3 2017-04-30 11:28:26 -07:00
Nikolaj Bjorner aff02ca905 include 'stopwatch.h' to avoid ODR warnings, #994 2017-04-30 11:28:11 -07:00
Nikolaj Bjorner 5fcbf55216 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-04-30 10:23:05 -07:00
Nikolaj Bjorner 2c208e1d10 Sat update 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-30 10:23:00 -07:00
Nikolaj Bjorner fa868e058e fix bound bug #991 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-29 17:39:02 -07:00
Nikolaj Bjorner 8205b45839 initial integration of opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-27 19:13:00 -07:00
Nikolaj Bjorner 8032217fd1 tuning and fixing consequence finding, adding dimacs evaluation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-26 13:53:37 -07:00
Nikolaj Bjorner dedc130e98 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-04-25 10:30:16 -07:00
Nikolaj Bjorner 34acaa8f56 update license for space/quotes per #982 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-24 13:34:10 -07:00
Nikolaj Bjorner d052155f6e parallelizing ccc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-23 14:46:46 -07:00
Nikolaj Bjorner 86a54dfec8 debugging ccc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-21 08:18:25 -07:00
Nikolaj Bjorner e65f106a83 ccc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-19 08:59:49 -07:00
Nikolaj Bjorner a3f4d58b00 use lookahead for simplification 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-18 16:58:56 -07:00
Nikolaj Bjorner 352f8b6cb9 fixing local search 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-17 13:04:57 -07:00
Nikolaj Bjorner ec29a03c8f add facility to dispense with cancellation (not activated at this point). Address #961 by expanding recurisve function definitions that are not tautologies if the current model does not validate 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-07 21:22:38 -07:00
Nikolaj Bjorner 2afd45b3c2 working on lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-27 04:53:27 +02:00
Christoph M. Wintersteiger 0399e5e2d3 Fixed variable initialization warning 2017-03-24 14:49:24 +00:00
Nikolaj Bjorner e47e8c67c0 introducing scoped detacth/attach of clauses to enforce basic sat solver invariants. Part of investigating #939: 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-22 14:12:47 -07:00
Nikolaj Bjorner ac59e7b6d3 enable multiple local search threads 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-06 11:48:23 -08:00
Nikolaj Bjorner cd4a2701db adding ability to ahve multiple local search threads 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-06 10:48:58 -08:00
Nikolaj Bjorner fda5809c89 local search updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-05 14:40:58 -08:00
Nikolaj Bjorner c6f943e4d6 updates to local search integration 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-02 11:23:06 -08:00
Nikolaj Bjorner 40df1949f5 tweaking local search 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-02 10:18:12 -08:00
Nikolaj Bjorner 2c7a978c16 debugging local 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-01 20:37:07 -08: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 fb4f6d654a add local search parameters and co-processor mode 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-27 23:35:50 -08:00
Nikolaj Bjorner 31c68b6e23 updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-27 23:19:58 -08:00
Nikolaj Bjorner 88e7c240b7 working on lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-27 10:59:59 -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 42deeb3498 testing lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-12 11:49:07 -08:00
Nikolaj Bjorner 690689424d fix parallel solving bugs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-11 15:35:13 -05:00
Nikolaj Bjorner 8b4f3ac6f0 fix drat checker 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-10 18:04:54 -05:00
Nikolaj Bjorner eaf845c2f4 updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-07 18:04:24 -08:00
Nikolaj Bjorner b6b6035cfb tuning and fixing drat checker 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-07 16:50:39 -08:00
Nikolaj Bjorner 54f2063c81 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-02-06 21:20:01 -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 66089a7aef fix compiler errors and memory issue with drat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-06 16:09:46 -08:00
Nikolaj Bjorner 4831c45ad8 fix issues in par 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-06 13:38:07 -08:00
Nikolaj Bjorner fe105d94a0 fixes to sat-par 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-06 12:00:35 -08:00
Nikolaj Bjorner 7aeaf11ee4 adding clause sharing to par mode 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-05 22:24:20 -08:00
Nikolaj Bjorner 15283e4e7c expose extension conflict resolution as plugin to sat solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-05 10:08:57 -08:00
Nikolaj Bjorner 5f70e4823d adding drat forward checking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-03 22:41:40 -08:00
Nikolaj Bjorner 61341b8879 adding drat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-03 17:56:22 -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 505133a4b3 debugging card 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-02 17:06:15 -08:00