Changeset 1548


Ignore:
Timestamp:
Jan 19, 2010 6:25:26 PM (9 years ago)
Author:
pbonami
Message:

Changes to options docs

Location:
trunk/Bonmin/src/CbcBonmin/Heuristics
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/src/CbcBonmin/Heuristics/BonDummyPump.cpp

    r1357 r1548  
    6363  void
    6464  DummyPump::registerOptions(Ipopt::SmartPtr<Bonmin::RegisteredOptions> roptions){
    65    roptions->SetRegisteringCategory("Local search based heuristics", RegisteredOptions::BonminCategory);
     65   roptions->SetRegisteringCategory("Test heuristics", RegisteredOptions::UndocumentedCategory);
    6666   roptions->AddStringOption2(
    6767     "dummy_pump_heuristic",
     
    7171     "yes", "runs the heuristic",
    7272     "");
     73   roptions->setOptionExtraInfo("dummy_pump_heuristic", 63);
    7374  }
    7475
  • trunk/Bonmin/src/CbcBonmin/Heuristics/BonFixAndSolveHeuristic.cpp

    r1370 r1548  
    7474  void
    7575  FixAndSolveHeuristic::registerOptions(Ipopt::SmartPtr<Bonmin::RegisteredOptions> roptions){
    76    roptions->SetRegisteringCategory("Local search based heuristics", RegisteredOptions::BonminCategory);
     76   roptions->SetRegisteringCategory("MINLP Heuristics", RegisteredOptions::BonminCategory);
    7777   roptions->AddStringOption2(
    7878     "fix_and_solve_heuristic",
     
    8282     "yes", "runs the heuristic",
    8383     "");
     84   roptions->setOptionExtraInfo("fix_and_solve_heuristic", 63);
    8485  }
    8586
  • trunk/Bonmin/src/CbcBonmin/Heuristics/BonHeuristicDiveFractional.cpp

    r1348 r1548  
    114114  void
    115115  HeuristicDiveFractional::registerOptions(Ipopt::SmartPtr<Bonmin::RegisteredOptions> roptions){
    116     roptions->SetRegisteringCategory("Fractional diving heuristic", RegisteredOptions::BonminCategory);
     116    roptions->SetRegisteringCategory("MINLP Heuristics", RegisteredOptions::BonminCategory);
    117117   roptions->AddStringOption2(
    118118     "heuristic_dive_fractional",
     
    122122     "yes", "runs the heuristic",
    123123     "");
     124   roptions->setOptionExtraInfo("heuristic_dive_fractional", 63);
    124125  }
    125126
  • trunk/Bonmin/src/CbcBonmin/Heuristics/BonHeuristicDiveMIPFractional.cpp

    r1348 r1548  
    114114  void
    115115  HeuristicDiveMIPFractional::registerOptions(Ipopt::SmartPtr<Bonmin::RegisteredOptions> roptions){
    116     roptions->SetRegisteringCategory("Fractional diving MIP heuristic", RegisteredOptions::BonminCategory);
     116    roptions->SetRegisteringCategory("MINLP heuristics", RegisteredOptions::BonminCategory);
    117117   roptions->AddStringOption2(
    118118     "heuristic_dive_MIP_fractional",
     
    122122     "yes", "runs the heuristic",
    123123     "");
     124   roptions->setOptionExtraInfo("heuristic_dive_MIP_fractional", 63);
    124125  }
    125126
  • trunk/Bonmin/src/CbcBonmin/Heuristics/BonHeuristicDiveMIPVectorLength.cpp

    r1371 r1548  
    165165  void
    166166  HeuristicDiveMIPVectorLength::registerOptions(Ipopt::SmartPtr<Bonmin::RegisteredOptions> roptions){
    167     roptions->SetRegisteringCategory("VectorLength diving MIP heuristic", RegisteredOptions::BonminCategory);
     167    roptions->SetRegisteringCategory("MINLP Heuristics", RegisteredOptions::BonminCategory);
    168168   roptions->AddStringOption2(
    169169     "heuristic_dive_MIP_vectorLength",
     
    173173     "yes", "runs the heuristic",
    174174     "");
     175   roptions->setOptionExtraInfo("heuristic_dive_MIP_vectorLength", 63);
    175176  }
    176177
  • trunk/Bonmin/src/CbcBonmin/Heuristics/BonHeuristicDiveVectorLength.cpp

    r1371 r1548  
    165165  void
    166166  HeuristicDiveVectorLength::registerOptions(Ipopt::SmartPtr<Bonmin::RegisteredOptions> roptions){
    167     roptions->SetRegisteringCategory("VectorLength diving heuristic", RegisteredOptions::BonminCategory);
     167    roptions->SetRegisteringCategory("MINLP Heuristics", RegisteredOptions::BonminCategory);
    168168   roptions->AddStringOption2(
    169169     "heuristic_dive_vectorLength",
     
    173173     "yes", "runs the heuristic",
    174174     "");
     175   roptions->setOptionExtraInfo("heuristic_dive_vectorLength", 63);
    175176  }
    176177
  • trunk/Bonmin/src/CbcBonmin/Heuristics/BonHeuristicFPump.cpp

    r1540 r1548  
    398398  void
    399399  HeuristicFPump::registerOptions(Ipopt::SmartPtr<Bonmin::RegisteredOptions> roptions){
    400     roptions->SetRegisteringCategory("Feasibility pump heuristic", RegisteredOptions::BonminCategory);
     400    roptions->SetRegisteringCategory("MINLP Heuristics", RegisteredOptions::BonminCategory);
    401401    roptions->AddBoundedIntegerOption("feasibility_pump_objective_norm","Norm of feasibility pump objective function",
    402402                                      1, 2, 1,"");
     403    roptions->setOptionExtraInfo("feasibility_pump_objective_norm", 63);
    403404    roptions->AddStringOption2("heuristic_feasibility_pump", "whether the heuristic feasibility pump should be used",
    404405      "no", "no", "don't use it", "yes", "use it", "");
     406    roptions->setOptionExtraInfo("heuristic_feasibility_pump", 63);
    405407  }
    406408
  • trunk/Bonmin/src/CbcBonmin/Heuristics/BonHeuristicLocalBranching.cpp

    r1404 r1548  
    121121  void
    122122  HeuristicLocalBranching::registerOptions(Ipopt::SmartPtr<Bonmin::RegisteredOptions> roptions){
    123    roptions->SetRegisteringCategory("Local search based heuristics", RegisteredOptions::BonminCategory);
     123   roptions->SetRegisteringCategory("MINLP Heuristics", RegisteredOptions::BonminCategory);
    124124   roptions->AddStringOption2(
    125125     "heuristic_local_branching",
     
    129129     "yes", "runs the heuristic",
    130130     "");
     131    roptions->setOptionExtraInfo("heuristic_local_branching", 63);
    131132  }
    132133
  • trunk/Bonmin/src/CbcBonmin/Heuristics/BonHeuristicRINS.cpp

    r1404 r1548  
    131131  void
    132132  HeuristicRINS::registerOptions(Ipopt::SmartPtr<Bonmin::RegisteredOptions> roptions){
    133    roptions->SetRegisteringCategory("Local search based heuristics", RegisteredOptions::BonminCategory);
     133   roptions->SetRegisteringCategory("MINLP Heuristics", RegisteredOptions::BonminCategory);
    134134   roptions->AddStringOption2(
    135135     "heuristic_RINS",
     
    139139     "yes", "runs the heuristic",
    140140     "");
     141    roptions->setOptionExtraInfo("heuristic_RINS", 63);
    141142  }
    142143
  • trunk/Bonmin/src/CbcBonmin/Heuristics/BonPumpForMinlp.cpp

    r1427 r1548  
    6161  void
    6262  PumpForMinlp::registerOptions(Ipopt::SmartPtr<Bonmin::RegisteredOptions> roptions){
    63    roptions->SetRegisteringCategory("Local search based heuristics", RegisteredOptions::BonminCategory);
     63   roptions->SetRegisteringCategory("MINLP Heuristics", RegisteredOptions::BonminCategory);
    6464   roptions->AddStringOption2(
    6565     "pump_for_minlp",
     
    6969     "yes", "runs the heuristic",
    7070     "");
     71    roptions->setOptionExtraInfo("pump_for_minlp", 63);
    7172  }
    7273
Note: See TracChangeset for help on using the changeset viewer.