mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 20:18:18 +00:00
Code Activity

bug fixes with tableau

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2024-10-13 20:44:15 -07:00 committed by Lev Nachmanson
parent 62ea6fbe98
commit 66f88206f5
1 changed files with 68 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
src/math/lp/dioph_eq.cpp
View file

@ -6,6 +6,7 @@
#include <queue> #include <queue>
namespace lp { namespace lp {
int glb = 0;
// This class represents a term with an added constant number c, in form sum {x_i*a_i} + c. // This class represents a term with an added constant number c, in form sum {x_i*a_i} + c.
class dioph_eq::imp { class dioph_eq::imp {
class term_o:public lar_term { class term_o:public lar_term {
@ -64,6 +65,13 @@ namespace lp {
} }
return out; return out;
} }
std::ostream& print_F(std::ostream & out) {
out << "F:\n";
for (unsigned i : m_f) {
print_eprime_entry(i, out);
}
return out;
}
std::ostream& print_lar_term_L(const lar_term & t, std::ostream & out) const { std::ostream& print_lar_term_L(const lar_term & t, std::ostream & out) const {
return print_linear_combination_customized(t.coeffs_as_vector(), return print_linear_combination_customized(t.coeffs_as_vector(),
@ -76,8 +84,17 @@ namespace lp {
return out; return out;
} }
bool first = true; bool first = true;
for (const auto p : term) { // Copy term to a vector and sort by p.j()
mpq val = p.coeff(); std::vector<std::pair<mpq, unsigned>> sorted_term;
sorted_term.reserve(term.size());
for (const auto& p : term) {
sorted_term.emplace_back(p.coeff(), p.j());
}
std::sort(sorted_term.begin(), sorted_term.end(),
[](const auto& a, const auto& b) { return a.second < b.second; });
// Print the sorted term
for (auto& [val, j] : sorted_term) {
if (first) { if (first) {
first = false; first = false;
} }
@ -93,20 +110,25 @@ namespace lp {
else if (val != numeric_traits<mpq>::one()) else if (val != numeric_traits<mpq>::one())
out << T_to_string(val); out << T_to_string(val);
out << "x"; out << "x";
if (is_fresh_var(p.j())) out << "~"; if (is_fresh_var(j)) out << "~";
out << p.j(); out << j;
} }
// Handle the constant term separately
if (!term.c().is_zero()) { if (!term.c().is_zero()) {
if (!first) {
if (term.c().is_pos()) if (term.c().is_pos())
out << " + " << term.c(); out << " + ";
else else
out << " - " << -term.c(); out << " - ";
}
out << abs(term.c());
} }
return out; return out;
} }
/* /*
An annotated state is a triple ⟨E′, λ, σ⟩, where E′ is a set of pairs ⟨e, ℓ⟩ in which An annotated state is a triple ⟨E′, λ, σ⟩, where E′ is a set of pairs ⟨e, ℓ⟩ in which
e is an equation and ℓ is a linear combination of variables from L e is an equation and ℓ is a linear combination of variables from L
@ -166,7 +188,7 @@ namespace lp {
for (const auto & p: row) { for (const auto & p: row) {
if (lia.is_fixed(p.var())) { if (lia.is_fixed(p.var())) {
c += p.coeff()*lia.lower_bound(p.var()).x; c += p.coeff()*lia.lower_bound(p.var()).x;
e.m_l = lra.mk_join(lra.get_bound_constraint_witnesses_for_column(p.var()), e.m_l); e.m_l = lra.mk_join(e.m_l, lra.get_bound_constraint_witnesses_for_column(p.var()));
} }
else { else {
m_e_matrix.add_new_element(row_index, p.var(), lcm * p.coeff()); m_e_matrix.add_new_element(row_index, p.var(), lcm * p.coeff());
@ -211,6 +233,7 @@ namespace lp {
} }
fill_eprime_entry(row, i); fill_eprime_entry(row, i);
TRACE("dioph_eq", print_eprime_entry(static_cast<unsigned>(i), tout);); TRACE("dioph_eq", print_eprime_entry(static_cast<unsigned>(i), tout););
// print_eprime_entry(static_cast<unsigned>(i), std::cout);
} }
} }
@ -297,14 +320,12 @@ namespace lp {
!has_fresh_var(ep.m_row_index)) !has_fresh_var(ep.m_row_index))
prepare_lia_branch_report(ep, g, c_g); prepare_lia_branch_report(ep, g, c_g);
return false; return false;
} }
// returns true if no conflict is found and false otherwise // returns true if no conflict is found and false otherwise
bool normalize_by_gcd() { bool normalize_by_gcd() {
for (unsigned l: m_f) { for (unsigned l: m_f) {
if (!normalize_e_by_gcd(l)) { if (!normalize_e_by_gcd(l)) {
std::cout << "dioconflict\n";
m_conflict_index = l; m_conflict_index = l;
return false; return false;
} }
@ -531,6 +552,8 @@ namespace lp {
} }
public: public:
lia_move check() { lia_move check() {
if (++glb > 10) exit(0);
std::cout << "check\n";
init(); init();
while(m_f.size()) { while(m_f.size()) {
if (!normalize_by_gcd()) { if (!normalize_by_gcd()) {
@ -586,38 +609,27 @@ public:
// } // }
// } // }
std::tuple<mpq, unsigned, int> find_minimal_abs_coeff(unsigned row_index) const { std::tuple<mpq, unsigned, int> find_minimal_abs_coeff(unsigned row_index) const {
bool first = true, first_fresh = true; bool first = true;
mpq ahk, ahk_fresh; mpq ahk;
unsigned k, k_fresh; unsigned k;
int k_sign, k_sign_fresh; int k_sign;
mpq t; mpq t;
for (const auto& p : m_e_matrix.m_rows[row_index]) { for (const auto& p : m_e_matrix.m_rows[row_index]) {
t = abs(p.coeff()); t = abs(p.coeff());
if (first_fresh || t < ahk_fresh) { if (first || t < ahk || (t == ahk && p.var() < k)) { // tre last condition is for debug
ahk_fresh = t;
k_sign_fresh = p.coeff().is_pos() ? 1 : -1;
k_fresh = p.var();
first_fresh = false;
} else if (first || t < ahk) {
ahk = t; ahk = t;
k_sign = p.coeff().is_pos() ? 1 : -1; k_sign = p.coeff().is_pos() ? 1 : -1;
k = p.var(); k = p.var();
first = false; first = false;
if (ahk.is_one()) // if (ahk.is_one()) // uncomment later
break; // break;
}
}
} std::cout << "find_minimal_abs_coeff:" << " ahk:" << ahk <<", k:" << k << ", k_sign:" << k_sign << std::endl;
}
if (first_fresh) // did not find any fresh variables
return std::make_tuple(ahk, k, k_sign); return std::make_tuple(ahk, k, k_sign);
if (first) // only fresh vars
return std::make_tuple(ahk_fresh, k_fresh, k_sign_fresh);
SASSERT(!first && !first_fresh);
if (ahk <= ahk_fresh) {
return std::make_tuple(ahk, k, k_sign);
}
return std::make_tuple(ahk_fresh, k_fresh, k_sign_fresh);
} }
term_o get_term_to_subst(const term_o& eh, unsigned k, int k_sign) { term_o get_term_to_subst(const term_o& eh, unsigned k, int k_sign) {
@ -666,9 +678,9 @@ public:
} }
SASSERT(c.var() != piv_row_index); SASSERT(c.var() != piv_row_index);
mpq coeff = m_e_matrix.get_val(c); mpq coeff = m_e_matrix.get_val(c);
TRACE("dioph_eq", tout << "c_row:" << c.var(); print_e_row(c.var(), tout) << std::endl;); TRACE("dioph_eq", tout << "m_e:" << c.var(); print_e_row(c.var(), tout) << std::endl;);
m_e_matrix.pivot_row_to_row_given_cell_with_sign(piv_row_index, c, j, j_sign);
m_eprime[c.var()].m_c -= j_sign * coeff*m_eprime[piv_row_index].m_c; m_eprime[c.var()].m_c -= j_sign * coeff*m_eprime[piv_row_index].m_c;
m_e_matrix.pivot_row_to_row_given_cell_with_sign(piv_row_index, c, j, -j_sign);
m_eprime[c.var()].m_l = lra.mk_join(m_eprime[c.var()].m_l, m_eprime[piv_row_index].m_l); m_eprime[c.var()].m_l = lra.mk_join(m_eprime[c.var()].m_l, m_eprime[piv_row_index].m_l);
TRACE("dioph_eq", tout << "after pivoting c_row:"; print_eprime_entry(c.var(), tout);); TRACE("dioph_eq", tout << "after pivoting c_row:"; print_eprime_entry(c.var(), tout););
cell_to_process--; cell_to_process--;
@ -689,6 +701,7 @@ public:
} }
// k is the variable to substitute // k is the variable to substitute
void fresh_var_step(unsigned e_index, unsigned k, const mpq& ahk) { void fresh_var_step(unsigned e_index, unsigned k, const mpq& ahk) {
std::cout << "fresh_var_step:" << "e_index:" << e_index << " k:" << k << std::endl;
move_row_to_work_vector(e_index); move_row_to_work_vector(e_index);
// step 7 from the paper // step 7 from the paper
// xt is the fresh variable // xt is the fresh variable
@ -696,7 +709,6 @@ public:
unsigned fresh_row = m_e_matrix.row_count(); unsigned fresh_row = m_e_matrix.row_count();
m_e_matrix.add_row(); // for the fresh variable definition m_e_matrix.add_row(); // for the fresh variable definition
m_e_matrix.add_column(); // the fresh variable itself m_e_matrix.add_column(); // the fresh variable itself
m_eprime.push_back({fresh_row, nullptr, mpq(0), entry_status::S});
// Add a new row for the fresh variable definition // Add a new row for the fresh variable definition
/* Let eh = sum(ai*xi) + c. For each i != k, let ai = qi*ahk + ri, and let c = c_q * ahk + c_r. /* Let eh = sum(ai*xi) + c. For each i != k, let ai = qi*ahk + ri, and let c = c_q * ahk + c_r.
eh = ahk*(x_k + sum{qi*xi|i != k} + c_q) + sum {ri*xi|i!= k} + c_r. eh = ahk*(x_k + sum{qi*xi|i != k} + c_q) + sum {ri*xi|i!= k} + c_r.
@ -707,7 +719,8 @@ public:
mpq q, r; mpq q, r;
q = machine_div_rem(e.m_c, ahk, r); q = machine_div_rem(e.m_c, ahk, r);
e.m_c = r; e.m_c = r;
m_eprime.back().m_c = q; m_eprime.push_back({fresh_row, nullptr, q, entry_status::S});
unsigned h = e.m_row_index; unsigned h = e.m_row_index;
m_e_matrix.add_new_element(h, xt, ahk); m_e_matrix.add_new_element(h, xt, ahk);
m_e_matrix.add_new_element(fresh_row, xt, -mpq(1)); m_e_matrix.add_new_element(fresh_row, xt, -mpq(1));
@ -724,10 +737,13 @@ public:
} }
// add entry to S // add entry to S
m_eprime.push_back({fresh_row, nullptr, mpq(0), entry_status::S}); unsigned last_in_s = m_eprime.size() - 1;
this->m_s.push_back(fresh_row); m_s.push_back(last_in_s);
m_k2s[k] = last_in_s;
TRACE("dioph_eq", tout << "changed entry:"; print_eprime_entry(e_index, tout)<< std::endl; TRACE("dioph_eq", tout << "changed entry:"; print_eprime_entry(e_index, tout)<< std::endl;
tout << "added to S:\n"; print_eprime_entry(m_eprime.size()-1, tout);); tout << "added to S:\n"; print_eprime_entry(last_in_s, tout););
std::cout << "changed entry:"; print_eprime_entry(e_index, std::cout)<< std::endl;
std::cout << "added to S:\n"; print_eprime_entry(last_in_s, std::cout);
eliminate_var_in_f(m_eprime.back(), k, 1); eliminate_var_in_f(m_eprime.back(), k, 1);
} }
@ -738,11 +754,11 @@ public:
std::ostream& print_eprime_entry(const eprime_entry& e, std::ostream& out, bool print_dep = true) { std::ostream& print_eprime_entry(const eprime_entry& e, std::ostream& out, bool print_dep = true) {
out << "{\n"; out << "{\n";
print_term_o(get_term_from_e_matrix(e.m_row_index), out << "\trow:") << "\n"; print_term_o(get_term_from_e_matrix(e.m_row_index), out << "\tm_e:") << ",\n";
out << "\tstatus:" << (int)e.m_entry_status; //out << "\tstatus:" << (int)e.m_entry_status;
if (print_dep) if (print_dep)
this->print_dep(out<< "\n\tdep:", e.m_l); this->print_dep(out<< "\tm_l:", e.m_l) << "\n";
out << "\n}"; out << "}\n";
return out; return out;
} }
@ -764,14 +780,19 @@ public:
auto eh_it = pick_eh(); auto eh_it = pick_eh();
auto& eprime_entry = m_eprime[*eh_it]; auto& eprime_entry = m_eprime[*eh_it];
TRACE("dioph_eq", print_eprime_entry(*eh_it, tout);); TRACE("dioph_eq", print_eprime_entry(*eh_it, tout););
std::cout << "rewrite_eqs\n"; print_eprime_entry(*eh_it, std::cout);
auto [ahk, k, k_sign] = find_minimal_abs_coeff(eprime_entry.m_row_index); auto [ahk, k, k_sign] = find_minimal_abs_coeff(eprime_entry.m_row_index);
TRACE("dioph_eq", tout << "ahk:" << ahk << ", k:" << k << ", k_sign:" << k_sign << std::endl;); TRACE("dioph_eq", tout << "ahk:" << ahk << ", k:" << k << ", k_sign:" << k_sign << std::endl;);
if (ahk.is_one()) { if (ahk.is_one()) {
TRACE("dioph_eq", tout << "push to S:\n"; print_eprime_entry(*eh_it, tout);); TRACE("dioph_eq", tout << "push to S:\n"; print_eprime_entry(*eh_it, tout););
move_entry_from_f_to_s(k, eh_it); move_entry_from_f_to_s(k, eh_it);
eliminate_var_in_f(eprime_entry, k , k_sign); eliminate_var_in_f(eprime_entry, k , k_sign);
print_F(std::cout);
print_S(std::cout);
} else { } else {
fresh_var_step(*eh_it, k, ahk); fresh_var_step(*eh_it, k, ahk*mpq(k_sign));
print_F(std::cout);
print_S(std::cout);
} }
} }
public: public: