mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-09 04:31:24 +00:00
Code Activity

Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt

Browse source
This commit is contained in:
Nikolaj Bjorner 2017-11-09 09:55:41 -08:00
commit ee3ed3a27a
21 changed files with 47 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tactic/portfolio/bounded_int2bv_solver.cpp
View file

@ -163,7 +163,7 @@ public:
virtual void set_reason_unknown(char const* msg) { m_solver->set_reason_unknown(msg); }
virtual void get_labels(svector<symbol> & r) { m_solver->get_labels(r); }
virtual ast_manager& get_manager() const { return m; }
virtual expr_ref cube() { flush_assertions(); return m_solver->cube(); }
virtual expr_ref cube(unsigned backtrack_level) { flush_assertions(); return m_solver->cube(backtrack_level); }
virtual lbool find_mutexes(expr_ref_vector const& vars, vector<expr_ref_vector>& mutexes) { return m_solver->find_mutexes(vars, mutexes); }
virtual lbool get_consequences_core(expr_ref_vector const& asms, expr_ref_vector const& vars, expr_ref_vector& consequences) {
flush_assertions();

2
src/tactic/portfolio/enum2bv_solver.cpp
View file

@ -113,7 +113,7 @@ public:
virtual void get_labels(svector<symbol> & r) { m_solver->get_labels(r); }
virtual ast_manager& get_manager() const { return m; }
virtual lbool find_mutexes(expr_ref_vector const& vars, vector<expr_ref_vector>& mutexes) { return m_solver->find_mutexes(vars, mutexes); }
virtual expr_ref cube() { return m_solver->cube(); }
virtual expr_ref cube(unsigned backtrack_level) { return m_solver->cube(backtrack_level); }
virtual lbool get_consequences_core(expr_ref_vector const& asms, expr_ref_vector const& vars, expr_ref_vector& consequences) {
datatype_util dt(m);

2
src/tactic/portfolio/parallel_tactic.cpp
View file

@ -414,7 +414,7 @@ private:
cubes.reset();
s.set_cube_params();
while (true) {
expr_ref c = s.get_solver().cube();
expr_ref c = s.get_solver().cube(UINT_MAX); // TBD tune this
VERIFY(c);
if (m.is_false(c)) {
break;

2
src/tactic/portfolio/pb2bv_solver.cpp
View file

@ -103,7 +103,7 @@ public:
virtual void set_reason_unknown(char const* msg) { m_solver->set_reason_unknown(msg); }
virtual void get_labels(svector<symbol> & r) { m_solver->get_labels(r); }
virtual ast_manager& get_manager() const { return m; }
virtual expr_ref cube() { flush_assertions(); return m_solver->cube(); }
virtual expr_ref cube(unsigned backtrack_level) { flush_assertions(); return m_solver->cube(backtrack_level); }
virtual lbool find_mutexes(expr_ref_vector const& vars, vector<expr_ref_vector>& mutexes) { return m_solver->find_mutexes(vars, mutexes); }
virtual lbool get_consequences_core(expr_ref_vector const& asms, expr_ref_vector const& vars, expr_ref_vector& consequences) {
flush_assertions();