mirror of
https://github.com/Z3Prover/z3
synced 2025-06-25 07:13:41 +00:00
forbidden_intervals::match_non_max
This commit is contained in:
parent
3739372776
commit
516eb55442
2 changed files with 45 additions and 27 deletions
|
@ -9,7 +9,7 @@ Module Name:
|
||||||
|
|
||||||
Author:
|
Author:
|
||||||
|
|
||||||
Jakob Rath 2021-04-6
|
Jakob Rath 2021-04-06
|
||||||
Nikolaj Bjorner (nbjorner) 2021-03-19
|
Nikolaj Bjorner (nbjorner) 2021-03-19
|
||||||
|
|
||||||
--*/
|
--*/
|
||||||
|
@ -166,11 +166,11 @@ namespace polysat {
|
||||||
_backtrack.released = true;
|
_backtrack.released = true;
|
||||||
|
|
||||||
// v > q
|
// v > q
|
||||||
if (ok1 && !ok2 && match_non_zero(c, a1, b1, e1, fi))
|
if (ok1 && !ok2 && match_non_zero(c, a1, b1, e1, c->to_ule().rhs(), fi))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// p > v
|
// p > v
|
||||||
if (!ok1 && ok2 && match_non_max(c, a2, b2, e2, fi))
|
if (!ok1 && ok2 && match_non_max(c, c->to_ule().lhs(), a2, b2, e2, fi))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (!ok1 || !ok2 || (a1.is_zero() && a2.is_zero())) {
|
if (!ok1 || !ok2 || (a1.is_zero() && a2.is_zero())) {
|
||||||
|
@ -478,26 +478,42 @@ namespace polysat {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* p > v
|
* p > v
|
||||||
* forbidden interval for v is [-1,0[
|
* forbidden interval for v is [p;0[ but at least [-1,0[
|
||||||
|
*
|
||||||
* p > v + k
|
* p > v + k
|
||||||
* forbidden interval for v is [-k-1,-k[
|
* forbidden interval for v is [p-k;-k[ but at least [-1-k,-k[
|
||||||
|
*
|
||||||
|
* p > a*v + k, a odd
|
||||||
|
* forbidden interval for v is [ a^-1*(-1-k) ; a^-1*(-1-k) + 1 [
|
||||||
*/
|
*/
|
||||||
bool forbidden_intervals::match_non_max(
|
bool forbidden_intervals::match_non_max(
|
||||||
signed_constraint const& c,
|
signed_constraint const& c,
|
||||||
rational const & a2, pdd const& b2, pdd const& e2,
|
pdd const& p,
|
||||||
|
rational const& a2, pdd const& b2, pdd const& e2,
|
||||||
fi_record& fi) {
|
fi_record& fi) {
|
||||||
_last_function = __func__;
|
_last_function = __func__;
|
||||||
if (a2.is_one() && b2.is_val() && c.is_negative()) {
|
if (a2.is_one() && b2.is_val() && c.is_negative()) {
|
||||||
auto& m = e2.manager();
|
auto& m = e2.manager();
|
||||||
rational const& mod_value = m.two_to_N();
|
rational const& mod_value = m.two_to_N();
|
||||||
rational lo_val(mod(-b2.val() - 1, mod_value));
|
rational hi_val = (-b2).val();
|
||||||
auto lo = -e2 - 1;
|
pdd hi = -e2;
|
||||||
rational hi_val(mod(lo_val + 1, mod_value));
|
rational lo_val = mod(hi_val - 1, mod_value);
|
||||||
auto hi = -e2;
|
pdd lo = p - e2;
|
||||||
|
fi.coeff = 1;
|
||||||
|
fi.interval = eval_interval::proper(lo, lo_val, hi, hi_val);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (a2.is_odd() && b2.is_val() && c.is_negative()) {
|
||||||
|
auto& m = e2.manager();
|
||||||
|
rational const& mod_value = m.two_to_N();
|
||||||
|
rational a2_inv;
|
||||||
|
VERIFY(a2.mult_inverse(m.power_of_2(), a2_inv));
|
||||||
|
rational lo_val = mod(a2_inv * (-1 - b2.val()), mod_value);
|
||||||
|
pdd lo = a2_inv * (-1 - e2);
|
||||||
|
rational hi_val = mod(lo_val + 1, mod_value);
|
||||||
|
pdd hi = lo + 1;
|
||||||
fi.coeff = 1;
|
fi.coeff = 1;
|
||||||
fi.interval = eval_interval::proper(lo, lo_val, hi, hi_val);
|
fi.interval = eval_interval::proper(lo, lo_val, hi, hi_val);
|
||||||
if (b2 != e2)
|
|
||||||
fi.side_cond.push_back(s.eq(b2, e2));
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -74,11 +74,13 @@ namespace polysat {
|
||||||
fi_record& fi);
|
fi_record& fi);
|
||||||
|
|
||||||
bool match_non_zero(signed_constraint const& c,
|
bool match_non_zero(signed_constraint const& c,
|
||||||
rational const & a1, pdd const& b1, pdd const& e1,
|
rational const& a1, pdd const& b1, pdd const& e1,
|
||||||
|
pdd const& q,
|
||||||
fi_record& fi);
|
fi_record& fi);
|
||||||
|
|
||||||
bool match_non_max(signed_constraint const& c,
|
bool match_non_max(signed_constraint const& c,
|
||||||
rational const & a2, pdd const& b2, pdd const& e2,
|
pdd const& p,
|
||||||
|
rational const& a2, pdd const& b2, pdd const& e2,
|
||||||
fi_record& fi);
|
fi_record& fi);
|
||||||
|
|
||||||
bool get_interval_ule(signed_constraint const& c, pvar v, fi_record& fi);
|
bool get_interval_ule(signed_constraint const& c, pvar v, fi_record& fi);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue