mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 03:45:51 +00:00
Code Activity

use a simpler encoding for term indices

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2020-03-14 19:55:14 -07:00
parent 1c0e583abc
commit 8af245a410
10 changed files with 117 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -89,7 +89,6 @@ private:
int_solver * m_int_solver;
bool m_need_register_terms;
public:
const var_index m_terms_start_index;
var_register m_var_register;
var_register m_term_register;
stacked_vector<ul_pair> m_columns_to_ul_pairs;
@ -109,7 +108,6 @@ public:
m_normalized_terms_to_columns;
// end of fields
unsigned terms_start_index() const { return m_terms_start_index; }
const vector<lar_term*> & terms() const { return m_terms; }
lar_term const& term(unsigned i) const { return *m_terms[i]; }
constraint_set const& constraints() const { return m_constraints; }
@ -144,7 +142,6 @@ public:
return m_mpq_lar_core_solver.m_r_x[j].x;
}
bool is_term(var_index j) const;
bool column_is_fixed(unsigned j) const;
bool column_is_free(unsigned j) const;
public:
@ -246,9 +243,6 @@ public:
virtual ~lar_solver();
unsigned adjust_term_index(unsigned j) const;
bool use_lu() const;
bool sizes_are_correct() const;
@ -591,15 +585,15 @@ public:
t.subst_index(p.first, p.second);
}
}
std::ostream& print_column_info(unsigned j, std::ostream& out) const {
m_mpq_lar_core_solver.m_r_solver.print_column_info(j, out);
if (is_term(j)) {
const lar_term& t = * m_terms[j - m_terms_start_index];
const lar_term& t = * m_terms[unmask_term(j)];
print_term_as_indices(t, out) << "\n";
} else if(column_corresponds_to_term(j)) {
const lar_term& t = * m_terms[m_var_register.local_to_external(j) - m_terms_start_index];
const lar_term& t = * m_terms[unmask_term(m_var_register.local_to_external(j))];
print_term_as_indices(t, out) << "\n";
}
return out;