summaryrefslogtreecommitdiff
path: root/src/theory/arith/constraint.cpp
diff options
context:
space:
mode:
authorAlex Ozdemir <aozdemir@hmc.edu>2020-03-05 15:57:15 -0800
committerAndres Noetzli <andres.noetzli@gmail.com>2020-03-05 15:58:48 -0800
commit1caa321893805c826a18e68aa5a3c86ce5304a9f (patch)
treebe92a8a20267fe7d381ba1a6cf6c9477825776bf /src/theory/arith/constraint.cpp
parentc360b3af4371cf871935a8bae96be5f8fecf741b (diff)
Revert "Add a new arith constraint proof rule: IntTightenAP (#3818)"
This reverts commit c360b3af4371cf871935a8bae96be5f8fecf741b.
Diffstat (limited to 'src/theory/arith/constraint.cpp')
-rw-r--r--src/theory/arith/constraint.cpp28
1 files changed, 2 insertions, 26 deletions
diff --git a/src/theory/arith/constraint.cpp b/src/theory/arith/constraint.cpp
index 56703c12a..20405d359 100644
--- a/src/theory/arith/constraint.cpp
+++ b/src/theory/arith/constraint.cpp
@@ -93,7 +93,6 @@ std::ostream& operator<<(std::ostream& o, const ArithProofType apt){
case FarkasAP: o << "FarkasAP"; break;
case TrichotomyAP: o << "TrichotomyAP"; break;
case EqualityEngineAP: o << "EqualityEngineAP"; break;
- case IntTightenAP: o << "IntTightenAP"; break;
case IntHoleAP: o << "IntHoleAP"; break;
default: break;
}
@@ -519,10 +518,6 @@ bool Constraint::hasSimpleFarkasProof() const
return true;
}
-bool Constraint::hasIntTightenProof() const {
- return getProofType() == IntTightenAP;
-}
-
bool Constraint::hasIntHoleProof() const {
return getProofType() == IntHoleAP;
}
@@ -1252,25 +1247,6 @@ bool Constraint::allHaveProof(const ConstraintCPVec& b){
return true;
}
-void Constraint::impliedByIntTighten(ConstraintCP a, bool nowInConflict){
- Debug("constraints::pf") << "impliedByIntTighten(" << this << ", " << *a << ")" << std::endl;
- Assert(!hasProof());
- Assert(negationHasProof() == nowInConflict);
- Assert(a->hasProof());
- Debug("pf::arith") << "impliedByIntTighten(" << this << ", " << a << ")"
- << std::endl;
-
- d_database->d_antecedents.push_back(NullConstraint);
- d_database->d_antecedents.push_back(a);
- AntecedentId antecedentEnd = d_database->d_antecedents.size() - 1;
- d_database->pushConstraintRule(ConstraintRule(this, IntTightenAP, antecedentEnd));
-
- Assert(inConflict() == nowInConflict);
- if(inConflict()){
- Debug("constraint::conflictCommit") << "inConflict impliedByIntTighten" << this << std::endl;
- }
-}
-
void Constraint::impliedByIntHole(ConstraintCP a, bool nowInConflict){
Debug("constraints::pf") << "impliedByIntHole(" << this << ", " << *a << ")" << std::endl;
Assert(!hasProof());
@@ -1463,7 +1439,7 @@ void Constraint::assertionFringe(ConstraintCPVec& v){
writePos++;
}else{
Assert(vi->hasTrichotomyProof() || vi->hasFarkasProof()
- || vi->hasIntHoleProof() || vi->hasIntTightenProof());
+ || vi->hasIntHoleProof());
AntecedentId p = vi->getEndAntecedent();
ConstraintCP antecedent = antecedents[p];
@@ -1533,7 +1509,7 @@ Node Constraint::externalExplain(AssertionOrder order) const{
}else if(hasEqualityEngineProof()){
return d_database->eeExplain(this);
}else{
- Assert(hasFarkasProof() || hasIntHoleProof() || hasIntTightenProof() || hasTrichotomyProof());
+ Assert(hasFarkasProof() || hasIntHoleProof() || hasTrichotomyProof());
Assert(!antecentListIsEmpty());
//Force the selection of the layer above if the node is
// assertedToTheTheory()!
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback