mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-18 09:12:16 +00:00
Code Activity

fix issues for user-propagator from new core

Browse source
This commit is contained in:
Nikolaj Bjorner 2022-08-09 14:56:27 +03:00
parent f27485dae7
commit 49064252ac
4 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/sat/sat_solver/inc_sat_solver.cpp
View file

@ -657,7 +657,8 @@ public:
} }
euf::solver* ensure_euf() { euf::solver* ensure_euf() {
auto* ext = dynamic_cast<euf::solver*>(m_solver.get_extension()); m_goal2sat.init(m, m_params, m_solver, m_map, m_dep2asm, is_incremental());
auto* ext = m_goal2sat.ensure_euf();
return ext; return ext;
} }

7
src/sat/smt/euf_solver.cpp
View file

@ -778,7 +778,7 @@ namespace euf {
} }
for (auto const& thv : enode_th_vars(n)) { for (auto const& thv : enode_th_vars(n)) {
auto* th = m_id2solver.get(thv.get_id(), nullptr); auto* th = m_id2solver.get(thv.get_id(), nullptr);
if (th && !th->is_fixed(thv.get_var(), val, explain)) if (th && th->is_fixed(thv.get_var(), val, explain))
return true; return true;
} }
return false; return false;
@ -1067,10 +1067,7 @@ namespace euf {
user_propagator::fresh_eh_t& fresh_eh) { user_propagator::fresh_eh_t& fresh_eh) {
m_user_propagator = alloc(user_solver::solver, *this); m_user_propagator = alloc(user_solver::solver, *this);
m_user_propagator->add(ctx, push_eh, pop_eh, fresh_eh); m_user_propagator->add(ctx, push_eh, pop_eh, fresh_eh);
for (unsigned i = m_scopes.size(); i-- > 0; ) add_solver(m_user_propagator);
m_user_propagator->push();
m_solvers.push_back(m_user_propagator);
m_id2solver.setx(m_user_propagator->get_id(), m_user_propagator, nullptr);
} }
bool solver::watches_fixed(enode* n) const { bool solver::watches_fixed(enode* n) const {

5
src/sat/tactic/goal2sat.cpp
View file

@ -1013,6 +1013,11 @@ goal2sat::~goal2sat() {
dealloc(m_imp); dealloc(m_imp);
} }
euf::solver* goal2sat::ensure_euf() {
return m_imp->ensure_euf();
}
void goal2sat::collect_param_descrs(param_descrs & r) { void goal2sat::collect_param_descrs(param_descrs & r) {
insert_max_memory(r); insert_max_memory(r);
r.insert("ite_extra", CPK_BOOL, "(default: true) add redundant clauses (that improve unit propagation) when encoding if-then-else formulas"); r.insert("ite_extra", CPK_BOOL, "(default: true) add redundant clauses (that improve unit propagation) when encoding if-then-else formulas");

10
src/sat/tactic/goal2sat.h
View file

@ -33,6 +33,10 @@ Notes:
#include "sat/smt/atom2bool_var.h" #include "sat/smt/atom2bool_var.h"
#include "sat/smt/sat_internalizer.h" #include "sat/smt/sat_internalizer.h"
namespace euf {
class solver;
}
class goal2sat { class goal2sat {
public: public:
typedef obj_map<expr, sat::literal> dep2asm_map; typedef obj_map<expr, sat::literal> dep2asm_map;
@ -41,7 +45,6 @@ private:
imp * m_imp; imp * m_imp;
unsigned m_scopes = 0; unsigned m_scopes = 0;
void init(ast_manager& m, params_ref const & p, sat::solver_core & t, atom2bool_var & map, dep2asm_map& dep2asm, bool default_external);
public: public:
goal2sat(); goal2sat();
@ -66,6 +69,9 @@ public:
void operator()(ast_manager& m, unsigned n, expr* const* fmls, params_ref const & p, sat::solver_core & t, atom2bool_var & map, dep2asm_map& dep2asm, bool default_external = false); void operator()(ast_manager& m, unsigned n, expr* const* fmls, params_ref const & p, sat::solver_core & t, atom2bool_var & map, dep2asm_map& dep2asm, bool default_external = false);
void init(ast_manager& m, params_ref const & p, sat::solver_core & t, atom2bool_var & map, dep2asm_map& dep2asm, bool default_external);
void assumptions(ast_manager& m, unsigned n, expr* const* fmls, params_ref const & p, sat::solver_core & t, atom2bool_var & map, dep2asm_map& dep2asm, bool default_external = false); void assumptions(ast_manager& m, unsigned n, expr* const* fmls, params_ref const & p, sat::solver_core & t, atom2bool_var & map, dep2asm_map& dep2asm, bool default_external = false);
void get_interpreted_funs(func_decl_ref_vector& funs); void get_interpreted_funs(func_decl_ref_vector& funs);
@ -82,4 +88,6 @@ public:
void user_pop(unsigned n); void user_pop(unsigned n);
euf::solver* ensure_euf();
}; };