projects
/
cvc5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
56edc6f
)
Enables the PreferenceFunction minBoundAndRowCount.
author
Tim King
<taking@cs.nyu.edu>
Sat, 5 Mar 2011 19:30:06 +0000
(19:30 +0000)
committer
Tim King
<taking@cs.nyu.edu>
Sat, 5 Mar 2011 19:30:06 +0000
(19:30 +0000)
src/theory/arith/simplex.cpp
patch
|
blob
|
history
diff --git
a/src/theory/arith/simplex.cpp
b/src/theory/arith/simplex.cpp
index 956a835630210763bd5d0651d4ecc452c2efce56..7e83e1b9ea521e47334a6770959d9fd900fe6aa9 100644
(file)
--- a/
src/theory/arith/simplex.cpp
+++ b/
src/theory/arith/simplex.cpp
@@
-453,7
+453,7
@@
Node SimplexDecisionProcedure::updateInconsistentVars(){
possibleConflict = findConflictOnTheQueue(BeforeDiffSearch);
}
if(possibleConflict.isNull()){
- possibleConflict = searchForFeasibleSolution<minRowCount>(d_numVariables + 1);
+ possibleConflict = searchForFeasibleSolution<min
BoundAnd
RowCount>(d_numVariables + 1);
}
if(d_queue.size() > 1 && possibleConflict.isNull()){
possibleConflict = findConflictOnTheQueue(AfterDiffSearch);