Allow for better setting of MILP cut strategy and better naming of parameters

Author: tkralphs

src/MibSConstants.hpp

@@ -46,6 +46,17 @@ enum MibSSolType{
 
 //#############################################################################
 
+enum MibSMILPCutStrategy{
+   MibSMILPCutStrategyNotSet = -2,
+   MibSMILPCutStrategyOn,              //blisCutStrategyNotSet 
+   MibSMILPCutStrategyOff,             //blisCutStrategyNone
+   MibSMILPCutStrategyRoot,            //blisCutStrategyRoot
+   MibSMILPCutStrategyAuto,            //blisCutStrategyAuto 
+   MibSMILPCutStrategyPeriodic         //blisCutStrategyPeriodic
+};
+
+//#############################################################################
+
 enum MibSBranchingStrategy{
     MibSBranchingStrategyNotSet = -1,
     MibSBranchingStrategyFractional,

src/MibSModel.cpp

@@ -240,8 +240,8 @@ MibSModel::readParameters(const int argnum, const char * const * arglist)
    BlisPar_->readFromArglist(argnum, arglist);
    MibSPar_->readFromArglist(argnum, arglist);
 
-   BlisPar()->setEntry(BlisParams::cutStrategy,
-                       MibSPar_->entry(MibSParams::blisCutStrategy));
+   //BlisPar()->setEntry(BlisParams::cutStrategy,
+   //                    MibSPar_->entry(MibSParams::milpCutStrategy));
    BlisPar()->setEntry(BlisParams::branchStrategy,
                        MibSPar_->entry(MibSParams::blisBranchStrategy));
 
@@ -3830,9 +3830,14 @@ MibSModel::adjustParameters()
        }
     }
 
-    if (isInterdict_){
-       MibSPar()->setEntry(MibSParams::blisCutStrategy, 0);
-       BlisPar()->setEntry(BlisParams::cutStrategy, 0);
+    if (MibSPar()->entry(MibSParams::milpCutStrategy) == MibSMILPCutStrategyNotSet){
+       if (isInterdict_){
+          MibSPar()->setEntry(MibSParams::milpCutStrategy, MibSMILPCutStrategyOff);
+          BlisPar()->setEntry(BlisParams::cutStrategy, BlisCutStrategyNone);
+       }else{
+          MibSPar()->setEntry(MibSParams::milpCutStrategy, MibSMILPCutStrategyOn);
+          BlisPar()->setEntry(BlisParams::cutStrategy, BlisCutStrategyNotSet);
+       }
     }
 
     if (MibSPar_->entry(MibSParams::cutStrategy) == BRANCHONLY){

src/MibSParams.cpp

@@ -106,8 +106,8 @@ MibSParams::createKeywordList() {
    keys_.push_back(make_pair(std::string("MibS_objBoundStrategy"),
 			     AlpsParameter(AlpsIntPar, objBoundStrategy)));
 
-   keys_.push_back(make_pair(std::string("MibS_blisCutStrategy"),
-			     AlpsParameter(AlpsIntPar, blisCutStrategy)));
+   keys_.push_back(make_pair(std::string("MibS_milpCutStrategy"),
+			     AlpsParameter(AlpsIntPar, milpCutStrategy)));
 
    keys_.push_back(make_pair(std::string("MibS_blisBranchStrategy"),
 			     AlpsParameter(AlpsIntPar, blisBranchStrategy)));
@@ -349,7 +349,7 @@ MibSParams::setDefaultEntries() {
 
    setEntry(objBoundStrategy, LPBOUND);
 
-   setEntry(blisCutStrategy, -1);
+   setEntry(milpCutStrategy, MibSMILPCutStrategyDefault);
 
    setEntry(blisBranchStrategy, 1);
 

src/MibSParams.hpp

@@ -53,7 +53,7 @@ class MibSParams : public AlpsParameterSet {
      bilevelCutTypes,
      cutStrategy,
      objBoundStrategy,
-     blisCutStrategy,
+     milpCutStrategy,
      blisBranchStrategy,
      branchStrategy,
      upperFileFormat,