Skip to content

Commit

Permalink
Fixing very stupid bug in previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
tkralphs committed Dec 3, 2024
1 parent 88488b2 commit c3c4564
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/MibSBranchStrategyPseudo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ MibSBranchStrategyPseudo::createCandBranchObjects(int numPassesLeft, double ub)
firstObjects.clear();

bool fractionalLinkingVar(false), fractionalLowerVar(false);
bool allVarsIntegral(true);

MibSBranchingStrategy branchPar = static_cast<MibSBranchingStrategy>
(mibsmodel->MibSPar_->entry(MibSParams::branchStrategy));
Expand Down Expand Up @@ -174,12 +175,16 @@ MibSBranchStrategyPseudo::createCandBranchObjects(int numPassesLeft, double ub)
for (i = 0; i < numCols; ++i) {
if (fabs(floor(solution[i] + 0.5) - solution[i]) > etol &&
colType[i] != 'C'){
branchPar = MibSBranchingStrategyLinking;
allVarsIntegral = false;
break;
}
}
}

if (allVarsIntegral){
branchPar = MibSBranchingStrategyLinking;
}

for (i = 0; i < numCols; ++i) {
if(colType[i] == 'C'){
candidate[i] = false;
Expand Down

0 comments on commit c3c4564

Please sign in to comment.