From c3c45645c0a883709cfba32e8b48f792d62f5dbf Mon Sep 17 00:00:00 2001 From: Ted Ralphs Date: Tue, 3 Dec 2024 10:01:35 +0100 Subject: [PATCH] Fixing very stupid bug in previous commit --- src/MibSBranchStrategyPseudo.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/MibSBranchStrategyPseudo.cpp b/src/MibSBranchStrategyPseudo.cpp index d6aba9e0..46beb17e 100644 --- a/src/MibSBranchStrategyPseudo.cpp +++ b/src/MibSBranchStrategyPseudo.cpp @@ -143,6 +143,7 @@ MibSBranchStrategyPseudo::createCandBranchObjects(int numPassesLeft, double ub) firstObjects.clear(); bool fractionalLinkingVar(false), fractionalLowerVar(false); + bool allVarsIntegral(true); MibSBranchingStrategy branchPar = static_cast (mibsmodel->MibSPar_->entry(MibSParams::branchStrategy)); @@ -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;