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

use the trail to undo add_term

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2025-01-29 16:56:41 -10:00 committed by Lev Nachmanson
parent 9c510018b3
commit 3e7e903d19
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -387,7 +387,7 @@ namespace lp {
} }
}; };
void remove_term_callback(const lar_term *t) { void undo_add_term_method(const lar_term *t) {
TRACE("d_undo", tout << "t:"<< t<<", t->j():"<< t->j() << std::endl;); TRACE("d_undo", tout << "t:"<< t<<", t->j():"<< t->j() << std::endl;);
TRACE("dioph_eq", lra.print_term(*t, tout); tout << ", t->j() =" << t->j() << std::endl;); TRACE("dioph_eq", lra.print_term(*t, tout); tout << ", t->j() =" << t->j() << std::endl;);
if (!contains(m_active_terms, t)) { if (!contains(m_active_terms, t)) {
@ -422,8 +422,18 @@ namespace lp {
tout << "and " << m_l_matrix.row_count() << " rows" << std::endl; tout << "and " << m_l_matrix.row_count() << " rows" << std::endl;
print_lar_term_L(*t, tout); tout << "; t->j()=" << t->j() << std::endl; print_lar_term_L(*t, tout); tout << "; t->j()=" << t->j() << std::endl;
); );
shrink_L_to_sizes(); shrink_matrices();
} }
struct undo_add_term : public trail {
imp& m_s;
const lar_term* m_t;
undo_add_term(imp& s, const lar_term *t): m_s(s), m_t(t) {}
void undo() {
m_s.undo_add_term_method(m_t);
}
};
struct undo_fixed_column : public trail { struct undo_fixed_column : public trail {
imp& m_imp; imp& m_imp;
@ -504,7 +514,7 @@ namespace lp {
m_l_matrix.add_rows(mpq(1), i, m_l_matrix.row_count() - 1); m_l_matrix.add_rows(mpq(1), i, m_l_matrix.row_count() - 1);
} }
void shrink_L_to_sizes() { void shrink_matrices() {
unsigned i = m_l_matrix.row_count() - 1; unsigned i = m_l_matrix.row_count() - 1;
eliminate_last_term_column(); eliminate_last_term_column();
remove_last_row_in_matrix(m_l_matrix); remove_last_row_in_matrix(m_l_matrix);
@ -564,7 +574,9 @@ namespace lp {
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);
lra.trail().push(undo);
} }
void update_column_bound_callback(unsigned j) { void update_column_bound_callback(unsigned j) {
@ -578,7 +590,6 @@ namespace lp {
public: public:
imp(int_solver& lia, lar_solver& lra) : lia(lia), lra(lra) { imp(int_solver& lia, lar_solver& lra) : lia(lia), lra(lra) {
lra.m_add_term_callback=[this](const lar_term*t){add_term_callback(t);}; lra.m_add_term_callback=[this](const lar_term*t){add_term_callback(t);};
lra.m_remove_term_callback = [this](const lar_term*t){remove_term_callback(t);};
lra.m_update_column_bound_callback = [this](unsigned j){update_column_bound_callback(j);}; lra.m_update_column_bound_callback = [this](unsigned j){update_column_bound_callback(j);};
} }
term_o get_term_from_entry(unsigned i) const { term_o get_term_from_entry(unsigned i) const {

3
src/math/lp/lar_solver.cpp
View file

@ -1558,11 +1558,8 @@ namespace lp {
if (col.term() != nullptr) { if (col.term() != nullptr) {
if (s.m_need_register_terms) if (s.m_need_register_terms)
s.deregister_normalized_term(*col.term()); s.deregister_normalized_term(*col.term());
if (s.m_remove_term_callback)
s.m_remove_term_callback(col.term());
delete col.term(); delete col.term();
s.m_terms.pop_back(); s.m_terms.pop_back();
} }
s.remove_last_column_from_tableau(); s.remove_last_column_from_tableau();
s.m_columns.pop_back(); s.m_columns.pop_back();

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

@ -408,7 +408,6 @@ public:
public: public:
std::function<void (const lar_term*)> m_add_term_callback; std::function<void (const lar_term*)> m_add_term_callback;
std::function<void (const lar_term*)> m_remove_term_callback;
std::function<void (unsigned)> m_update_column_bound_callback; std::function<void (unsigned)> m_update_column_bound_callback;
bool external_is_used(unsigned) const; bool external_is_used(unsigned) const;
void pop(unsigned k); void pop(unsigned k);