Skip to content

Commit 44f3fae

Browse files
committed
Remove unusedvb flag. Try fcc for tableau
1 parent 3102326 commit 44f3fae

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

highs/mip/HighsTableauSeparator.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,12 @@ void HighsTableauSeparator::separateLpSolution(HighsLpRelaxation& lpRelaxation,
229229
baseRowInds.size());
230230

231231
double rhs = 0;
232-
cutGen.generateCut(transLp, baseRowInds, baseRowVals, rhs, false, false);
232+
cutGen.generateCut(transLp, baseRowInds, baseRowVals, rhs, false, cutpool.getNumCuts() - numCuts >= 20);
233233
if (mip.mipdata_->domain.infeasible()) break;
234234

235235
lpAggregator.getCurrentAggregation(baseRowInds, baseRowVals, true);
236236
rhs = 0;
237-
cutGen.generateCut(transLp, baseRowInds, baseRowVals, rhs, false, false);
237+
cutGen.generateCut(transLp, baseRowInds, baseRowVals, rhs, false, cutpool.getNumCuts() - numCuts >= 20);
238238
if (mip.mipdata_->domain.infeasible()) break;
239239

240240
lpAggregator.clear();

highs/mip/HighsTransformedLp.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,6 @@ bool HighsTransformedLp::transformSNFRelaxation(
757757
++i;
758758
}
759759

760-
HighsInt numVbUsed = 0;
761760
i = 0;
762761
while (i < numNz) {
763762
HighsInt col = inds[i];
@@ -910,7 +909,6 @@ bool HighsTransformedLp::transformSNFRelaxation(
910909
// (2) y'_j = a_j(y_j - d_j) + c_j * x_j,
911910
// 0 <= y'_j <= (a_j l'_j + c_j)x_j
912911
// rhs -= a_j * d_j
913-
numVbUsed++;
914912
vbcol = bestVlb[col].first;
915913
vbconstant = bestVlb[col].second.constant +
916914
(complementvlb ? bestVlb[col].second.coef : 0);
@@ -945,7 +943,6 @@ bool HighsTransformedLp::transformSNFRelaxation(
945943
// (2) y'_j = -(a_j(y_j - d_j) + c_j * x_j),
946944
// 0 <= y'_j <= -(a_j u'_j + c_j)x_j
947945
// rhs -= a_j * d_j
948-
numVbUsed++;
949946
vbcol = bestVub[col].first;
950947
vbconstant = bestVub[col].second.constant +
951948
(complementvub ? bestVub[col].second.coef : 0);
@@ -980,7 +977,7 @@ bool HighsTransformedLp::transformSNFRelaxation(
980977

981978
vectorsum.clear();
982979
snfr.rhs = static_cast<double>(tmpSnfrRhs);
983-
if (numNz == 0 || numVbUsed == 0) return false;
980+
if (numNz == 0) return false;
984981
return true;
985982
}
986983

0 commit comments

Comments
 (0)