mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-16 05:48:44 +00:00
Code Activity

fixes in random_update()

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2020-04-09 11:44:16 -07:00
parent f04dfa71a6
commit 57f622acc1
2 changed files with 33 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/math/lp/random_updater.h
View file

@ -35,11 +35,7 @@ class random_updater {
u_set m_var_set; u_set m_var_set;
lar_solver & m_lar_solver; lar_solver & m_lar_solver;
unsigned m_range; unsigned m_range;
void add_column_to_sets(unsigned j);
std::unordered_map<numeric_pair<mpq>, unsigned> m_values; // it maps a value to the number of time it occurs
bool shift_var(unsigned j); bool shift_var(unsigned j);
void add_value(const numeric_pair<mpq>& v);
void remove_value(const numeric_pair<mpq> & v);
public: public:
random_updater(lar_solver & solver, const vector<unsigned> & column_list); random_updater(lar_solver & solver, const vector<unsigned> & column_list);
void update(); void update();

77
src/math/lp/random_updater_def.h
View file

@ -32,61 +32,50 @@ random_updater::random_updater(
m_range(100000) { m_range(100000) {
m_var_set.resize(m_lar_solver.number_of_vars()); m_var_set.resize(m_lar_solver.number_of_vars());
for (unsigned j : column_indices) for (unsigned j : column_indices)
add_column_to_sets(j); m_var_set.insert(j);
TRACE("lar_solver_rand", tout << "size = " << m_var_set.size() << "\n";); TRACE("lar_solver_rand", tout << "size = " << m_var_set.size() << "\n";);
} }
bool random_updater::shift_var(unsigned v) { bool random_updater::shift_var(unsigned j) {
SASSERT(!m_lar_solver.column_is_fixed(v)); SASSERT(!m_lar_solver.column_is_fixed(j) && !m_lar_solver.is_base(j));
return m_lar_solver.get_int_solver()->shift_var(v, m_range); bool ret = m_lar_solver.get_int_solver()->shift_var(j, m_range);
if (ret) {
const auto & A = m_lar_solver.A_r();
for (const auto& c : A.m_columns[j]) {
unsigned row_index = c.var();
unsigned changed_basic = m_lar_solver.get_core_solver().m_r_basis[row_index];
m_var_set.erase(changed_basic);
}
}
return ret;
} }
void random_updater::update() { void random_updater::update() {
for (auto j : m_var_set) { auto columns = m_var_set.index(); // m_var_set is going to change during the loop
if (m_var_set.size() <= m_values.size()) { for (auto j : columns) {
break; // we are done if (!m_var_set.contains(j)) {
} TRACE("lar_solver_rand", tout << "skipped " << j << "\n";);
auto old_x = m_lar_solver.get_column_value(j); continue;
if (shift_var(j)) {
remove_value(old_x);
add_value(m_lar_solver.get_column_value(j));
} }
if (!m_lar_solver.is_base(j)) {
shift_var(j);
} else {
unsigned row = m_lar_solver.get_core_solver().m_r_heading[j];
for (auto & row_c : m_lar_solver.get_core_solver().m_r_A.m_rows[row]) {
unsigned cj = row_c.var();
if (!m_lar_solver.is_base(cj) &&
!m_lar_solver.column_is_fixed(cj)
&&
shift_var(cj)
) {
break; // done with the basic var j
}
}
}
} }
TRACE("lar_solver_rand", tout << "m_var_set.size() = " << m_var_set.size() << ", m_values.size() = " << m_values.size() << "\n";); TRACE("lar_solver_rand", tout << "m_var_set.size() = " << m_var_set.size() << ", m_values.size() = " << m_values.size() << "\n";);
} }
void random_updater::add_value(const numeric_pair<mpq>& v) {
auto it = m_values.find(v);
if (it == m_values.end()) {
m_values[v] = 1;
} else {
it->second++;
}
}
void random_updater::remove_value(const numeric_pair<mpq>& v) {
std::unordered_map<numeric_pair<mpq>, unsigned>::iterator it = m_values.find(v);
lp_assert(it != m_values.end());
it->second--;
if (it->second == 0)
m_values.erase((std::unordered_map<numeric_pair<mpq>, unsigned>::const_iterator)it);
}
void random_updater::add_column_to_sets(unsigned j) {
if (m_lar_solver.get_core_solver().m_r_heading[j] < 0) {
m_var_set.insert(j);
add_value(m_lar_solver.get_core_solver().m_r_x[j]);
} else {
unsigned row = m_lar_solver.get_core_solver().m_r_heading[j];
for (auto & row_c : m_lar_solver.get_core_solver().m_r_A.m_rows[row]) {
unsigned cj = row_c.var();
if (m_lar_solver.get_core_solver().m_r_heading[cj] < 0 && !m_lar_solver.column_is_fixed(cj)) {
m_var_set.insert(cj);
add_value(m_lar_solver.get_core_solver().m_r_x[cj]);
}
}
}
}
} }