Ignore:
Timestamp:
May 28, 2008 7:02:06 AM (12 years ago)
Author:
forrest
Message:

new diving and fix ClpSimplex? bug

File:
1 edited

Legend:

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

    r1199 r1206  
    15681568  parameters[numberParameters-1].setIntValue(-1);
    15691569  parameters[numberParameters++]=
    1570       CbcOrClpParam("Diving","Whether to try Diving heuristics",
    1571                     "off",DIVING);
     1570      CbcOrClpParam("DivingS!ome","Whether to try Diving heuristics",
     1571                    "off",DIVINGA);
    15721572  parameters[numberParameters-1].append("V");
    15731573  parameters[numberParameters-1].append("G");
     
    15881588    (
    15891589     "This switches on various diving heuristics. \
    1590 C - Coefficient, F - Fractional, G - Guided, V - VectorLength."
    1591      );
     1590C - Coefficient, F - Fractional, G - Guided, V - VectorLength. \
     1591You may prefer to use individual on/off which has divingC,F,G and V \
     1592and also divingL and P"
     1593     );
     1594  parameters[numberParameters++]=
     1595      CbcOrClpParam("DivingC!oefficient","Whether to try DiveCoefficient",
     1596                    "off",DIVINGC);
     1597  parameters[numberParameters-1].append("on");
     1598  parameters[numberParameters++]=
     1599      CbcOrClpParam("DivingF!ractional","Whether to try DiveFractional",
     1600                    "off",DIVINGF);
     1601  parameters[numberParameters-1].append("on");
     1602  parameters[numberParameters++]=
     1603      CbcOrClpParam("DivingG!uided","Whether to try DiveGuided",
     1604                    "off",DIVINGG);
     1605  parameters[numberParameters-1].append("on");
     1606  parameters[numberParameters++]=
     1607      CbcOrClpParam("DivingL!ineSearch","Whether to try DiveLineSearch",
     1608                    "off",DIVINGL);
     1609  parameters[numberParameters-1].append("on");
     1610  parameters[numberParameters++]=
     1611      CbcOrClpParam("DivingP!seudoCost","Whether to try DivePseudoCost",
     1612                    "off",DIVINGP);
     1613  parameters[numberParameters-1].append("on");
     1614  parameters[numberParameters++]=
     1615      CbcOrClpParam("DivingV!ectorLength","Whether to try DiveVectorLength",
     1616                    "off",DIVINGV);
     1617  parameters[numberParameters-1].append("on");
    15921618  parameters[numberParameters++]=
    15931619    CbcOrClpParam("doH!euristic","Do heuristics before any preprocessing",
Note: See TracChangeset for help on using the changeset viewer.