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

refine trail iterations with lar.m_terms

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2025-01-05 16:22:55 -10:00 committed by Lev Nachmanson
parent 9a9ccf19c5
commit 5158797233
2 changed files with 38 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,6 +43,10 @@
the i-th entry. the i-th entry.
*/ */
namespace lp { namespace lp {
template <typename T, typename K> bool contains(const T& t, K j) {
return t.find(j) != t.end();
}
class dioph_eq::imp { class dioph_eq::imp {
// This class represents a term with an added constant number c, in form sum // This class represents a term with an added constant number c, in form sum
// {x_i*a_i} + c. // {x_i*a_i} + c.
@ -280,20 +284,32 @@ namespace lp {
struct undo_add_term : public trail { struct undo_add_term : public trail {
imp& m_s; imp& m_s;
lar_term m_t; const lar_term* m_t;
undo_add_term(imp& s, const lar_term &t): m_s(s), m_t(t) { undo_add_term(imp& s, const lar_term *t): m_s(s), m_t(t) {
TRACE("dioph_eq", m_s.print_lar_term_L(*t, tout); tout << "t->j()=" << t->j() << std::endl;);
} }
void undo () { void undo () {
TRACE("dioph_eq", m_s.lra.print_term(m_t, tout);); TRACE("dioph_eq", m_s.lra.print_term(*m_t, tout); tout << ", m_t->j() =" << m_t->j() << std::endl;);
for (const auto & p: m_t) { if (!contains(m_s.m_active_terms, m_t)) {
for (int i = m_s.m_added_terms.size() - 1; i >= 0; --i) {
if (m_s.m_added_terms[i] == m_t) // the address is the same
if (i != m_s.m_added_terms.size() -1) m_s.m_added_terms[i] = m_s.m_added_terms.back();
m_s.m_added_terms.pop_back();
break;
}
return;
}
NOT_IMPLEMENTED_YET();
for (const auto & p: m_t->ext_coeffs()) {
auto it = m_s.m_columns_to_terms.find(p.var()); auto it = m_s.m_columns_to_terms.find(p.var());
it->second.erase(m_t.j()); SASSERT(it != m_s.m_columns_to_terms.end());
it->second.erase(m_t->j());
if (it->second.size() == 0) { if (it->second.size() == 0) {
m_s.m_columns_to_terms.erase(it); m_s.m_columns_to_terms.erase(it);
} }
} }
} }
}; };
@ -319,23 +335,26 @@ namespace lp {
m_changed_columns.insert(j); m_changed_columns.insert(j);
} }
std_vector<const lar_term*> m_added_terms; std_vector<const lar_term*> m_added_terms;
std::unordered_set<const lar_term*> m_active_terms;
std_vector<variable_branch_stats> m_branch_stats; std_vector<variable_branch_stats> m_branch_stats;
std_vector<branch> m_branch_stack; std_vector<branch> m_branch_stack;
std_vector<constraint_index> m_explanation_of_branches; std_vector<constraint_index> m_explanation_of_branches;
void add_term_delegate(const lar_term* t) { void add_term_delegate(const lar_term* t) {
unsigned j = t->j(); unsigned j = t->j();
TRACE("dioph_eq", tout << "term column t->j():" << j << std::endl; lra.print_term(*t, tout) << std::endl; ); TRACE("dioph_eq", tout << "term column t->j():" << j << std::endl; lra.print_term(*t, tout) << std::endl; );
if (!lra.column_is_int(j) || !lra.column_has_term(j)) { if (!lra.column_is_int(j)) {
TRACE("dioph_eq", tout << "ignored" << std::endl;); TRACE("dioph_eq", tout << "ignored a non-integral column" << std::endl;);
return; return;
} }
CTRACE("dioph_eq", !lra.column_has_term(j), tout << "added term that is not associated with a column yet" << std::endl;);
if (!all_vars_are_int(*t)) { if (!all_vars_are_int(*t)) {
TRACE("dioph_eq", tout << "not all vars are integrall\n";); TRACE("dioph_eq", tout << "not all vars are integrall\n";);
return; return;
} }
m_added_terms.push_back(t); m_added_terms.push_back(t);
auto undo = undo_add_term(*this, *t); auto undo = undo_add_term(*this, t);
lra.trail().push(undo); lra.trail().push(undo);
} }
@ -371,7 +390,7 @@ namespace lp {
} }
void register_columns_to_term(const lar_term& t) { void register_columns_to_term(const lar_term& t) {
TRACE("dioph_eq", tout << "register term:"; lra.print_term(t, tout);); TRACE("dioph_eq", tout << "register term:"; lra.print_term(t, tout); tout << ", t.j()=" << t.j() << std::endl;);
for (const auto &p: t.ext_coeffs()) { for (const auto &p: t.ext_coeffs()) {
auto it = m_columns_to_terms.find(p.var()); auto it = m_columns_to_terms.find(p.var());
if (it != m_columns_to_terms.end()) { if (it != m_columns_to_terms.end()) {
@ -380,8 +399,7 @@ namespace lp {
else { else {
std::unordered_set<unsigned> s; std::unordered_set<unsigned> s;
s.insert(t.j()); s.insert(t.j());
m_columns_to_terms[p.var()] = s; m_columns_to_terms[p.var()] = s;
TRACE("dioph_eq", tout << "insert " << p.var(););
} }
} }
} }
@ -450,9 +468,6 @@ namespace lp {
SASSERT(entry_invariant(ei)); SASSERT(entry_invariant(ei));
} }
template <typename T> bool contains(const T& t, unsigned j) {
return t.find(j) != t.end();
}
void process_changed_columns() { void process_changed_columns() {
for (unsigned j : m_changed_columns) { for (unsigned j : m_changed_columns) {
@ -482,11 +497,6 @@ namespace lp {
} }
} }
for (const lar_term* t : m_added_terms) {
register_columns_to_term(*t);
}
SASSERT(is_in_sync());
TRACE("dioph_eq", tout << "entries_to_recalculate:"; for (unsigned j : entries_to_recalculate) {tout << " " << j;}); TRACE("dioph_eq", tout << "entries_to_recalculate:"; for (unsigned j : entries_to_recalculate) {tout << " " << j;});
for (unsigned j = 0; j < m_fresh_definitions.size(); j++) { for (unsigned j = 0; j < m_fresh_definitions.size(); j++) {
const fresh_definition& fd = m_fresh_definitions[j]; const fresh_definition& fd = m_fresh_definitions[j];
@ -558,8 +568,13 @@ namespace lp {
m_lra_level = 0; m_lra_level = 0;
process_changed_columns(); process_changed_columns();
for (const lar_term* t: m_added_terms) { for (const lar_term* t: m_added_terms) {
m_active_terms.insert(t);
fill_entry(*t); fill_entry(*t);
register_columns_to_term(*t);
} }
SASSERT(is_in_sync());
m_added_terms.clear(); m_added_terms.clear();
SASSERT(entries_are_ok()); SASSERT(entries_are_ok());
} }
@ -1298,6 +1313,7 @@ namespace lp {
for (unsigned k = 0; k < lra.terms().size(); k ++ ) { for (unsigned k = 0; k < lra.terms().size(); k ++ ) {
const lar_term* t = lra.terms()[k]; const lar_term* t = lra.terms()[k];
if (!all_vars_are_int(*t)) continue; if (!all_vars_are_int(*t)) continue;
SASSERT(t->j() != UINT_MAX);
for (const auto& p: (*t).ext_coeffs()) { for (const auto& p: (*t).ext_coeffs()) {
unsigned j = p.var(); unsigned j = p.var();
auto it = c2t.find(j); auto it = c2t.find(j);

1
src/math/lp/lar_term.h
View file

@ -104,6 +104,7 @@ public:
for (auto const& p : a) { for (auto const& p : a) {
add_monomial(p.coeff(), p.var()); add_monomial(p.coeff(), p.var());
} }
m_j = a.j();
} }
lar_term(const vector<std::pair<mpq, unsigned>>& coeffs) { lar_term(const vector<std::pair<mpq, unsigned>>& coeffs) {