diff options
author | Tim King <taking@cs.nyu.edu> | 2012-05-04 03:03:34 +0000 |
---|---|---|
committer | Tim King <taking@cs.nyu.edu> | 2012-05-04 03:03:34 +0000 |
commit | 3d1c57e0506b2454aa815c3c1cb634d96ade1d7c (patch) | |
tree | 1805ae7dae1f9e9b04c2d344ce252a969fc4e7a8 /src/theory/arith/constraint.cpp | |
parent | 1433806056059339dd16ae8e431feaae23553150 (diff) |
- This fixes a problem where simplex produced the same conflict in the single check call.
- This increases the number of substitutions that ppAssert can solve on integer equations.
Diffstat (limited to 'src/theory/arith/constraint.cpp')
-rw-r--r-- | src/theory/arith/constraint.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/theory/arith/constraint.cpp b/src/theory/arith/constraint.cpp index 3cb5464da..d2a0d9bfa 100644 --- a/src/theory/arith/constraint.cpp +++ b/src/theory/arith/constraint.cpp @@ -26,7 +26,7 @@ ConstraintType constraintTypeOfComparison(const Comparison& cmp){ if(l.leadingCoefficientIsPositive()){ // (< x c) return UpperBound; }else{ - return LowerBound; // (< (-x) c) + return LowerBound; // (< (-x) c) } } case GT: @@ -482,7 +482,8 @@ Constraint ConstraintDatabase::getConstraint(ArithVar v, ConstraintType t, const }else{ pair<SortedConstraintMapIterator, bool> negInsertAttempt; negInsertAttempt = scm.insert(make_pair(negC->getValue(), ValueCollection())); - Assert(negInsertAttempt.second); + Assert(negInsertAttempt.second + || ! negInsertAttempt.first->second.hasConstraintOfType(negC->getType())); negPos = negInsertAttempt.first; } |