Skip to content

Commit c3c4564

Browse files
committed
Fixing very stupid bug in previous commit
1 parent 88488b2 commit c3c4564

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/MibSBranchStrategyPseudo.cpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ MibSBranchStrategyPseudo::createCandBranchObjects(int numPassesLeft, double ub)
143143
firstObjects.clear();
144144

145145
bool fractionalLinkingVar(false), fractionalLowerVar(false);
146+
bool allVarsIntegral(true);
146147

147148
MibSBranchingStrategy branchPar = static_cast<MibSBranchingStrategy>
148149
(mibsmodel->MibSPar_->entry(MibSParams::branchStrategy));
@@ -174,12 +175,16 @@ MibSBranchStrategyPseudo::createCandBranchObjects(int numPassesLeft, double ub)
174175
for (i = 0; i < numCols; ++i) {
175176
if (fabs(floor(solution[i] + 0.5) - solution[i]) > etol &&
176177
colType[i] != 'C'){
177-
branchPar = MibSBranchingStrategyLinking;
178+
allVarsIntegral = false;
178179
break;
179180
}
180181
}
181182
}
182183

184+
if (allVarsIntegral){
185+
branchPar = MibSBranchingStrategyLinking;
186+
}
187+
183188
for (i = 0; i < numCols; ++i) {
184189
if(colType[i] == 'C'){
185190
candidate[i] = false;

0 commit comments

Comments
 (0)