Changeset 1209 for trunk/Clp


Ignore:
Timestamp:
Jun 3, 2008 9:18:35 AM (12 years ago)
Author:
forrest
Message:

new parameters

Location:
trunk/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/CbcOrClpParam.cpp

    r1206 r1209  
    15691569  parameters[numberParameters++]=
    15701570      CbcOrClpParam("DivingS!ome","Whether to try Diving heuristics",
    1571                     "off",DIVINGA);
    1572   parameters[numberParameters-1].append("V");
    1573   parameters[numberParameters-1].append("G");
    1574   parameters[numberParameters-1].append("GV");
    1575   parameters[numberParameters-1].append("F");
    1576   parameters[numberParameters-1].append("FV");
    1577   parameters[numberParameters-1].append("FG");
    1578   parameters[numberParameters-1].append("FGV");
    1579   parameters[numberParameters-1].append("C");
    1580   parameters[numberParameters-1].append("CV");
    1581   parameters[numberParameters-1].append("CG");
    1582   parameters[numberParameters-1].append("CGV");
    1583   parameters[numberParameters-1].append("CF");
    1584   parameters[numberParameters-1].append("CFV");
    1585   parameters[numberParameters-1].append("CFG");
    1586   parameters[numberParameters-1].append("on");
    1587   parameters[numberParameters-1].setLonghelp
    1588     (
    1589      "This switches on various diving heuristics. \
    1590 C - Coefficient, F - Fractional, G - Guided, V - VectorLength. \
    1591 You may prefer to use individual on/off which has divingC,F,G and V \
    1592 and also divingL and P"
     1571                    "off",DIVINGS);
     1572  parameters[numberParameters-1].append("on");
     1573  parameters[numberParameters-1].setLonghelp
     1574    (
     1575     "This switches on a random diving heuristic at various times. \
     1576C - Coefficient, F - Fractional, G - Guided, L - LineSearch, P - PseudoCost, V - VectorLength. \
     1577You may prefer to use individual on/off"
    15931578     );
    15941579  parameters[numberParameters++]=
     
    25472532    parameters[numberParameters-1].append("200");
    25482533    parameters[numberParameters-1].append("1000");
     2534    parameters[numberParameters-1].append("10000");
    25492535  parameters[numberParameters-1].setLonghelp
    25502536    (
  • trunk/Clp/src/CbcOrClpParam.hpp

    r1206 r1209  
    7979    ROUNDING,SOLVER,CLIQUECUTS,COSTSTRATEGY,FLOWCUTS,MIXEDCUTS,
    8080    TWOMIRCUTS,PREPROCESS,FPUMP,GREEDY,COMBINE,LOCALTREE,SOS,
    81     LANDPCUTS,RINS,RESIDCUTS,RENS,DIVINGA,DIVINGC,DIVINGF,DIVINGG,DIVINGL,
     81    LANDPCUTS,RINS,RESIDCUTS,RENS,DIVINGS,DIVINGC,DIVINGF,DIVINGG,DIVINGL,
    8282    DIVINGP,DIVINGV,
    8383   
Note: See TracChangeset for help on using the changeset viewer.