mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 17:44:08 +00:00
Code Activity

optimise rewrite_eqs to avoid fresh variables

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2025-01-29 15:37:00 -08:00 committed by Lev Nachmanson
parent ed3df333b3
commit 058b9e4a6d
1 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -923,6 +923,7 @@ namespace lp {
const auto & row = m_e_matrix.m_rows[ei]; const auto & row = m_e_matrix.m_rows[ei];
for (const auto& p : row) { for (const auto& p : row) {
if (m_k2s.has_key(p.var())) { if (m_k2s.has_key(p.var())) {
/*
std::cout << "entry:" << ei << " belongs to f but depends on column " << p.var() << std::endl; std::cout << "entry:" << ei << " belongs to f but depends on column " << p.var() << std::endl;
std::cout << "m_var_register.local_to_external(p.var()):" << m_var_register.local_to_external(p.var()) << std::endl; std::cout << "m_var_register.local_to_external(p.var()):" << m_var_register.local_to_external(p.var()) << std::endl;
print_entry(ei, std::cout); print_entry(ei, std::cout);
@ -933,7 +934,8 @@ namespace lp {
std::cout << std::endl; std::cout << std::endl;
std::cout << "column " << p.var() << " is subst by entry:"; std::cout << "column " << p.var() << " is subst by entry:";
print_entry(m_k2s[p.var()],std::cout) << std::endl; print_entry(m_k2s[p.var()],std::cout) << std::endl;
*/
return false; return false;
} }
} }
@ -2190,6 +2192,9 @@ namespace lp {
// returns true if an equlity was rewritten and false otherwise // returns true if an equlity was rewritten and false otherwise
bool rewrite_eqs() { bool rewrite_eqs() {
unsigned h = -1; unsigned h = -1;
unsigned n = 0; // number of choices for a fresh variable
mpq the_smallest_ahk;
unsigned kh, kh_sign;
for (unsigned ei=0; ei < m_e_matrix.row_count(); ei++) { for (unsigned ei=0; ei < m_e_matrix.row_count(); ei++) {
if (belongs_to_s(ei)) continue; if (belongs_to_s(ei)) continue;
if (m_e_matrix.m_rows[ei].size() == 0) { if (m_e_matrix.m_rows[ei].size() == 0) {
@ -2200,23 +2205,31 @@ namespace lp {
return false; return false;
} }
} }
h = ei; auto [ahk, k, k_sign] = find_minimal_abs_coeff(ei);
break; if (ahk.is_one()) {
} TRACE("dioph_eq", tout << "push to S:\n"; print_entry(ei, tout););
if (h == UINT_MAX) move_entry_from_f_to_s(k, ei);
return false; eliminate_var_in_f(ei, k, k_sign);
auto [ahk, k, k_sign] = find_minimal_abs_coeff(h); return true;
TRACE("dioph_eq", tout << "eh:"; print_entry(h, tout); }
tout << "ahk:" << ahk << ", k:" << k << ", k_sign:" << k_sign
<< std::endl;);
if (ahk.is_one()) { if (n == 0 || the_smallest_ahk > ahk) {
TRACE("dioph_eq", tout << "push to S:\n"; print_entry(h, tout);); n = 1;
move_entry_from_f_to_s(k, h); the_smallest_ahk = ahk;
eliminate_var_in_f(h, k, k_sign); h = ei;
} else { kh = k;
fresh_var_step(h, k, ahk * mpq(k_sign)); kh_sign = k_sign;
continue;
}
if (the_smallest_ahk == ahk && lra.settings().random_next() % (++n) == 0) {
h = ei;
kh = k;
kh_sign = k_sign;
}
} }
if (h == UINT_MAX) return false;
SASSERT(!the_smallest_ahk.is_one());
fresh_var_step(h, kh, the_smallest_ahk * mpq(kh_sign));
return true; return true;
} }