mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

Merge branch 'opt' of https://git01.codeplex.com/z3 into opt

Browse source
This commit is contained in:
Nikolaj Bjorner 2014-08-25 12:11:49 -07:00
commit 15734398d8
9 changed files with 212 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/sat/sat_sls.cpp
View file

@ -387,8 +387,10 @@ namespace sat {
m_best_value = val;
m_best_model.reset();
m_best_model.append(m_model);
IF_VERBOSE(0, verbose_stream() << "new value: " << val << " @ " << i << "\n";);
m_max_tries *= 2;
IF_VERBOSE(1, verbose_stream() << "new value: " << val << " @ " << i << "\n";);
if (i*2 > m_max_tries) {
m_max_tries *= 2;
}
}
}
}

1
src/sat/sat_solver.cpp
View file

@ -969,6 +969,7 @@ namespace sat {
if (m_conflicts < m_next_simplify) {
return;
}
IF_VERBOSE(2, verbose_stream() << "(sat.simplify)\n";);
// Disable simplification during MUS computation.
// if (m_mus.is_active()) return;