mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-19 12:23:38 +00:00
Code Activity

whitespace

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2016-09-14 13:49:49 +01:00
parent 4f3f21bff1
commit 5716eaafed
1 changed files with 82 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/smt/smt_conflict_resolution.cpp
View file

@ -396,7 +396,7 @@ namespace smt {
tout << "consequent: " << consequent << ": "; tout << "consequent: " << consequent << ": ";
m_ctx.display_literal_verbose(tout, consequent); tout << "\n"; m_ctx.display_literal_verbose(tout, consequent); tout << "\n";
m_ctx.display(tout, js); tout << "\n"; m_ctx.display(tout, js); tout << "\n";
); );
// m_conflict_lvl can be smaller than m_ctx.get_search_level() when: // m_conflict_lvl can be smaller than m_ctx.get_search_level() when:
// there are user level scopes created using the Z3 API, and // there are user level scopes created using the Z3 API, and
@ -1343,9 +1343,9 @@ namespace smt {
void conflict_resolution::process_antecedent_for_unsat_core(literal antecedent) { void conflict_resolution::process_antecedent_for_unsat_core(literal antecedent) {
bool_var var = antecedent.var(); bool_var var = antecedent.var();
TRACE("conflict", tout << "processing antecedent: "; TRACE("conflict", tout << "processing antecedent: ";
m_ctx.display_literal_info(tout << antecedent << " ", antecedent); m_ctx.display_literal_info(tout << antecedent << " ", antecedent);
tout << (m_ctx.is_marked(var)?"marked":"not marked"); tout << (m_ctx.is_marked(var)?"marked":"not marked");
tout << "\n";); tout << "\n";);
if (!m_ctx.is_marked(var)) { if (!m_ctx.is_marked(var)) {
m_ctx.set_mark(var); m_ctx.set_mark(var);
@ -1378,7 +1378,7 @@ namespace smt {
literal consequent = false_literal; literal consequent = false_literal;
if (not_l != null_literal) { if (not_l != null_literal) {
consequent = ~not_l; consequent = ~not_l;
} }
int idx = skip_literals_above_conflict_level(); int idx = skip_literals_above_conflict_level();