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

8133 commits

Author SHA1 Message Date
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 35a3523fd6 fix bug in double collection of declarations
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-11 14:09:34 -08:00
Nikolaj Bjorner 6d729f1f15 disable UHLT
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-11 10:36:42 -08:00
Nikolaj Bjorner 9ff724ec6d
Merge pull request #11 from TheRealNebus/opt
Opt
2017-12-05 18:03:24 -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 b5ff4602e9 fix model converter to include negation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-27 17:50:51 -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 107bfb1438 print model-add in display method
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-21 21:26:07 -08:00