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

work on random_updates

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2020-04-07 18:28:17 -07:00
parent ae8c6acc1a
commit 5c9fd90031
3 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1575,9 +1575,22 @@ var_index lar_solver::add_named_var(unsigned ext_j, bool is_int, const std::stri
m_var_register.set_name(j, name);
return j;
}
unsigned lar_solver::external_to_column_index(unsigned ext_j) const {
unsigned j = external_to_local(ext_j);
if (j == null_lpvar)
return j;
if (tv::is_term(j))
return map_term_index_to_column_index(j);
return j;
}
var_index lar_solver::add_var(unsigned ext_j, bool is_int) {
TRACE("add_var", tout << "adding var " << ext_j << (is_int? " int" : " nonint") << std::endl;);
var_index local_j;
SASSERT(!m_term_register.external_is_used(ext_j));
lp_assert(!tv::is_term(ext_j));
if (m_var_register.external_is_used(ext_j, local_j))
return local_j;
@ -1709,6 +1722,7 @@ bool lar_solver::all_vars_are_registered(const vector<std::pair<mpq, var_index>>
// do not register in m_var_register this term if ext_i == UINT_MAX
var_index lar_solver::add_term(const vector<std::pair<mpq, var_index>> & coeffs, unsigned ext_i) {
TRACE("lar_solver_terms", print_linear_combination_of_column_indices_only(coeffs, tout) << ", ext_i =" << ext_i << "\n";);
SASSERT(!m_var_register.external_is_used(ext_i));
m_term_register.add_var(ext_i, term_is_int(coeffs));
lp_assert(all_vars_are_registered(coeffs));
if (strategy_is_undecided())

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

@ -135,6 +135,8 @@ public:
m_mpq_lar_core_solver.m_r_x[j] = v;
}
unsigned external_to_column_index(unsigned) const;
const mpq& get_column_value_rational(unsigned j) const {
if (tv::is_term(j)) {
j = m_var_register.external_to_local(j);

30
src/smt/theory_lra.cpp
View file

@ -265,7 +265,6 @@ class theory_lra::imp {
svector<std::pair<theory_var, theory_var> > m_assume_eq_candidates;
unsigned m_assume_eq_head;
std::unordered_map<lp::impq, theory_var> m_var_value_table;
lp::u_set m_tmp_var_set;
unsigned m_num_conflicts;
@ -1588,7 +1587,7 @@ public:
bool assume_eqs() {
svector<lpvar> vars;
m_var_value_table.clear();
m_model_eqs.reset();
m_tmp_var_set.clear();
m_tmp_var_set.resize(th.get_num_vars());
theory_var sz = static_cast<theory_var>(th.get_num_vars());
@ -1600,34 +1599,23 @@ public:
if (!th.is_relevant_and_shared(n1)) {
continue;
}
lpvar vi = lp().external_to_local(v);
if (vi == lp::null_lpvar)
lpvar vj = lp().external_to_column_index(v);
if (vj == lp::null_lpvar)
continue;
if (lp::tv::is_term(vi)) {
vi = lp().map_term_index_to_column_index(vi);
}
const auto& vi_val = lp().get_column_value(vi);
auto it = m_var_value_table.find(vi_val);
if (it == m_var_value_table.end()) {
m_var_value_table[vi_val] = v;
theory_var other = m_model_eqs.insert_if_not_there(v);
if (other == v) {
continue;
}
theory_var other = it->second;
SASSERT(other != v);
enode * n2 = get_enode(other);
if (n1->get_root() == n2->get_root())
continue;
if (!lp().column_is_fixed(vi)) {
vars.push_back(vi);
if (!lp().column_is_fixed(vj)) {
vars.push_back(vj);
}
else if (!m_tmp_var_set.contains(other) ) {
m_tmp_var_set.insert(other);
lpvar other_j = lp().external_to_local(other);
if (lp::tv::is_term(other_j)) {
other_j = lp().map_term_index_to_column_index(other_j);
}
unsigned other_j = lp().external_to_column_index(other);
if (!lp().column_is_fixed(other_j)) {
m_tmp_var_set.insert(other);
vars.push_back(other_j);
}
}