Use CoinBronKerbosch::PivotingStrategy enum

coin-or · Aug 13, 2024 · 38e3568 · 38e3568
1 parent 50c612f
commit 38e3568
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/CbcSolver.cpp b/src/CbcSolver.cpp
@@ -1436,7 +1436,8 @@ int CbcMain1(std::deque<std::string> inputQueue, CbcModel &model,
     std::string cgraphMode = "on";
     std::string clqstrMode = "after";
     CglBKClique bkCliqueGen;
-    int  bkPivotingStrategy = 3, maxCallsBK = 1000, bkClqExtMethod = 4;
+    CoinBronKerbosch::PivotingStrategy bkPivotingStrategy = CoinBronKerbosch::PivotingStrategy::Weight;
+    int maxCallsBK = 1000, bkClqExtMethod = 4;
     int cliqueMode = parameters[CbcParam::CLIQUECUTS]->modeVal();
     int oldCliqueMode = cliqueMode;
     CglOddWheel oddWheelGen;
@@ -2205,7 +2206,7 @@ int CbcMain1(std::deque<std::string> inputQueue, CbcModel &model,
               } else if (cbcParamCode == CbcParam::AGGREGATEMIXED) {
                  mixedRoundStrategy = iValue;
               } else if (cbcParamCode == CbcParam::BKPIVOTINGSTRATEGY) {
-                 bkPivotingStrategy = iValue;
+                 bkPivotingStrategy = static_cast<CoinBronKerbosch::PivotingStrategy>(iValue);
               } else if (cbcParamCode == CbcParam::BKMAXCALLS) {
                  maxCallsBK = iValue;
               } else if (cbcParamCode == CbcParam::BKCLQEXTMETHOD) {
@@ -3690,7 +3691,7 @@ int CbcMain1(std::deque<std::string> inputQueue, CbcModel &model,
                       CglBKClique bkClique;
                       bkClique.setMaxCallsBK(1000);
                       bkClique.setExtendingMethod(4);
-                      bkClique.setPivotingStrategy(3);
+                      bkClique.setPivotingStrategy(CoinBronKerbosch::PivotingStrategy::Weight);
                       cbcModel->addCutGenerator(&bkClique, -98, "Clique", true,
                                                 false, false, -100, -1, -1);
                       cbcModel->cutGenerator(numCutGens++)->setTiming(true);

diff --git a/src/CbcStrategy.cpp b/src/CbcStrategy.cpp
@@ -184,7 +184,7 @@ void CbcStrategyDefault::setupCutGenerators(CbcModel &model)
   CglBKClique generator5;
   generator5.setMaxCallsBK(1000);
   generator5.setExtendingMethod(4);
-  generator5.setPivotingStrategy(3);
+  generator5.setPivotingStrategy(CoinBronKerbosch::PivotingStrategy::Weight);
 
   CglMixedIntegerRounding2 mixedGen;
   CglFlowCover flowGen;
@@ -711,7 +711,7 @@ void CbcStrategyDefaultSubTree::setupCutGenerators(CbcModel &model)
   CglBKClique generator5;
   generator5.setMaxCallsBK(1000);
   generator5.setExtendingMethod(4);
-  generator5.setPivotingStrategy(3);
+  generator5.setPivotingStrategy(CoinBronKerbosch::PivotingStrategy::Weight);
 
   CglMixedIntegerRounding2 mixedGen;
   CglFlowCover flowGen;