Changeset 622


Ignore:
Timestamp:
Jun 9, 2011 10:19:39 AM (9 years ago)
Author:
berthold
Message:

added FP parameter to choose MILP solving method

Location:
trunk/Couenne/src/heuristics
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/heuristics/CouenneFeasPump.hpp

    r621 r622  
    202202#ifdef COIN_HAS_SCIP
    203203    /// use SCIP instead of Cbc for solving MILPs
    204     bool useSCIP_;
     204     bool useSCIP_;
     205     int milpMethod_;
    205206#endif
    206207  };
  • trunk/Couenne/src/heuristics/CouenneFeasPumpConstructors.cpp

    r620 r622  
    8484  std::string s;
    8585
    86   options -> GetIntegerValue ("feas_pump_iter",      maxIter_,             "couenne.");
    87   options -> GetIntegerValue ("feas_pump_level",     numberSolvePerLevel_, "couenne.");
    88   options -> GetNumericValue ("feas_pump_beta_nlp",  betaNLP_,             "couenne.");
    89   options -> GetNumericValue ("feas_pump_beta_milp", betaMILP_,            "couenne.");
     86  options -> GetIntegerValue ("feas_pump_iter",       maxIter_,             "couenne.");
     87  options -> GetIntegerValue ("feas_pump_level",      numberSolvePerLevel_, "couenne.");
     88  options -> GetIntegerValue ("feas_pump_milpmethod", milpMethod_,          "couenne.");
     89
     90  options -> GetNumericValue ("feas_pump_beta_nlp",   betaNLP_,             "couenne.");
     91  options -> GetNumericValue ("feas_pump_beta_milp",  betaMILP_,            "couenne.");
    9092                                   
    9193  options -> GetStringValue  ("feas_pump_lincut",   s, "couenne."); milpCuttingPlane_ = (s == "yes");
    9294  options -> GetStringValue  ("feas_pump_dist_int", s, "couenne."); compDistInt_      = (s == "yes");
    93   options -> GetStringValue  ("feas_pump_usescip", s, "couenne."); useSCIP_      = (s == "yes");
     95  options -> GetStringValue  ("feas_pump_usescip",  s, "couenne."); useSCIP_          = (s == "yes");
    9496
    9597  // Although app_ is only used in CouenneFPSolveNLP, we need to have
     
    299301     "");
    300302
    301 }
     303  roptions -> AddBoundedIntegerOption
     304    ("feas_pump_milpmethod",
     305     "How should the integral solution be constructed?",
     306     0, 6, 0,
     307       "0: automatic, 1; completely, 2: RENS, 3: Objective Feasibility Pump, 4:round-and-propagate, 5: choose from pool, 6: random");
     308}
Note: See TracChangeset for help on using the changeset viewer.