3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-27 08:28:44 +00:00
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-11-07 17:16:36 -08:00
parent 16555d4886
commit 2746528aab
19 changed files with 186 additions and 106 deletions

View file

@ -1989,6 +1989,7 @@ namespace sat {
scoped_level _sl(*this, c_fixed_truth);
m_search_mode = lookahead_mode::searching;
unsigned depth = 0;
unsigned init_trail = m_trail.size();
if (!is_first) {
goto pick_up_work;
@ -2010,7 +2011,12 @@ namespace sat {
(m_config.m_cube_cutoff == 0 && m_freevars.size() < m_cube_state.m_freevars_threshold)) {
m_cube_state.m_freevars_threshold *= (1.0 - pow(m_config.m_cube_fraction, depth));
set_conflict();
#if 0
// return cube of all literals, not just the ones in the main cube
lits.append(m_trail.size() - init_trail, m_trail.c_ptr() + init_trail);
#else
lits.append(m_cube_state.m_cube);
#endif
backtrack(m_cube_state.m_cube, m_cube_state.m_is_decision);
return l_undef;
}