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

compile numeral constants into separate variables in the new core

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2023-06-21 09:36:20 -07:00
parent 3517361a73
commit 1b263f85e4
2 changed files with 37 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/sat/smt/arith_internalize.cpp
View file

@ -160,7 +160,6 @@ namespace arith {
expr_ref_vector& terms = st.terms(); expr_ref_vector& terms = st.terms();
svector<theory_var>& vars = st.vars(); svector<theory_var>& vars = st.vars();
vector<rational>& coeffs = st.coeffs(); vector<rational>& coeffs = st.coeffs();
rational& offset = st.offset();
rational r; rational r;
expr* n1, * n2; expr* n1, * n2;
unsigned index = 0; unsigned index = 0;
@ -204,7 +203,9 @@ namespace arith {
++index; ++index;
} }
else if (a.is_numeral(n, r)) { else if (a.is_numeral(n, r)) {
offset += coeffs[index] * r; theory_var v = internalize_numeral(to_app(n), r);
coeffs[vars.size()] = coeffs[index];
vars.push_back(v);
++index; ++index;
} }
else if (a.is_uminus(n, n1)) { else if (a.is_uminus(n, n1)) {
@ -457,6 +458,19 @@ namespace arith {
return v; return v;
} }
theory_var solver::internalize_numeral(app* n, rational const& val) {
theory_var v = mk_evar(n);
lpvar vi = get_lpvar(v);
if (vi == UINT_MAX) {
vi = lp().add_var(v, a.is_int(n));
add_def_constraint_and_equality(vi, lp::GE, val);
add_def_constraint_and_equality(vi, lp::LE, val);
register_fixed_var(v, val);
}
return v;
}
theory_var solver::internalize_mul(app* t) { theory_var solver::internalize_mul(app* t) {
SASSERT(a.is_mul(t)); SASSERT(a.is_mul(t));
internalize_args(t, true); internalize_args(t, true);
@ -484,29 +498,13 @@ namespace arith {
theory_var v = mk_evar(term); theory_var v = mk_evar(term);
TRACE("arith", tout << mk_bounded_pp(term, m) << " v" << v << "\n";); TRACE("arith", tout << mk_bounded_pp(term, m) << " v" << v << "\n";);
if (is_unit_var(st) && v == st.vars()[0]) { if (is_unit_var(st) && v == st.vars()[0])
return st.vars()[0]; return st.vars()[0];
}
else if (is_one(st) && a.is_numeral(term)) {
return lp().local_to_external(get_one(a.is_int(term)));
}
else if (is_zero(st) && a.is_numeral(term)) {
return lp().local_to_external(get_zero(a.is_int(term)));
}
else {
init_left_side(st); init_left_side(st);
lpvar vi = get_lpvar(v); lpvar vi = get_lpvar(v);
if (vi == UINT_MAX) { if (vi == UINT_MAX) {
if (m_left_side.empty()) {
vi = lp().add_var(v, a.is_int(term));
add_def_constraint_and_equality(vi, lp::GE, st.offset());
add_def_constraint_and_equality(vi, lp::LE, st.offset());
register_fixed_var(v, st.offset());
return v;
}
if (!st.offset().is_zero()) {
m_left_side.push_back(std::make_pair(st.offset(), get_one(a.is_int(term))));
}
if (m_left_side.empty()) { if (m_left_side.empty()) {
vi = lp().add_var(v, a.is_int(term)); vi = lp().add_var(v, a.is_int(term));
add_def_constraint_and_equality(vi, lp::GE, rational(0)); add_def_constraint_and_equality(vi, lp::GE, rational(0));
@ -523,18 +521,9 @@ namespace arith {
} }
return v; return v;
} }
}
bool solver::is_unit_var(scoped_internalize_state& st) { bool solver::is_unit_var(scoped_internalize_state& st) {
return st.offset().is_zero() && st.vars().size() == 1 && st.coeffs()[0].is_one(); return st.vars().size() == 1 && st.coeffs()[0].is_one();
}
bool solver::is_one(scoped_internalize_state& st) {
return st.offset().is_one() && st.vars().empty();
}
bool solver::is_zero(scoped_internalize_state& st) {
return st.offset().is_zero() && st.vars().empty();
} }
void solver::init_left_side(scoped_internalize_state& st) { void solver::init_left_side(scoped_internalize_state& st) {

4
src/sat/smt/arith_solver.h
View file

@ -145,13 +145,11 @@ namespace arith {
expr_ref_vector m_terms; expr_ref_vector m_terms;
vector<rational> m_coeffs; vector<rational> m_coeffs;
svector<theory_var> m_vars; svector<theory_var> m_vars;
rational m_offset;
ptr_vector<expr> m_to_ensure_enode, m_to_ensure_var; ptr_vector<expr> m_to_ensure_enode, m_to_ensure_var;
internalize_state(ast_manager& m) : m_terms(m) {} internalize_state(ast_manager& m) : m_terms(m) {}
void reset() { void reset() {
m_terms.reset(); m_terms.reset();
m_coeffs.reset(); m_coeffs.reset();
m_offset.reset();
m_vars.reset(); m_vars.reset();
m_to_ensure_enode.reset(); m_to_ensure_enode.reset();
m_to_ensure_var.reset(); m_to_ensure_var.reset();
@ -178,7 +176,6 @@ namespace arith {
expr_ref_vector& terms() { return m_st.m_terms; } expr_ref_vector& terms() { return m_st.m_terms; }
vector<rational>& coeffs() { return m_st.m_coeffs; } vector<rational>& coeffs() { return m_st.m_coeffs; }
svector<theory_var>& vars() { return m_st.m_vars; } svector<theory_var>& vars() { return m_st.m_vars; }
rational& offset() { return m_st.m_offset; }
ptr_vector<expr>& to_ensure_enode() { return m_st.m_to_ensure_enode; } ptr_vector<expr>& to_ensure_enode() { return m_st.m_to_ensure_enode; }
ptr_vector<expr>& to_ensure_var() { return m_st.m_to_ensure_var; } ptr_vector<expr>& to_ensure_var() { return m_st.m_to_ensure_var; }
void push(expr* e, rational c) { m_st.m_terms.push_back(e); m_st.m_coeffs.push_back(c); } void push(expr* e, rational c) { m_st.m_terms.push_back(e); m_st.m_coeffs.push_back(c); }
@ -290,6 +287,7 @@ namespace arith {
void ensure_arg_vars(app* t); void ensure_arg_vars(app* t);
theory_var internalize_power(app* t, app* n, unsigned p); theory_var internalize_power(app* t, app* n, unsigned p);
theory_var internalize_mul(app* t); theory_var internalize_mul(app* t);
theory_var internalize_numeral(app* t, rational const& v);
theory_var internalize_def(expr* term); theory_var internalize_def(expr* term);
theory_var internalize_def(expr* term, scoped_internalize_state& st); theory_var internalize_def(expr* term, scoped_internalize_state& st);
theory_var internalize_linearized_def(expr* term, scoped_internalize_state& st); theory_var internalize_linearized_def(expr* term, scoped_internalize_state& st);