mirror of
https://github.com/Z3Prover/z3
synced 2025-04-10 19:27:06 +00:00
local updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
c21b860d4e
commit
e9e0293d1a
|
@ -353,7 +353,6 @@ struct pb2bv_rewriter::imp {
|
|||
|
||||
bool mk_pb(bool full, func_decl * f, unsigned sz, expr * const* args, expr_ref & result) {
|
||||
SASSERT(f->get_family_id() == pb.get_family_id());
|
||||
std::cout << "card: " << m_enable_card << "\n";
|
||||
if (is_or(f)) {
|
||||
if (m_enable_card) return false;
|
||||
result = m.mk_or(sz, args);
|
||||
|
@ -408,7 +407,6 @@ struct pb2bv_rewriter::imp {
|
|||
}
|
||||
|
||||
void enable_card(bool f) {
|
||||
std::cout << "set " << f << "\n";
|
||||
m_enable_card = f;
|
||||
m_enable_card = true;
|
||||
}
|
||||
|
|
|
@ -345,6 +345,9 @@ public:
|
|||
while (is_sat == l_false) {
|
||||
core.reset();
|
||||
s().get_unsat_core(core);
|
||||
//expr_ref_vector core1(m);
|
||||
//core1.append(core.size(), core.c_ptr());
|
||||
//std::cout << core1 << "\n";
|
||||
// verify_core(core);
|
||||
model_ref mdl;
|
||||
get_mus_model(mdl);
|
||||
|
@ -368,8 +371,7 @@ public:
|
|||
break;
|
||||
}
|
||||
remove_soft(core, asms);
|
||||
//is_sat = check_sat_hill_climb(asms);
|
||||
is_sat = l_true;
|
||||
is_sat = check_sat_hill_climb(asms);
|
||||
}
|
||||
TRACE("opt",
|
||||
tout << "num cores: " << cores.size() << "\n";
|
||||
|
|
|
@ -136,7 +136,6 @@ namespace sat {
|
|||
m_user_scope_literals.reset();
|
||||
m_user_scope_literals.append(src.m_user_scope_literals);
|
||||
|
||||
std::cout << "copy: " << init_trail_size() << " " << src.init_trail_size() << "\n";
|
||||
}
|
||||
|
||||
// -----------------------
|
||||
|
@ -1152,9 +1151,6 @@ namespace sat {
|
|||
}
|
||||
|
||||
void solver::reinit_assumptions() {
|
||||
if (at_search_lvl()) {
|
||||
std::cout << " " << init_trail_size() << " " << m_trail.size() << "\n";
|
||||
}
|
||||
if (tracking_assumptions() && at_base_lvl()) {
|
||||
TRACE("sat", tout << m_assumptions << "\n";);
|
||||
push();
|
||||
|
|
Loading…
Reference in a new issue