Changeset 1242 for trunk/Clp/src


Ignore:
Timestamp:
Jul 17, 2008 5:52:35 PM (12 years ago)
Author:
forrest
Message:

add DINS

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r1228 r1242  
    15031503                  -COIN_DBL_MAX,COIN_DBL_MAX,DEXTRA4,false);
    15041504  parameters[numberParameters-1].setDoubleValue(0.0);
     1505  parameters[numberParameters++]=
     1506      CbcOrClpParam("Dins","Whether to try Distance Induced Neighborhood Search",
     1507                    "off",DINS);
     1508    parameters[numberParameters-1].append("on");
     1509    parameters[numberParameters-1].append("often");
     1510  parameters[numberParameters-1].setLonghelp
     1511    (
     1512     "This switches on Distance induced neighborhood Search."
     1513     );
    15051514#endif
    15061515  parameters[numberParameters++]=
     
    17091718  parameters[numberParameters-1].setLonghelp
    17101719    (
    1711      "If >0 then use some dubious scheme (for testing)"
    1712      );
    1713   parameters[numberParameters-1].setIntValue(-1);
     1720     "Defines how adventurous you want to be in using new ideas. \
     17210 then no new ideas, 1 fairly sensible, 2 a bit dubious, 3 you are on your own!"
     1722     );
     1723  parameters[numberParameters-1].setIntValue(0);
    17141724#endif
    17151725  parameters[numberParameters++]=
     
    17251735  parameters[numberParameters++]=
    17261736    CbcOrClpParam("extra1","Extra integer parameter 1",
    1727                   -100,COIN_INT_MAX,EXTRA1,false);
     1737                  -COIN_INT_MAX,COIN_INT_MAX,EXTRA1,false);
    17281738  parameters[numberParameters-1].setIntValue(-1);
    17291739  parameters[numberParameters++]=
    17301740    CbcOrClpParam("extra2","Extra integer parameter 2",
    1731                   -1,COIN_INT_MAX,EXTRA2,false);
     1741                  -100,COIN_INT_MAX,EXTRA2,false);
    17321742  parameters[numberParameters-1].setIntValue(-1);
    17331743  parameters[numberParameters++]=
     
    17851795     "-1 off.  If 1 then tries to branch to solution given by AMPL or priorities file. \
    17861796If 0 then just tries to set as best solution \
    1787 If >0 then also does that many nodes on fixed problem."
     1797If 1 then also does that many nodes on fixed problem."
    17881798     );
    17891799#endif
  • trunk/Clp/src/CbcOrClpParam.hpp

    r1209 r1242  
    8080    TWOMIRCUTS,PREPROCESS,FPUMP,GREEDY,COMBINE,LOCALTREE,SOS,
    8181    LANDPCUTS,RINS,RESIDCUTS,RENS,DIVINGS,DIVINGC,DIVINGF,DIVINGG,DIVINGL,
    82     DIVINGP,DIVINGV,
     82    DIVINGP,DIVINGV,DINS,
    8383   
    8484    DIRECTORY=301,DIRSAMPLE,DIRNETLIB,DIRMIPLIB,IMPORT,EXPORT,RESTORE,SAVE,DUALSIMPLEX,PRIMALSIMPLEX,EITHERSIMPLEX,
Note: See TracChangeset for help on using the changeset viewer.