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

dio passes regression\smt2 tests with limited functionality

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2024-08-27 08:44:46 -10:00 committed by Lev Nachmanson
parent 245d448c66
commit 78a58b06aa
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,9 +26,7 @@ namespace lp {
term_o():m_c(0) {} term_o():m_c(0) {}
void substitute(const term_o& t, unsigned term_column) { void substitute(const term_o& t, unsigned term_column) {
SASSERT(!t.contains(term_column)); SASSERT(!t.contains(term_column));
auto it = this->m_coeffs.find_core(term_column); mpq a = get_coeff(term_column); // need to copy it becase the pointer value can be changed during the next loop
if (it == nullptr) return;
const mpq& a = it->get_data().m_value;
for (auto p : t) { for (auto p : t) {
this->add_monomial(a * p.coeff(), p.j()); this->add_monomial(a * p.coeff(), p.j());
} }
@ -73,7 +71,7 @@ namespace lp {
} }
std::ostream& print_term_o(term_o const& term, std::ostream& out) const { std::ostream& print_term_o(term_o const& term, std::ostream& out) const {
if (term.size() == 0) { if (term.size() == 0 && term.c().is_zero()) {
out << "0"; out << "0";
out << ", j():"<< term.j(); out << ", j():"<< term.j();
return out; return out;
@ -149,7 +147,7 @@ namespace lp {
term_o t; term_o t;
for (const auto & p: row) for (const auto & p: row)
if (lia.is_fixed(p.var())) if (lia.is_fixed(p.var()))
t.c() += lia.lower_bound(p.var()).x; t.c() += p.coeff()*lia.lower_bound(p.var()).x;
else else
t.add_monomial(lcm * p.coeff(), p.var()); t.add_monomial(lcm * p.coeff(), p.var());
t.c() *= lcm; t.c() *= lcm;
@ -171,9 +169,16 @@ namespace lp {
}; };
for (unsigned i = 0; i < n_of_rows; i++) { for (unsigned i = 0; i < n_of_rows; i++) {
auto & row = lra.get_row(i); auto & row = lra.get_row(i);
TRACE("dioph_eq", tout << "row "<< i <<":"; lia.display_row_info(tout, i) << "\n";);
unsigned basic_var = lra.r_basis()[i];
if (!lia.column_is_int(basic_var)) continue;
if (!all_vars_are_int(row)) continue; if (!all_vars_are_int(row)) continue;
term_o t = row_to_term(row); term_o t = row_to_term(row);
TRACE("dioph_eq", tout << "row = "; lra.print_row(row, tout) << std::endl;); TRACE("dioph_eq", tout << "row = "; lra.print_row(row, tout) << std::endl;);
if (t.size() == 0) {
SASSERT(t.c().is_zero());
continue;
}
eprime_pair pair = {t, lar_term(i)}; eprime_pair pair = {t, lar_term(i)};
m_f.push_back(m_f.size()); m_f.push_back(m_f.size());
m_eprime.push_back(pair); m_eprime.push_back(pair);
@ -182,21 +187,28 @@ namespace lp {
} }
// returns true if no conflict is found and false otherwise mpq gcd_of_coeffs(const term_o& t) {
bool normalize_e_by_gcd(eprime_pair& ep) {
mpq g(0); mpq g(0);
TRACE("dioph_eq", print_term_o(ep.m_e, tout << "m_e:") << std::endl; for (auto & p : t) {
print_lar_term_L(ep.m_l, tout << "m_l:") << std::endl;
);
for (auto & p : ep.m_e) {
if (g.is_zero()) { if (g.is_zero()) {
g = abs(p.coeff()); g = abs(p.coeff());
} else { } else {
g = gcd(g, p.coeff()); g = gcd(g, p.coeff());
} }
} }
return g;
}
// returns true if no conflict is found and false otherwise
bool normalize_e_by_gcd(eprime_pair& ep) {
TRACE("dioph_eq", print_term_o(ep.m_e, tout << "m_e:") << std::endl;
print_lar_term_L(ep.m_l, tout << "m_l:") << std::endl;
);
mpq g = gcd_of_coeffs(ep.m_e);
if (g.is_zero()) { if (g.is_zero()) {
UNREACHABLE(); if (ep.m_e.c().is_zero())
return true;
return false;
} }
if (g.is_one()) if (g.is_one())
return true; return true;
@ -243,10 +255,6 @@ namespace lp {
} }
lia_move check() { lia_move check() {
// if (lp::lp_settings::ddd == 5) {
// enable_trace("dioph_eq");
// enable_trace("dioph_eq_fresh");
// }
init(); init();
while(m_f.size()) { while(m_f.size()) {
if (!normalize_by_gcd()) if (!normalize_by_gcd())

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

@ -172,6 +172,7 @@ namespace lp {
de.explain(*this->m_ex); de.explain(*this->m_ex);
return lia_move::conflict; return lia_move::conflict;
} else if (r == lia_move::sat) { } else if (r == lia_move::sat) {
return lia_move::undef;
NOT_IMPLEMENTED_YET(); NOT_IMPLEMENTED_YET();
} }
@ -228,8 +229,8 @@ namespace lp {
return lia_move::undef; return lia_move::undef;
++m_number_of_calls; ++m_number_of_calls;
// if (r == lia_move::undef) r = patch_basic_columns(); if (r == lia_move::undef) r = patch_basic_columns();
// if (r == lia_move::undef && should_find_cube()) r = int_cube(lia)(); if (r == lia_move::undef && should_find_cube()) r = int_cube(lia)();
if (r == lia_move::undef && (true||should_solve_dioph_eq())) r = solve_dioph_eq(); if (r == lia_move::undef && (true||should_solve_dioph_eq())) r = solve_dioph_eq();
if (r == lia_move::undef) lra.move_non_basic_columns_to_bounds(); if (r == lia_move::undef) lra.move_non_basic_columns_to_bounds();
if (r == lia_move::undef && should_hnf_cut()) r = hnf_cut(); if (r == lia_move::undef && should_hnf_cut()) r = hnf_cut();