3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 05:18:44 +00:00
Commit graph

913 commits

Author SHA1 Message Date
Nikolaj Bjorner 38888b5e5c Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2018-04-27 17:59:41 +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 a37303a045 move parallel-tactic to solver level
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-04-16 08:21:21 -07:00
Nikolaj Bjorner cd35caff52 clean up parallel tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-04-16 03:18:57 -07:00
Nikolaj Bjorner 012a96fd81 adding smt parallel solving
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-04-15 16:16:48 -07: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 f7e49501af updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-04-13 16:22:36 -07:00
Nikolaj Bjorner d57bca8f8c fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-04-10 10:43:55 +08:00
Nikolaj Bjorner 00685ff04f Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2018-04-08 15:46:41 -07:00
Nikolaj Bjorner f2dfc0dc24 including all touched tautology literals each round
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-04-08 15:46:21 -07:00
Nikolaj Bjorner 21738d9750 fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-04-06 15:59:55 -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 8533238582 add propagation after binary addition
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-26 15:56:05 -07:00
Nikolaj Bjorner 51d62684e1 move propagation to after binary clause addition
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-26 15:51:00 -07:00
Nikolaj Bjorner d60d0b8a7a fix indent
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-26 15:19:14 -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 81260c7ffb fix mac build error
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-20 19:53:25 -07:00
Nikolaj Bjorner 4b71bfc95d mac build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-20 19:19:42 -07:00
Nikolaj Bjorner af96e42724 fixing local search
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-15 21:11:55 -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 4375f54c45 adding lns
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-13 13:31:27 -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 f04e805fa4 add hiding to auxiliary declarations created in mc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-06 18:02:37 -08:00
Nikolaj Bjorner 19b1248e5e Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2018-03-06 13:33:40 -08:00
Nikolaj Bjorner d3ceb8c794 radix sort experiment
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-06 13:33:37 -08:00
Nikolaj Bjorner 718e5a9b6c add unit extraction
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-06 01:08:17 -08: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 75ba65a18a working on propagation with undef main literal
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-20 01:46:35 -08: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 8fb7fb9f98 add missing caching of PB/cardinality constraints, increase limit for compiling cardinalities to circuits
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-11 19:27:00 -08:00
Nikolaj Bjorner 4695ca16c8 perf improvements
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-10 11:43:33 -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
Bruce Mitchener 7167fda1dc Use override rather than virtual. 2018-02-10 09:56:33 +07:00
Nikolaj Bjorner f28b158d57 fix another recompilation bug
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-09 13:47:55 -08:00
Nikolaj Bjorner 4f7b6a2f18 fix missing clear of weights
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-09 10:55:31 -08:00
Nikolaj Bjorner 5206e29bdd fix wrong check
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-09 09:18:05 -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 908dfd392e fix validation code, disable PB compilation code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-08 14:08:51 -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 a0b5f6937b fix bugs, add soft timeout to opt frontend
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-08 10:05:26 -08:00
Nikolaj Bjorner 4f630f2a00 fix configuration for compiling equalities, add extended binaries
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-08 09:09:53 -08:00
Nikolaj Bjorner 5e482def18 fix local search encoding bug
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-08 07:27:32 -08:00
Nikolaj Bjorner 064a7f9097 remove tautology
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-07 16:05:06 -08:00
Nikolaj Bjorner d7f2638ecf reference get_wlist
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-07 16:03:14 -08:00
Nikolaj Bjorner d684d4fce0 dbl-max
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-07 15:57:25 -08:00
Nikolaj Bjorner 61f99b242e xor to xr to avoid clang issue
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-07 15:25:02 -08:00
Nikolaj Bjorner fa0c75e76e rename to core2 to avoid overloaded virtual
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-07 15:13:13 -08:00
Nikolaj Bjorner bee4716a85 lia2card simplifications, move up before elim01 (which could be deprecated)
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-07 12:56:30 -08:00
Nikolaj Bjorner 43441d0fd5 add LP parser option to front-end and opt context
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-06 14:02:44 -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 20fe08d80c fix more bugs with compilation of pb equalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-04 09:51:45 -08:00
Nikolaj Bjorner 354c16454a fix bug in translation of pbeq into sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-03 22:19:25 -08:00
Nikolaj Bjorner d07688d80b update lia2card to handle broader intervals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-03 15:52:34 -08:00
Nikolaj Bjorner db347c007d remove legacy bce
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-03 09:39:39 -08:00
Nikolaj Bjorner e95840b640 ate/acce
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-02 20:51:41 -08:00
Nikolaj Bjorner 161ee1c108 fix ugcd
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-01 20:23:21 -08:00
Nikolaj Bjorner ad92bfb1a1 fix python build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-01 20:19:24 -08:00
Nikolaj Bjorner eca250933d disable uhle from lookahead solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-01 19:56:01 -08:00
Nikolaj Bjorner 75bf942237 throttle cce pass
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-31 21:15:07 -08:00
Nikolaj Bjorner a639452553 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2018-01-31 11:10:54 -08:00
Nikolaj Bjorner 7ada6c25d9 fix build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-31 11:10:42 -08:00
Nikolaj Bjorner e32bfda5a6 fixup cce
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-31 10:21:27 -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 2d0f80f78e add cce minimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-30 09:22:36 -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 2f6c80ef08 fix build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-28 12:06:14 -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 ece5ad90e0 fix model conversion bugs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-20 17:09:43 -08:00
Nikolaj Bjorner b129ee764f debugging opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-20 10:20:22 -08:00
Nikolaj Bjorner 7fc1b75cb8 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2018-01-19 21:36:24 -08:00
Nikolaj Bjorner e4f29a7b8a debugging mc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-19 21:09:52 -08:00
Nikolaj Bjorner 67de30ca4a Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2018-01-19 13:57:25 -08:00
Nikolaj Bjorner d6c49adddb local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-19 13:57:21 -08:00
Nikolaj Bjorner c7ee532173 fix static
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-18 10:44:40 -08:00
Nikolaj Bjorner 57406d6cc4 more updates for #1439
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-17 18:11:14 -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 ae728374c8 disable buggy clausification in ba_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-15 17:20:19 -08:00
Nikolaj Bjorner 3047d930e1 fix xor processing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-13 19:53:50 -08:00
Nikolaj Bjorner 7e0920e362 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-13 16:15:51 -08:00
Nikolaj Bjorner 4adb24ede5 fix model bugs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-13 16:12:59 -08:00
Nikolaj Bjorner d79c33fb21 fix model bugs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-13 16:12:38 -08:00
Nikolaj Bjorner 5a90aa9860 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2018-01-12 08:23:27 -08:00
Nikolaj Bjorner 9635a74e52 add clausification features
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-12 08:23:22 -08:00
Nikolaj Bjorner 1c2966f8e9 updates to model generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-11 11:20:23 -08:00
Nikolaj Bjorner c80f34102f adding ad-hoc method for converting models
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-28 17:29:31 -08:00
Nikolaj Bjorner b1724b2f62 fix update to variables
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-28 14:39:16 -08:00
Nikolaj Bjorner 0b424942ab bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-23 14:42:21 -08:00
Nikolaj Bjorner 8198a8ce7b bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-23 14:41:16 -08:00
Nikolaj Bjorner c199344bbf fix sat model converter to work with incrementality
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-18 11:12:27 -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 a52fd4c6f2 merge
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-15 14:01:50 -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
Nikolaj Bjorner b3e5fade32 remove cache reset that causes crash
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-15 11:22:50 -08:00
Miguel Angelo Da Terra Neves 5edb651f61 Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-12-15 09:51:21 -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 030868d8de reset cache in ast_translation periodically to avoid congestion
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-15 07:21:37 -08:00
Miguel Angelo Da Terra Neves e45dc51e70 commented non-compiling debug traces
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-14 09:58:57 -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
Nikolaj Bjorner 178211d091 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-13 20:12:11 -08:00
Nikolaj Bjorner a74d18a695 prepare for variable scoping and autarkies
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-13 20:11:16 -08:00
Miguel Angelo Da Terra Neves 0b45828ff1 Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-12-13 18:30:03 -08:00
Nikolaj Bjorner 209d31346b fix crash regression
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-13 18:03:25 -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 d1854ab4d2 fix assertion in model converter for incremental mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-13 15:24:40 -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
Miguel Angelo Da Terra Neves 51fc54fdd1 merge
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-13 11:15:03 -08:00
Miguel Angelo Da Terra Neves bffa0facee pre-merge commit
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-13 10:09:44 -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
Miguel Angelo Da Terra Neves 7ab042763b Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-12-12 14:35:27 -08:00
Miguel Angelo Da Terra Neves c92e6ac658 merge
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-12 14:35:24 -08:00
Nikolaj Bjorner dbe7828f1d inherit incremental override on the solver state
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-12 14:33:23 -08:00
Nikolaj Bjorner deda8f46f8 fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-12 13:25:36 -08:00
Nikolaj Bjorner 159df60336 local changes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-12 13:22:31 -08:00
Miguel Angelo Da Terra Neves e8ac0575eb merge
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-12 11:44:45 -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
Miguel Angelo Da Terra Neves 1e22cb73d5 merge
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-11 14:14:44 -08:00
Miguel Angelo Da Terra Neves 9f0a8af255 fixed adaptive apsat
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-11 14:14:16 -08:00
Nikolaj Bjorner 6d729f1f15 disable UHLT
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-11 10:36:42 -08:00
Miguel Angelo Da Terra Neves 38751430df adaptive psat cutoff
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-05 17:53:48 -08:00
Miguel Angelo Da Terra Neves d8a62dff73 merge
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-04 14:34:59 -08:00
Miguel Angelo Da Terra Neves e0dfbd6d1c fixed freevars and psat cube cutoffs
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-04 14:33:48 -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
Miguel Angelo Da Terra Neves 2e042a8bea Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-12-01 11:02:35 -08:00
Miguel Angelo Da Terra Neves 1b7cb110d3 freevars cube cutoff
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-01 11:02:29 -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 e0d28c67cd Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-12-01 08:25:05 -08:00
Nikolaj Bjorner a9f32cd382 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-12-01 08:24:51 -08:00
Nikolaj Bjorner e0d69a0033 fix perf bug
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-01 08:24:42 -08:00
Nikolaj Bjorner 018411bc58 fix bug in PB constraint init_watch handling, adding transitive reduction, HLE, ULT,
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-01 08:23:55 -08:00
Nikolaj Bjorner 427b5ef002 set eliminated to false on literals used in clauses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-30 11:20:19 -08:00
Nikolaj Bjorner da0aa71082 adding uhle/uhte for faster asymmetric branching
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-29 21:21:56 -08:00
Nikolaj Bjorner 26bd784b1f
Merge pull request #10 from TheRealNebus/opt
model converter fixes
2017-11-29 18:04:00 -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
Miguel Angelo Da Terra Neves cba0599046 model converter fixes
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-11-29 17:14:49 -08:00
Nikolaj Bjorner 7e56d05dcf translation?
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-28 15:17:00 -08:00
Nikolaj Bjorner a57628fbcc fix missing conversions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-28 14:12:05 -08:00
Nikolaj Bjorner f009dfcc00 update scoring approach
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-27 17:05:08 -08:00
Nikolaj Bjorner 99f2d916d5 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-11-27 16:24:24 -08:00
Nikolaj Bjorner fbae881ece add option to bypass model converter during constraint addition. Simplify model definitions that come from blocked clauses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-27 16:24:14 -08:00
Nikolaj Bjorner 62e3906957 add options to perform transitive reduction and add hyper binary clauses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-27 10:53:22 -08:00
Nikolaj Bjorner 15d8532d27 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-11-22 14:38:57 -08:00
Nikolaj Bjorner 1101c927c9 prepare for transitive reduction / hyper-binary clause addition
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-22 13:46:02 -08:00
Nikolaj Bjorner 5f0a02b5f7 remove output
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-22 09:05:17 -08:00
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 c6cb739b44 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-11-20 12:09:46 -08:00
Nikolaj Bjorner 92cd92e690 expose probing configuration parameters
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-20 12:09:37 -08:00
Nikolaj Bjorner 2f218b0bdc remove also cores as arguments to tactics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-19 12:18:50 -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 df6b1a707e remove proof_converter from tactic application, removing nlsat_tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-17 23:32:29 -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 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 37b94f1f90 fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-11 17:22:33 -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 454e12fc49 update to vector format
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-10 15:28:16 -08:00
Nikolaj Bjorner bc8681a0ea reset backtrack level after first backtrack
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-08 22:14:59 -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 0a9946578b use failed literal to asym branching
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-08 09:14:21 -08:00
Nikolaj Bjorner b099449ce1 asymm branch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-08 07:21:49 -08:00
Nikolaj Bjorner 2746528aab fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-07 17:16:36 -08:00
Nikolaj Bjorner 303157d3b7 allow incremental mode override
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-06 15:00:52 -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 59ea11b1a3 cube and conquer parallel tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-04 13:40:31 -05: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 92b5301b7f adding Cube method to .NET API, removing lookahead and get-lemmas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-29 08:57:24 -07:00
Nikolaj Bjorner 2774d6896b fix variable naming bug for internal (fresh) constants clashing with external names
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-28 16:11:29 -07:00
Nikolaj Bjorner e4b595d490 add solver pool abstraction for Spacer
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-28 16:10:20 -07:00
Nikolaj Bjorner ba53fc1230 fix scc omitting blocked clauses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-27 17:29:26 -07:00
Nikolaj Bjorner 2a8a28bb59 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-10-27 15:41:24 -07: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
Miguel Angelo Da Terra Neves f1bad91609 Clean-up 2017-10-27 12:39:36 -07:00
Miguel Angelo Da Terra Neves 8bb2be1fba Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-10-25 17:08:10 -07:00
Miguel Angelo Da Terra Neves e1ff6304ed Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-10-25 17:06:08 -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 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
Miguel Angelo Da Terra Neves 4d9492176e Removed incremental disabling 2017-10-24 15:19:45 -07:00
Nikolaj Bjorner b72225d7d0 bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-24 15:16:59 -07:00
Miguel Angelo Da Terra Neves 8915d0a21f Tidy 2017-10-24 14:08:44 -07:00
Miguel Angelo Da Terra Neves 80041d7131 Fixed infinite loop bugs in blocked clause retention. Added option to
disable incremental sat solver
2017-10-24 13:51:27 -07:00
Nikolaj Bjorner f6ee6894c7 fix bugs related to reading configuration flags
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-24 09:59:23 -07:00
Miguel Angelo Da Terra Neves 63545c1e7b Fixes 2017-10-23 12:51:19 -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 42749e7b22 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-10-19 22:19:12 -07: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
Miguel Neves d58f42c821 Merge 2017-10-19 20:02:05 -07:00
Miguel Neves 3dd5630255 Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-10-19 19:53:25 -07:00
Miguel Neves ba6b024ac4 Reverted to March_CU like lookahead 2017-10-19 19:52:56 -07:00
Nikolaj Bjorner 636f740b1a fixup bdd reordering, assertions and perf
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-18 19:32:49 -07:00
Nikolaj Bjorner 553bf74f47 testing bdd for elim-vars
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-18 17:38:39 -07:00
Nikolaj Bjorner dc6ed64da1 testing bdd for elim-vars
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-18 17:37:38 -07:00
Nikolaj Bjorner 6155362571 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-10-18 08:57:43 -07:00
Nikolaj Bjorner edea879864 expose missed propagations
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-18 08:57:32 -07:00
Nikolaj Bjorner 80f24c29ab debugging reordering
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-18 08:52:03 -07:00
Nikolaj Bjorner 8811d78415 compress elimination stack representation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-17 21:28:48 -07:00
Miguel Neves cf2512ce90 Added literal promotion 2017-10-17 16:03:58 -07:00
Nikolaj Bjorner e0e7836c12 working on BDD reordering
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-17 14:20:49 -07:00
Nikolaj Bjorner 4944a86478 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-10-17 13:25:21 -07:00
Nikolaj Bjorner 43f8214453 local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-17 13:25:08 -07:00
Nikolaj Bjorner f39a4ece0d Merge pull request #6 from TheRealNebus/opt
Lookahead clause size optimization. Fixed some missing propagations
2017-10-17 13:22:40 -07:00
Miguel Neves 806690571e Lookahead clause size optimization. Fixed some missing propagations 2017-10-17 13:15:34 -07:00
Nikolaj Bjorner 42e9a0156b add elimination stack for model reconstruction
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-17 04:52:06 -07:00
Nikolaj Bjorner da4e8118b2 adding elim sequences
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-16 17:58:56 -07:00
Nikolaj Bjorner d9ccb3928e fix debug build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-16 09:05:25 -07:00
Nikolaj Bjorner 00a401260e fixing cce
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-15 21:19:02 -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 4d1acadabb fix leaks reported in #1309
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-15 09:56:21 -07:00
Nikolaj Bjorner 46fa245324 more agressive variable elimination
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-14 18:33:38 -07:00
Nikolaj Bjorner 1109316621 fixing projection
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-14 15:53:25 -07:00
Nikolaj Bjorner d36406f845 adding BDD-based variable elimination routine
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-14 15:12:02 -07:00
Nikolaj Bjorner 09fdfcc963 adding bdd package
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-14 11:40:20 -07:00
Nikolaj Bjorner d7b6373601 adding bdd package
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-14 10:41:17 -07:00
Nikolaj Bjorner 64ea473bc7 adding bdd
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-13 18:03:35 -07:00
Nikolaj Bjorner 4f7147dd78 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-10-13 11:22:58 -07:00
Nikolaj Bjorner 4d48811efd updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-13 11:22:47 -07:00
Miguel Neves 4394ce96ae More failed literals 2017-10-13 09:15:28 -07:00
Nikolaj Bjorner 708e8669fa fix faulty merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-13 07:41:31 -07:00
Nikolaj Bjorner c12439fe1e fix #1306
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-13 07:29:16 -07:00
Miguel Neves 56d785df94 Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-10-12 16:15:35 -07:00
Miguel Neves 56496ead2f Commit 2017-10-12 16:14:56 -07:00
Nikolaj Bjorner 25c1b41c51 tidy
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-12 15:56:09 -07:00