Ignore:
Timestamp:
Oct 30, 2006 11:55:45 PM (13 years ago)
Author:
pbonami
Message:

Add option to choose branching strategy,
include cmath in BonCurvatureEstimator?

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/src/CbcBonmin/BonCbcParam.cpp

    r98 r99  
    4444    // Branch & bound setting
    4545    success &= Options->GetEnumValue("nodeselect_stra",nodeSelection,"bonmin.");
     46    success &= Options->GetEnumValue("varseselect_stra",varSelection,"bonmin.");
    4647    success &= Options->GetIntegerValue("number_strong_branch",numberStrong,"bonmin.");
    4748    success &= Options->GetIntegerValue("number_before_trust", minReliability,"bonmin.");
     
    7677    if (algo==0)//B-BB
    7778    {
    78       // AW minReliability=0;
    79       minReliability=10000;
    80       //AW numberStrong=0;
     79      if(varSelection == 1 || varSelection == 2){
     80        std::cout<<"Variable selection strategy not available with B-BB.\nSetting to most fractional."<<std::endl;
     81        varSelection = 0;
     82      }
    8183    }
    8284    else if (algo==1)//B-OA
     
    9799    {
    98100    }
    99 
     101   
     102    // Set branching strategy
     103    if(varSelection == 0){
     104      minReliability = 0;
     105      numberStrong = 0;
     106    }
     107    else if(varSelection == 1){
     108      minReliability = 0;
     109    }
     110    else if(varSelection == 3){
     111      minReliability = 10000;
     112    }
    100113    return success;
    101114  }
Note: See TracChangeset for help on using the changeset viewer.