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

fixes for input4/5 #2416

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-07-28 10:27:47 +08:00
parent 06ee09a113
commit 2bd8d3b485
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/sat/ba_solver.cpp
View file

@ -3159,14 +3159,18 @@ namespace sat {
// ------------------------------- // -------------------------------
// set literals equivalent // set literals equivalent
bool ba_solver::set_root(literal l, literal r) { void ba_solver::reserve_roots() {
if (s().is_assumption(l.var())) {
return false;
}
m_root_vars.reserve(s().num_vars(), false); m_root_vars.reserve(s().num_vars(), false);
for (unsigned i = m_roots.size(); i < 2 * s().num_vars(); ++i) { for (unsigned i = m_roots.size(); i < 2 * s().num_vars(); ++i) {
m_roots.push_back(to_literal(i)); m_roots.push_back(to_literal(i));
} }
}
bool ba_solver::set_root(literal l, literal r) {
if (s().is_assumption(l.var())) {
return false;
}
reserve_roots();
m_roots[l.index()] = r; m_roots[l.index()] = r;
m_roots[(~l).index()] = ~r; m_roots[(~l).index()] = ~r;
m_root_vars[l.var()] = true; m_root_vars[l.var()] = true;
@ -3175,7 +3179,7 @@ namespace sat {
void ba_solver::flush_roots() { void ba_solver::flush_roots() {
if (m_roots.empty()) return; if (m_roots.empty()) return;
reserve_roots();
// validate(); // validate();
m_visited.resize(s().num_vars()*2, false); m_visited.resize(s().num_vars()*2, false);
m_constraint_removed = false; m_constraint_removed = false;

1
src/sat/ba_solver.h
View file

@ -328,6 +328,7 @@ namespace sat {
void update_psm(constraint& c) const; void update_psm(constraint& c) const;
void mutex_reduction(); void mutex_reduction();
void update_pure(); void update_pure();
void reserve_roots();
unsigned use_count(literal lit) const { return m_cnstr_use_list[lit.index()].size() + m_clause_use_list.get(lit).size(); } unsigned use_count(literal lit) const { return m_cnstr_use_list[lit.index()].size() + m_clause_use_list.get(lit).size(); }