summaryrefslogtreecommitdiff
path: root/src/theory/sets/cardinality_extension.cpp
diff options
context:
space:
mode:
authorGereon Kremer <gereon.kremer@cs.rwth-aachen.de>2020-09-04 16:59:49 +0200
committerGitHub <noreply@github.com>2020-09-04 09:59:49 -0500
commit0d0c1cdbce4fb46ad5c7d4bc620b712ea014722e (patch)
tree5fa7c5d06cbf0a67541c5bdbc82bf692f5d1dd48 /src/theory/sets/cardinality_extension.cpp
parentbfb744af4f932f095640d97be8f0bfa9ff60e981 (diff)
Use arith::InferenceManager for CAD lemmas (#5015)
This makes the CAD solver use the new arith::InferenceManager instead of the previously used lemma collection scheme.
Diffstat (limited to 'src/theory/sets/cardinality_extension.cpp')
-rw-r--r--src/theory/sets/cardinality_extension.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/theory/sets/cardinality_extension.cpp b/src/theory/sets/cardinality_extension.cpp
index a51cee2c3..321559f5a 100644
--- a/src/theory/sets/cardinality_extension.cpp
+++ b/src/theory/sets/cardinality_extension.cpp
@@ -183,17 +183,17 @@ void CardinalityExtension::check()
{
checkCardinalityExtended();
checkRegister();
- if (d_im.hasProcessed())
+ if (d_im.hasSent())
{
return;
}
checkMinCard();
- if (d_im.hasProcessed())
+ if (d_im.hasSent())
{
return;
}
checkCardCycles();
- if (d_im.hasProcessed())
+ if (d_im.hasSent())
{
return;
}
@@ -300,7 +300,7 @@ void CardinalityExtension::checkCardCycles()
std::vector<Node> curr;
std::vector<Node> exp;
checkCardCyclesRec(s, curr, exp);
- if (d_im.hasProcessed())
+ if (d_im.hasSent())
{
return;
}
@@ -414,7 +414,7 @@ void CardinalityExtension::checkCardCyclesRec(Node eqc,
}
d_im.assertInference(conc, n.eqNode(emp_set), "cg_emp");
d_im.doPendingLemmas();
- if (d_im.hasProcessed())
+ if (d_im.hasSent())
{
return;
}
@@ -446,7 +446,7 @@ void CardinalityExtension::checkCardCyclesRec(Node eqc,
Assert(!d_state.areEqual(n, emp_set));
d_im.assertInference(n.eqNode(emp_set), p.eqNode(emp_set), "cg_emppar");
d_im.doPendingLemmas();
- if (d_im.hasProcessed())
+ if (d_im.hasSent())
{
return;
}
@@ -493,7 +493,7 @@ void CardinalityExtension::checkCardCyclesRec(Node eqc,
<< "...derived " << conc.size() << " conclusions" << std::endl;
d_im.assertInference(conc, n.eqNode(p), "cg_eqpar");
d_im.doPendingLemmas();
- if (d_im.hasProcessed())
+ if (d_im.hasSent())
{
return;
}
@@ -552,7 +552,7 @@ void CardinalityExtension::checkCardCyclesRec(Node eqc,
Trace("sets-nf") << "Split empty : " << n << std::endl;
d_im.split(n.eqNode(emp_set), 1);
}
- Assert(d_im.hasProcessed());
+ Assert(d_im.hasSent());
return;
}
else
@@ -600,7 +600,7 @@ void CardinalityExtension::checkCardCyclesRec(Node eqc,
}
d_im.assertInference(conc, cpk.eqNode(cpnl), "cg_pareq");
d_im.doPendingLemmas();
- if (d_im.hasProcessed())
+ if (d_im.hasSent())
{
return;
}
@@ -619,7 +619,7 @@ void CardinalityExtension::checkCardCyclesRec(Node eqc,
Trace("sets-cycle-debug")
<< "Traverse card parent " << eqc << " -> " << cpnc << std::endl;
checkCardCyclesRec(cpnc, curr, exp);
- if (d_im.hasProcessed())
+ if (d_im.hasSent())
{
return;
}
@@ -642,7 +642,7 @@ void CardinalityExtension::checkNormalForms(std::vector<Node>& intro_sets)
for (int i = (int)(d_oSetEqc.size() - 1); i >= 0; i--)
{
checkNormalForm(d_oSetEqc[i], intro_sets);
- if (d_im.hasProcessed() || !intro_sets.empty())
+ if (d_im.hasSent() || !intro_sets.empty())
{
return;
}
@@ -783,7 +783,7 @@ void CardinalityExtension::checkNormalForm(Node eqc,
d_state.debugPrintSet(r, "sets-nf");
Trace("sets-nf") << std::endl;
d_im.split(r.eqNode(emp_set), 1);
- Assert(d_im.hasProcessed());
+ Assert(d_im.hasSent());
return;
}
}
@@ -867,7 +867,7 @@ void CardinalityExtension::checkNormalForm(Node eqc,
}
if (!success)
{
- Assert(d_im.hasProcessed());
+ Assert(d_im.hasSent());
return;
}
// Send to parents (a parent is a set that contains a term in this equivalence
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback