diff options
author | Tim King <taking@cs.nyu.edu> | 2013-04-30 00:46:14 -0400 |
---|---|---|
committer | Tim King <taking@cs.nyu.edu> | 2013-04-30 00:46:14 -0400 |
commit | 2b9e032cc93a96dccab8757326645da82b5866e5 (patch) | |
tree | 3d579a615f0d3acbf7edadc7cf81a237c4888f43 /src/theory/arith/soi_simplex.cpp | |
parent | 9098391fe334d829ec4101f190b8f1fa21c30752 (diff) |
Adding has bound counts and tracking for rows.
Diffstat (limited to 'src/theory/arith/soi_simplex.cpp')
-rw-r--r-- | src/theory/arith/soi_simplex.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/theory/arith/soi_simplex.cpp b/src/theory/arith/soi_simplex.cpp index f19b13fa5..ef00807f7 100644 --- a/src/theory/arith/soi_simplex.cpp +++ b/src/theory/arith/soi_simplex.cpp @@ -237,7 +237,7 @@ UpdateInfo SumOfInfeasibilitiesSPD::selectUpdate(LinearEqualityModule::UpdatePre Debug("soi::selectPrimalUpdate") << "selectPrimalUpdate " << instance << endl << d_soiVar << " " << d_tableau.basicRowLength(d_soiVar) - << " " << d_linEq._countBounds(d_soiVar) << endl; + << " " << d_linEq.debugBasicAtBoundCount(d_soiVar) << endl; typedef std::vector<Cand> CandVector; CandVector candidates; @@ -349,7 +349,7 @@ void SumOfInfeasibilitiesSPD::debugPrintSignal(ArithVar updated) const{ int dir = !d_variables.assignmentIsConsistent(updated) ? d_errorSet.getSgn(updated) : 0; Debug("updateAndSignal") << " dir " << dir; - Debug("updateAndSignal") << " _countBounds " << d_linEq._countBounds(updated) << endl; + Debug("updateAndSignal") << " debugBasicAtBoundCount " << d_linEq.debugBasicAtBoundCount(updated) << endl; } @@ -367,7 +367,7 @@ void SumOfInfeasibilitiesSPD::updateAndSignal(const UpdateInfo& selected, Witnes ArithVar leaving = selected.leaving(); ss << "leaving " << leaving << " " << d_tableau.basicRowLength(leaving) - << " " << d_linEq._countBounds(leaving) + << " " << d_linEq.debugBasicAtBoundCount(leaving) << endl; } if(degenerate(w) && selected.describesPivot()){ @@ -376,7 +376,7 @@ void SumOfInfeasibilitiesSPD::updateAndSignal(const UpdateInfo& selected, Witnes << "degenerate " << leaving << ", atBounds " << d_linEq.basicsAtBounds(selected) << ", len " << d_tableau.basicRowLength(leaving) - << ", bc " << d_linEq._countBounds(leaving) + << ", bc " << d_linEq.debugBasicAtBoundCount(leaving) << endl; } } |