mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

add a way to supress lambdas

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2022-06-10 14:35:20 -07:00
parent 97437bce4c
commit 5db133f875
8 changed files with 60 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/sat/sat_drat.cpp
View file

@ -214,7 +214,10 @@ namespace sat {
return;
if (m_check_unsat)
assign_propagate(l);
assign_propagate(l);
if (m_trim)
append(mk_clause(1, &l, st.is_redundant()), st);
m_units.push_back(l);
}
@ -307,11 +310,15 @@ namespace sat {
}
}
}
if (!m_check_unsat)
return;
switch (num_watch) {
case 0:
m_inconsistent = true;
break;
case 1:
case 1:
assign_propagate(l1);
break;
default: {
@ -553,12 +560,10 @@ namespace sat {
for (unsigned i = m_proof.size(); i-- > 0; ) {
auto const & [c, st] = m_proof[i];
if (match(n, lits, c)) {
if (st.is_deleted()) {
if (st.is_deleted())
num_del++;
}
else {
else
num_add++;
}
}
}
return num_add > num_del;
@ -596,8 +601,8 @@ namespace sat {
continue;
unsigned num_true = 0;
unsigned num_undef = 0;
for (unsigned j = 0; j < c.size(); ++j) {
switch (value(c[j])) {
for (literal lit : c) {
switch (value(lit)) {
case l_true: num_true++; break;
case l_undef: num_undef++; break;
default: break;
@ -651,6 +656,8 @@ namespace sat {
}
void drat::assign_propagate(literal l) {
if (!m_check_unsat)
return;
unsigned num_units = m_units.size();
assign(l);
for (unsigned i = num_units; !m_inconsistent && i < m_units.size(); ++i)

3
src/sat/sat_solver.cpp
View file

@ -600,9 +600,8 @@ namespace sat {
else {
m_clauses.push_back(r);
}
if (m_config.m_drat) {
if (m_config.m_drat)
m_drat.add(*r, st);
}
for (literal l : *r) {
m_touched[l.var()] = m_touch_index;
}