mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-11 10:18:06 +00:00
Code Activity

fixing lookahead/ba + parallel

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-10-11 17:06:28 -07:00
parent 79ceaa1d13
commit 81ad69214c
8 changed files with 53 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/sat/sat_solver.cpp
View file

@ -162,6 +162,7 @@ namespace sat {
m_user_scope_literals.append(src.m_user_scope_literals);
m_mc = src.m_mc;
m_stats.m_units = init_trail_size();
}
// -----------------------
@ -837,11 +838,11 @@ namespace sat {
return lh.select_lookahead(assumptions, vars);
}
lbool solver::cube(literal_vector& lits) {
lbool solver::cube(bool_var_vector const& vars, literal_vector& lits) {
if (!m_cuber) {
m_cuber = alloc(lookahead, *this);
}
lbool result = m_cuber->cube(lits);
lbool result = m_cuber->cube(vars, lits);
if (result == l_false) {
dealloc(m_cuber);
m_cuber = nullptr;
@ -858,6 +859,7 @@ namespace sat {
lbool solver::check(unsigned num_lits, literal const* lits) {
init_reason_unknown();
pop_to_base_level();
m_stats.m_units = init_trail_size();
IF_VERBOSE(2, verbose_stream() << "(sat.sat-solver)\n";);
SASSERT(at_base_lvl());
if (m_config.m_dimacs_display) {
@ -4039,7 +4041,7 @@ namespace sat {
}
void stats::reset() {
memset(this, sizeof(*this), 0);
memset(this, 0, sizeof(*this));
}
void mk_stat::display(std::ostream & out) const {