mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-07 06:33:23 +00:00
Code Activity

fix #3120

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-03-06 06:49:38 +01:00
parent a20d4fa362
commit 7d976e4f4d
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -879,11 +879,11 @@ private:
} }
TRACE("sat", m_solver.display_model(tout);); TRACE("sat", m_solver.display_model(tout););
sat::model ll_m = m_solver.get_model(); sat::model ll_m = m_solver.get_model();
mdl = alloc(model, m);
if (m_sat_mc) { if (m_sat_mc) {
(*m_sat_mc)(ll_m); (*m_sat_mc)(ll_m);
} }
mdl = alloc(model, m); for (sat::bool_var v = 0; m_sat_mc && v < m_sat_mc->num_vars(); ++v) {
for (sat::bool_var v = 0; v < ll_m.size(); ++v) {
expr* n = m_sat_mc->var2expr(v); expr* n = m_sat_mc->var2expr(v);
if (!n || !is_app(n) || to_app(n)->get_num_args() > 0) { if (!n || !is_app(n) || to_app(n)->get_num_args() > 0) {
continue; continue;

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

@ -96,6 +96,7 @@ public:
void set_env(ast_pp_util* visitor) override; void set_env(ast_pp_util* visitor) override;
void display(std::ostream& out) override; void display(std::ostream& out) override;
void get_units(obj_map<expr, bool>& units) override; void get_units(obj_map<expr, bool>& units) override;
unsigned num_vars() const { return m_var2expr.size(); }
app* var2expr(sat::bool_var v) const { return m_var2expr.get(v, nullptr); } app* var2expr(sat::bool_var v) const { return m_var2expr.get(v, nullptr); }
expr_ref lit2expr(sat::literal l); expr_ref lit2expr(sat::literal l);
void insert(sat::bool_var v, app * atom, bool aux); void insert(sat::bool_var v, app * atom, bool aux);