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

retire omega and use overflow detection including literals

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2022-12-03 16:54:07 -08:00
parent 5b8dcfb801
commit 0a5b03194c
2 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/math/polysat/saturation.cpp
View file

@ -128,10 +128,6 @@ namespace polysat {
return false; return false;
} }
void saturation::insert_omega(pdd const& x, pdd const& y) {
m_lemma.insert_eval(s.umul_ovfl(x, y));
}
/* /*
* Match [v] .. <= v * Match [v] .. <= v
*/ */
@ -305,15 +301,16 @@ namespace polysat {
pdd x = s.var(v); pdd x = s.var(v);
pdd y = x; pdd y = x;
pdd z = x; pdd z = x;
signed_constraint non_ovfl;
if (!is_xY_l_xZ(v, xy_l_xz, y, z)) if (!is_xY_l_xZ(v, xy_l_xz, y, z))
return false; return false;
// TODO - use is_non_overflow(x, y, non_ovfl) instead?
if (!is_non_overflow(x, y))
return false;
if (!xy_l_xz.is_strict() && s.get_value(v).is_zero()) if (!xy_l_xz.is_strict() && s.get_value(v).is_zero())
return false; return false;
if (!is_non_overflow(x, y, non_ovfl))
return false;
m_lemma.reset(); m_lemma.reset();
insert_omega(x, y); m_lemma.insert(~non_ovfl);
if (!xy_l_xz.is_strict()) if (!xy_l_xz.is_strict())
m_lemma.insert_eval(s.eq(x)); m_lemma.insert_eval(s.eq(x));
return propagate(core, xy_l_xz, xy_l_xz, xy_l_xz.is_strict(), y, z); return propagate(core, xy_l_xz, xy_l_xz, xy_l_xz.is_strict(), y, z);
@ -351,11 +348,12 @@ namespace polysat {
SASSERT(is_l_v(v, l_y)); SASSERT(is_l_v(v, l_y));
SASSERT(verify_Xy_l_XZ(v, yx_l_zx, x, z)); SASSERT(verify_Xy_l_XZ(v, yx_l_zx, x, z));
pdd const y = s.var(v); pdd const y = s.var(v);
if (!is_non_overflow(x, y)) signed_constraint non_ovfl;
if (!is_non_overflow(x, y, non_ovfl))
return false; return false;
pdd const& z_prime = l_y.lhs(); pdd const& z_prime = l_y.lhs();
m_lemma.reset(); m_lemma.reset();
insert_omega(x, y); m_lemma.insert(~non_ovfl);
return propagate(core, l_y, yx_l_zx, yx_l_zx.is_strict() || l_y.is_strict(), z_prime * x, z * x); return propagate(core, l_y, yx_l_zx, yx_l_zx.is_strict() || l_y.is_strict(), z_prime * x, z * x);
} }
@ -391,10 +389,11 @@ namespace polysat {
SASSERT(is_g_v(z, z_l_y)); SASSERT(is_g_v(z, z_l_y));
SASSERT(verify_YX_l_zX(z, yx_l_zx, x, y)); SASSERT(verify_YX_l_zX(z, yx_l_zx, x, y));
pdd const& y_prime = z_l_y.rhs(); pdd const& y_prime = z_l_y.rhs();
if (!is_non_overflow(x, y_prime)) signed_constraint non_ovfl;
if (!is_non_overflow(x, y_prime, non_ovfl))
return false; return false;
m_lemma.reset(); m_lemma.reset();
insert_omega(x, y_prime); m_lemma.insert(~non_ovfl);
return propagate(core, yx_l_zx, z_l_y, z_l_y.is_strict() || yx_l_zx.is_strict(), y * x, y_prime * x); return propagate(core, yx_l_zx, z_l_y, z_l_y.is_strict() || yx_l_zx.is_strict(), y * x, y_prime * x);
} }
@ -431,10 +430,11 @@ namespace polysat {
SASSERT(is_g_v(x, x_l_z)); SASSERT(is_g_v(x, x_l_z));
SASSERT(verify_Y_l_Ax(x, y_l_ax, a, y)); SASSERT(verify_Y_l_Ax(x, y_l_ax, a, y));
pdd const& z = x_l_z.rhs(); pdd const& z = x_l_z.rhs();
if (!is_non_overflow(a, z)) signed_constraint non_ovfl;
if (!is_non_overflow(a, z, non_ovfl))
return false; return false;
m_lemma.reset(); m_lemma.reset();
insert_omega(a, z); m_lemma.insert(~non_ovfl);
return propagate(core, y_l_ax, x_l_z, x_l_z.is_strict() || y_l_ax.is_strict(), y, a * z); return propagate(core, y_l_ax, x_l_z, x_l_z.is_strict() || y_l_ax.is_strict(), y, a * z);
} }
@ -512,21 +512,19 @@ namespace polysat {
pdd y = m.zero(); pdd y = m.zero();
pdd a = m.zero(); pdd a = m.zero();
pdd b = m.zero(); pdd b = m.zero();
rational b_val, y_val; pdd X = s.var(x);
signed_constraint non_ovfl;
if (!is_AxB_eq_0(x, axb_l_y, a, b, y)) if (!is_AxB_eq_0(x, axb_l_y, a, b, y))
return false; return false;
if (!is_forced_eq(b, -1)) if (!is_forced_eq(b, -1))
return false; return false;
pdd X = s.var(x); if (!is_non_overflow(a, X, non_ovfl))
signed_constraint non_ovfl; return false;
if (is_non_overflow(a, X, non_ovfl)) { m_lemma.reset();
m_lemma.reset(); m_lemma.insert(~s.eq(b, rational(-1)));
m_lemma.insert(~s.eq(b, rational(-1))); m_lemma.insert(~s.eq(y));
m_lemma.insert(~s.eq(y)); m_lemma.insert(~non_ovfl);
m_lemma.insert(~non_ovfl); return propagate(core, axb_l_y, axb_l_y, s.eq(X, 1));
return propagate(core, axb_l_y, axb_l_y, s.eq(X, 1));
}
return false;
} }
/** /**

1
src/math/polysat/saturation.h
View file

@ -28,7 +28,6 @@ namespace polysat {
void set_rule(char const* r) { m_rule = r; } void set_rule(char const* r) { m_rule = r; }
void insert_omega(pdd const& x, pdd const& y);
bool is_non_overflow(pdd const& x, pdd const& y, signed_constraint& c); bool is_non_overflow(pdd const& x, pdd const& y, signed_constraint& c);
signed_constraint ineq(bool strict, pdd const& lhs, pdd const& rhs); signed_constraint ineq(bool strict, pdd const& lhs, pdd const& rhs);
bool propagate(conflict& core, inequality const& crit1, inequality const& crit2, signed_constraint c); bool propagate(conflict& core, inequality const& crit1, inequality const& crit2, signed_constraint c);