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

913 commits

Author SHA1 Message Date
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
Nikolaj Bjorner f86b85274a merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-12 15:52:06 -07:00
Nikolaj Bjorner a658e46b1f removing failed literal macro 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-12 15:46:25 -07:00
Miguel Neves bdce957ac8 Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-10-12 15:34:56 -07:00
Miguel Neves 611a13e8b3 Changed lookahead backtrack. Parent lookahead re-use fix 2017-10-12 14:34:42 -07:00
Nikolaj Bjorner 4adf4d4ac2 micro opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-12 12:08:54 -07:00
Nikolaj Bjorner 5afef07f40 remove traces of old n-ary representation, add checks 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-12 08:37:49 -07:00
Nikolaj Bjorner 99b232a4c5 fix lookahead with ba extension 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-11 17:30:21 -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 d2395ad897 merge with Miguel's fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-10 16:47:07 -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
Miguel Neves 01897831fb Dynamic delta trigger decrease 2017-10-10 15:59:53 -07:00
Nikolaj Bjorner 8b32c15ac9 use clause structure for nary 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-10 11:49:31 -07:00
Nikolaj Bjorner a0cd6e0fca adding outline for parallel tactic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-09 16:47:23 -07:00
Nikolaj Bjorner cae414e575 fixes for #1296, removing COMPILE_TIME_ASSERT 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-09 13:59:44 -07:00
Nikolaj Bjorner 42de274307 bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-09 07:49:20 -07:00
Nikolaj Bjorner 79b2a4f605 bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-09 07:22:02 -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 356835533a clean up debug output 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-08 10:47:15 -07:00
Nikolaj Bjorner 6b88446ee8 bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-07 19:02:06 +01:00
Miguel Neves 4d91169118 Cuber fixes. Added March_CU heuristics 2017-10-06 16:10:05 -07:00
Nikolaj Bjorner 133f376172 assertion fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-29 19:53:22 -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 705b107846 fixed encoding for order constraints 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-28 20:05:46 -07:00
Nikolaj Bjorner 01879ed1ed remove NEW_CLAUSE variant 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-28 15:25:36 -07:00
Nikolaj Bjorner a625301a41 expose incremental cubing over API 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-28 15:05:10 -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
Nikolaj Bjorner 6c4cadd223 tidy 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-28 00:33:56 -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 7db1132c33 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-27 14:54:24 -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 41ac4ff308 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-09-27 07:20:36 -07:00
Nikolaj Bjorner 340b460f74 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-27 07:20:34 -07:00
Nikolaj Bjorner 0833a9ee14 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-27 07:15:06 -07:00
Nikolaj Bjorner 3a832e5b24 tidy 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-26 20:14:49 -07:00
Nikolaj Bjorner 1149955893 working on new clause organization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-26 14:39:33 -07:00
Nikolaj Bjorner 7b9156dd5b adding new clause management 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-26 10:17:57 -07:00
Nikolaj Bjorner e2ed658c6c working on new clause management 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-26 08:31:10 -07:00
Nikolaj Bjorner e7449f3811 working on new clause management 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-26 00:05:53 -07:00
Nikolaj Bjorner d41696b91e adding new clause management 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-25 20:29:53 -07:00
Nikolaj Bjorner ced2029ae9 local changes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-25 16:37:15 -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 edb3569599 updates to sorting networks 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-23 22:36:19 -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 3c4ac9aee5 add HS and unit literal reward schemes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 12:02:50 -07: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 d03e3765b9 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-09-19 08:31:56 -07:00
Nikolaj Bjorner d1a227493a n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 08:31:31 -07:00
Nikolaj Bjorner 4813bcc11f merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 08:31:01 -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 394d54fa8b fix missin clause generation for ad-hoc handling of conjunction #1245 2017-09-05 09:54:52 -07:00
Nikolaj Bjorner 5db349f6fa raise an exception if trying proof generation for the SAT solver. Stackoverflow question https://stackoverflow.com/questions/45885321/check-function-while-qf-fd-logic-is-set-throws-accessviolationexception 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-27 23:52:27 -07:00
Nikolaj Bjorner 2b82fd5d0c updated include directives 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-01 10:51:47 -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 b1090f4399 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-31 09:49:11 -07:00
Nikolaj Bjorner b70da2a555 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-07-28 10:32:02 -07:00
Nikolaj Bjorner b2b2c636f8 update for equivalences 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-28 10:30:23 -07:00
Nikolaj Bjorner 1946441e17 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-07-27 18:42:16 -07:00
Nikolaj Bjorner b482dbd589 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-27 17:02:27 -07:00
Nikolaj Bjorner 30b0d5ba13 Merge branch 'master' of https://github.com/z3prover/z3 2017-07-24 10:49:54 -07:00
Nikolaj Bjorner 8c67e958ff n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-16 18:51:01 +02:00
Christoph M. Wintersteiger da34de340d Fixed bug in sat model converter. Fixes #1148. 2017-07-15 20:25:13 +01:00
Nikolaj Bjorner 55f54b4fdc fixing overflow checking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-07 13:53:26 -07:00
Nikolaj Bjorner 53c38f02d5 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-06 22:12:18 -07: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 4132c44f8d update to avoid difference in debug/release builds 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-02 16:24:59 -07:00
Nikolaj Bjorner 480296ed96 updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-02 11:27:02 -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 085c18a92a add pb to local search 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 20:29:13 -07:00
Nikolaj Bjorner 5c83dfee06 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 18:04:08 -07:00
Nikolaj Bjorner e176c4ba9a rename to ba_solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 17:54:16 -07:00
Nikolaj Bjorner 6fad478a18 reorg 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 17:46:29 -07:00
Nikolaj Bjorner a28a8304b7 Dev (#56) 
* introduce int_solver.h

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* add int_solver class

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* track which var is an integer

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add queries for integrality of vars

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* resurrect lp_tst in its own director lp

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add file

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add_constraint has got a body

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* fix add_constraint and substitute_terms_in_linear_expression

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* after merge with Z3Prover

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* adding stub check_int_feasibility()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Dev (#50)

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* small fix in lar_solver.cpp

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* adding some content to the new check_int_feasibility()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Dev (#51)

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding more nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* nlsat integration

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding constraints

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* add missing initialization

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* test

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* Dev (#53)

* change in a comment

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Disabled debug output

* removing FOCI2 interface from interp

* remove foci reference from cmakelist.txt

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding more nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* nlsat integration

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding constraints

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* add missing initialization

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* debugging nra

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* updates to nra_solver integration to call it directly from theory_lra instead of over lar_solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* n/a

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* integrate nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* tidy

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* preserve is_int flag

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* remove a debug printout

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Dev (#54)

* change in a comment

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Disabled debug output

* removing FOCI2 interface from interp

* remove foci reference from cmakelist.txt

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding more nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* nlsat integration

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding constraints

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* add missing initialization

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* debugging nra

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* updates to nra_solver integration to call it directly from theory_lra instead of over lar_solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* n/a

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* integrate nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* tidy

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* use integer test from lra solver, updated it to work on term variables

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix equality check in assume-eq

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix model_is_int_feasible

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* untested gcd_test()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* call fill_explanation_from_fixed_columns()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add the call to pivot_fixed_vars_from_basis() to int_solver.cpp::check()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* port more of theory_arith_int.h

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* use statistics of lar_solver by theory_lra.cpp

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* port more code to int_solver.cpp

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add an assert

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* more int porting

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* fix a bug in pivot_fixed_vars_from_basis

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* small change

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* implement find_inf_int_base_column()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* catch unregistered vars in add_var_bound

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add a file

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* compile for vs2012

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* fix asserts in add_var_bound

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* fix the lp_solver init when workig on an mps file

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* towards int_solver::check()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* change in int_solver::check() signature

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add handlers for lia moves

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* spacing

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 13:12:12 -07:00
Nikolaj Bjorner 6f4c873b29 debugging 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-27 13:18:20 -07:00
Nikolaj Bjorner 94416bea52 fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-27 09:07:55 -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
Dan Liew 229fd3dc3e [CMake] Fix dependencies for generating install_tactic.cpp. 
Previously CMake was not aware of which headers files the generation
of `install_tactic.cpp` depended on. Consequently this could result
in broken incremental builds if

* Existing headers that declared tactics/probes changed.
* New tactics/probes were added to new header files.

Now the `z3_add_component()` CMake function has been modifed to take an
optional `TACTIC_HEADERS` argument which allows the headers that declare
tactics/probes to be explicitly listed. The necessary component
declarations have been modified to declare their tactic/probe header
files.

With this information CMake will now regenerate `install_tactic.cpp`
correctly.

This required the `mk_install_tactic_cpp_internal()` function to be
changed to take a list of header files rather than a list of component
source directories. The two consumers (CMake and Python/Makefile build
systems) of this function have been modified to work with this change.

This partially fixes #1030.
 2017-06-21 23:03:48 +01:00
Nikolaj Bjorner 5f93b9a081 add N-ary clause reward heuristic based on discussions with Heule 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-21 10:30:30 -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
Dan Liew 4b517b96df [CMake] Move CMake files into their intended location so the 
`contrib/cmake/bootstrap.py` script no longer needs to be executed.

The previous location of the CMake files was a compromise proposed
by @agurfinkel in #461. While this has served us well (allowing progress
to be made) over time limitations of this approach have appeared.

The main problem is that doing many git operations (e.g. pull, rebase)
means the CMake files don't get updated unless the user remembers to
run the script. This can lead to broken and confusing build system
behaviour.

This commit only does the file moving and necessary changes to
`.gitignore`. Other changes will be done in subsequent commits.
 2017-06-12 11:59:00 +01: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 bc54197fb3 64 bit clause offset fix 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-10 10:46:51 -07:00
Nikolaj Bjorner 8acb37e734 revert change to 1065 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-10 09:45:18 -07:00
Nikolaj Bjorner b8e8e090ad filter assumptions by membership in initial list #1065 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-10 09:30:01 -07:00
Nikolaj Bjorner a55416351f lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-09 09:17:20 -07:00
Nikolaj Bjorner c870b77366 fixes to lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-08 17:25:06 -07:00