Changeset 2013


Ignore:
Timestamp:
Jul 3, 2012 12:55:32 PM (7 years ago)
Author:
stefan
Message:

merge r2012 from stable/1.6: minor fixes to options docu

Location:
trunk/Bonmin
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin

  • trunk/Bonmin/src

  • trunk/Bonmin/src/Algorithms/BonBonminSetup.cpp

    r2006 r2013  
    193193
    194194    roptions->AddLowerBoundedIntegerOption("Gomory_cuts",
    195         "Frequency k (in terms of nodes) for generating Gomory cuts in branch-and-cut.",
     195        "Frequency (in terms of nodes) for generating Gomory cuts in branch-and-cut.",
    196196        -100,-5,
    197197        "If $k > 0$, cuts are generated every $k$ nodes, if $-99 < k < 0$ cuts are generated every $-k$ nodes but "
  • trunk/Bonmin/src/Algorithms/BonSubMipSolver.cpp

    r1985 r2013  
    558558        "Cbc_D","Coin Branch and Cut with its default",
    559559        "Cbc_Par", "Coin Branch and Cut with passed parameters",
    560         "Cplex","Ilog Cplex",
     560        "Cplex","IBM Cplex",
    561561        " To use Cplex, a valid license is required and you should have compiled OsiCpx in COIN-OR  (see Osi documentation).");
    562562    roptions->setOptionExtraInfo("milp_solver",64);
Note: See TracChangeset for help on using the changeset viewer.