mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-18 18:36:41 +00:00
Code Activity

updated patch

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2023-06-15 11:32:06 -07:00
parent aafc9656e1
commit 3ef0db019a
3 changed files with 65 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

88
src/math/lp/int_solver.cpp
View file

@ -49,13 +49,16 @@ namespace lp {
lia.settings().stats().m_patches++; lia.settings().stats().m_patches++;
lp_assert(lia.is_feasible()); lp_assert(lia.is_feasible());
//unsigned non_int_before = count_non_int(); unsigned non_int_before, non_int_after;
non_int_before = count_non_int();
unsigned num = lra.A_r().column_count(); unsigned num = lra.A_r().column_count();
for (unsigned j : lra.r_basis()) for (unsigned j : lra.r_basis())
if (!lra.get_value(j).is_int()) if (!lra.get_value(j).is_int())
patch_basic_column(j); patch_basic_column(j);
//unsigned non_int_after = count_non_int(); non_int_after = count_non_int();
// verbose_stream() << non_int_before << " -> " << non_int_after << "\n"; // verbose_stream() << non_int_before << " -> " << non_int_after << "\n";
if (!lia.has_inf_int()) { if (!lia.has_inf_int()) {
lia.settings().stats().m_patches_success++; lia.settings().stats().m_patches_success++;
return lia_move::sat; return lia_move::sat;
@ -92,6 +95,8 @@ namespace lp {
* Initial experiment: use bare bones case x1/x2 = a1/a2, x1/x2 = 1 - a1/a2 * Initial experiment: use bare bones case x1/x2 = a1/a2, x1/x2 = 1 - a1/a2
*/ */
static bool s_failed_to_patch = false;
bool int_solver::patcher::patch_basic_column(unsigned v, row_cell<mpq> const& c) { bool int_solver::patcher::patch_basic_column(unsigned v, row_cell<mpq> const& c) {
if (v == c.var()) if (v == c.var())
return false; return false;
@ -101,40 +106,60 @@ namespace lp {
return false; return false;
mpq a = fractional_part(c.coeff()); mpq a = fractional_part(c.coeff());
mpq r = fractional_part(lra.get_value(v)); mpq r = fractional_part(lra.get_value(v));
SASSERT(0 < a && a < 1); VERIFY(0 < r && r < 1);
SASSERT(0 < r && r < 1); VERIFY(0 < a && a < 1);
if (!divides(denominator(r), denominator(a))) auto a1 = numerator(a), a2 = denominator(a);
auto x1 = numerator(r), x2 = denominator(r);
if (!divides(x2, a2))
return false; return false;
// stronger filter for now:
// if a = r = 1/2 then both patch directions are attempted.
if (a == r || a == 1 - r) { rational X1, Y;
if (try_patch_column(v, c.var(), mpq(1))) rational g = gcd(a1, a2, X1, Y);
VERIFY(g == 1);
VERIFY((X1 < 0 && Y >= 0) || (X1 > 0 && Y <= 0));
VERIFY(g == a1*X1 + a2*Y);
auto sign_a = a > 0 ? 1 : -1;
auto delta = sign_a * (x1 * a2 / x2) * X1;
if (try_patch_column(v, c.var(), delta))
return true; return true;
if (try_patch_column(v, c.var(), mpq(-1)))
return true; if (s_failed_to_patch) {
return false; verbose_stream() << "beta(x) " << lra.get_value(v) << "\n";
verbose_stream() << "coeff: " << c.coeff() << "\n";
verbose_stream() << "f_x " << r << "\n";
verbose_stream() << "a " << a << "\n";
verbose_stream() << g << " == " << a1 << "*" << X1 << " + " << a2 << "*" << Y << "\n";
const auto & A = lra.A_r();
unsigned row_index = lra.row_of_basic_column(v);
lia.display_row(verbose_stream(), A.m_rows[row_index]);
exit(0);
} }
rational x, y;
rational g = gcd(numerator(a), denominator(a), x, y); auto k = ceil(abs(X1)/a2);
rational scale = denominator(a)/denominator(r); auto X2 = X1 > 0 ? X1 - k*a2 : X1 + k*a2;
VERIFY(scale.is_int() && scale > 0); VERIFY(X1 < 0 || X2 <= 0);
// g = numerator(a)*x + denominator(a)*y VERIFY(X1 > 0 || X2 >= 0);
VERIFY(g == numerator(a)*x + denominator(a)*y); //verbose_stream() << "k " << k << " " << X1 << " " << X2 << "\n";
if (divides(g, numerator(r))) { auto delta2 = sign_a * (x1 * a2 / x2) * X2;
if (try_patch_column(v, c.var(), scale*x*(numerator(r)/g))) if (try_patch_column(v, c.var(), delta2))
return true; return true;
if (try_patch_column(v, c.var(), -scale*x*(numerator(r)/g)))
return true; if (s_failed_to_patch) {
return false; verbose_stream() << "beta(x) " << lra.get_value(v) << "\n";
} verbose_stream() << "coeff: " << c.coeff() << "\n";
if (divides(g, numerator(1 - r))) { verbose_stream() << "f_x " << r << "\n";
if (try_patch_column(v, c.var(), scale*x*(numerator(1 - r)/g))) verbose_stream() << "a " << a << "\n";
return true; verbose_stream() << g << " == " << a1 << "*" << X1 << " + " << a2 << "*" << Y << "\n";
if (try_patch_column(v, c.var(), -scale*x*(numerator(1 - r)/g)))
return true; const auto & A = lra.A_r();
return false; unsigned row_index = lra.row_of_basic_column(v);
lia.display_row(verbose_stream(), A.m_rows[row_index]);
exit(0);
} }
return false; return false;
} }
@ -162,6 +187,9 @@ namespace lp {
break_count++; break_count++;
else if (!old_val.is_int() && new_val.is_int()) else if (!old_val.is_int() && new_val.is_int())
make_count++; make_count++;
if (i == v && !new_val.is_int())
s_failed_to_patch = true;
} }
if (make_count > break_count) { if (make_count > break_count) {
#if 0 #if 0

2
src/smt/theory_arith_core.h
View file

@ -1537,8 +1537,6 @@ namespace smt {
break; break;
default: default:
TRACE("arith", ctx.display(tout)); TRACE("arith", ctx.display(tout));
ctx.display(verbose_stream());
exit(0);
ok = process_non_linear(); ok = process_non_linear();
TRACE("arith", tout << "non_linear(), ok: " << ok << "\n";); TRACE("arith", tout << "non_linear(), ok: " << ok << "\n";);
break; break;

5
src/smt/theory_lra.cpp
View file

@ -1319,17 +1319,20 @@ public:
} }
void internalize_eq_eh(app * atom, bool_var) { void internalize_eq_eh(app * atom, bool_var) {
if (!ctx().get_fparams().m_arith_eager_eq_axioms) if (!ctx().get_fparams().m_arith_eager_eq_axioms)
return; return;
expr* lhs = nullptr, *rhs = nullptr; expr* lhs = nullptr, *rhs = nullptr;
VERIFY(m.is_eq(atom, lhs, rhs)); VERIFY(m.is_eq(atom, lhs, rhs));
enode * n1 = get_enode(lhs); enode * n1 = get_enode(lhs);
enode * n2 = get_enode(rhs); enode * n2 = get_enode(rhs);
if (is_arith(n1) && is_arith(n2) && if (is_arith(n1) && is_arith(n2) &&
n1->get_th_var(get_id()) != null_theory_var && n1->get_th_var(get_id()) != null_theory_var &&
n2->get_th_var(get_id()) != null_theory_var && n1 != n2) { n2->get_th_var(get_id()) != null_theory_var && n1 != n2) {
// verbose_stream() << "ineq\n"; // verbose_stream() << "ineq\n";
// m_arith_eq_adapter.mk_axioms(n1, n2); m_arith_eq_adapter.mk_axioms(n1, n2);
} }
// else // else
// verbose_stream() << "skip\n"; // verbose_stream() << "skip\n";