Skip to content

Commit

Permalink
missing switch cases
Browse files Browse the repository at this point in the history
  • Loading branch information
NikolajBjorner committed Apr 19, 2022
1 parent 5393f1d commit ec57d3b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
7 changes: 7 additions & 0 deletions src/opt/maxcore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,12 @@ class maxcore : public maxsmt_solver_base {
case s_primal_binary_delay:
m_trace_id = "maxres-bin-delay";
break;
case s_rc2:
m_trace_id = "rc2";
break;
default:
UNREACHABLE();
break;
}
}

Expand Down Expand Up @@ -371,6 +377,7 @@ class maxcore : public maxsmt_solver_base {
case s_primal:
case s_primal_binary:
case s_primal_binary_delay:
case s_rc2:
return mus_solver();
case s_primal_dual:
return primal_dual_solver();
Expand Down
5 changes: 4 additions & 1 deletion src/sat/smt/q_ematch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -669,8 +669,11 @@ namespace q {
if (m_inst_queue.lazy_propagate())
return true;
for (unsigned i = 0; i < m_clauses.size(); ++i)
if (m_clauses[i]->m_bindings)
if (m_clauses[i]->m_bindings) {
IF_VERBOSE(0, verbose_stream() << "missed propagation " << i << "\n");
TRACE("q", display(tout));
break;
}

TRACE("q", tout << "no more propagation\n";);
return false;
Expand Down
6 changes: 4 additions & 2 deletions src/solver/assertions/asserted_formulas.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,11 @@ void asserted_formulas::push_scope() {
}

void asserted_formulas::push_scope_core() {
std::cout << "push\n";
reduce();
commit();
SASSERT(inconsistent() || m_qhead == m_formulas.size() || m.limit().is_canceled());
TRACE("asserted_formulas_scopes", tout << "before push: " << m_scopes.size() << "\n";);
TRACE("asserted_formulas_scopes", tout << "before push: " << m_scopes.size() << "\n");
m_scoped_substitution.push();
m_scopes.push_back(scope());
scope & s = m_scopes.back();
Expand All @@ -205,7 +206,7 @@ void asserted_formulas::push_scope_core() {
m_bv_sharing.push_scope();
m_macro_manager.push_scope();
commit();
TRACE("asserted_formulas_scopes", tout << "after push: " << m_scopes.size() << "\n";);
TRACE("asserted_formulas_scopes", tout << "after push: " << m_scopes.size() << "\n");
}

void asserted_formulas::force_push() {
Expand Down Expand Up @@ -260,6 +261,7 @@ bool asserted_formulas::check_well_sorted() const {
}

void asserted_formulas::reduce() {
std::cout << "reduce\n";
if (inconsistent())
return;
if (canceled())
Expand Down

0 comments on commit ec57d3b

Please sign in to comment.