Changeset 1144


Ignore:
Timestamp:
Dec 20, 2007 7:19:09 AM (12 years ago)
Author:
forrest
Message:

change meaning of useSolution

Location:
stable/1.6/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.6/Clp/src/CbcOrClpParam.cpp

    r1115 r1144  
    16371637    parameters[numberParameters++]=
    16381638      CbcOrClpParam("force!Solution","Whether to use given solution as crash for BAB",
    1639                     "off",USESOLUTION);
    1640     parameters[numberParameters-1].append("on");
    1641   parameters[numberParameters-1].setLonghelp
    1642     (
    1643      "If on then tries to branch to solution given by AMPL or priorities file."
     1639                    -1,20000000,USESOLUTION);
     1640    parameters[numberParameters-1].setIntValue(-1);
     1641    parameters[numberParameters-1].setLonghelp
     1642    (
     1643     "-1 off.  If 0 then tries to branch to solution given by AMPL or priorities file. \
     1644If >0 then also does that many nodes on fixed problem."
    16441645     );
    16451646#endif
     
    16621663  parameters[numberParameters-1].append("ifmove");
    16631664  parameters[numberParameters-1].append("forceOn");
     1665  parameters[numberParameters-1].append("forceLongOn");
    16641666  parameters[numberParameters-1].setLonghelp
    16651667    (
     
    16671669fashionable as LP solvers are more robust and they interact well with other cuts.  They will almost always \
    16681670give cuts (although in this executable they are limited as to number of variables in cut).  \
    1669 However the cuts may be dense so it is worth experimenting. \
     1671However the cuts may be dense so it is worth experimenting (Long allows any length). \
    16701672See branchAndCut for information on options."
    16711673     );
     
    20432045  parameters[numberParameters++]=
    20442046    CbcOrClpParam("passC!uts","Number of cut passes at root node",
    2045                   -999999,999999,CUTPASS);
     2047                  -9999999,9999999,CUTPASS);
    20462048  parameters[numberParameters-1].setLonghelp
    20472049    (
     
    22712273  parameters[numberParameters-1].append("forceOnStrong");
    22722274  parameters[numberParameters-1].append("forceOnButStrong");
     2275  parameters[numberParameters-1].append("strongRoot");
    22732276  parameters[numberParameters-1].setLonghelp
    22742277    (
     
    23792382#ifdef COIN_HAS_CBC
    23802383  parameters[numberParameters++]=
     2384      CbcOrClpParam("Rens","Whether to try Relaxation Enforced Neighborhood Search",
     2385                    "off",RENS);
     2386    parameters[numberParameters-1].append("on");
     2387    parameters[numberParameters-1].append("200");
     2388    parameters[numberParameters-1].append("1000");
     2389  parameters[numberParameters-1].setLonghelp
     2390    (
     2391     "This switches on Relaxation enforced neighborhood Search. \
     2392on just does feasibility pump \
     2393200 or 1000 does that many nodes."
     2394     );
     2395  parameters[numberParameters++]=
    23812396      CbcOrClpParam("Rins","Whether to try Relaxed Induced Neighborhood Search",
    23822397                    "off",RINS);
    23832398    parameters[numberParameters-1].append("on");
     2399    parameters[numberParameters-1].append("often");
    23842400  parameters[numberParameters-1].setLonghelp
    23852401    (
     
    26182634  parameters[numberParameters++]=
    26192635    CbcOrClpParam("trust!PseudoCosts","Number of branches before we trust pseudocosts",
    2620                   -1,2000000,NUMBERBEFORE);
     2636                  -3,2000000,NUMBERBEFORE);
    26212637  parameters[numberParameters-1].setLonghelp
    26222638    (
  • stable/1.6/Clp/src/CbcOrClpParam.hpp

    r1088 r1144  
    6161    MAXFACTOR,PERTVALUE,MAXITERATION,PRESOLVEPASS,IDIOT,SPRINT,
    6262    OUTPUTFORMAT,SLPVALUE,PRESOLVEOPTIONS,PRINTOPTIONS,SPECIALOPTIONS,
    63     SUBSTITUTION,DUALIZE,VERBOSE,CPP,PROCESSTUNE,
     63    SUBSTITUTION,DUALIZE,VERBOSE,CPP,PROCESSTUNE,USESOLUTION,
    6464
    6565    STRONGBRANCHING=151,CUTDEPTH, MAXNODES,NUMBERBEFORE,NUMBERANALYZE,
     
    7878    GOMORYCUTS,PROBINGCUTS,KNAPSACKCUTS,REDSPLITCUTS,
    7979    ROUNDING,SOLVER,CLIQUECUTS,COSTSTRATEGY,FLOWCUTS,MIXEDCUTS,
    80     TWOMIRCUTS,PREPROCESS,FPUMP,GREEDY,COMBINE,LOCALTREE,USESOLUTION,SOS,
    81     LANDPCUTS,RINS,RESIDCUTS,
     80    TWOMIRCUTS,PREPROCESS,FPUMP,GREEDY,COMBINE,LOCALTREE,SOS,
     81    LANDPCUTS,RINS,RESIDCUTS,RENS,
    8282   
    8383    DIRECTORY=301,DIRSAMPLE,DIRNETLIB,DIRMIPLIB,IMPORT,EXPORT,RESTORE,SAVE,DUALSIMPLEX,PRIMALSIMPLEX,EITHERSIMPLEX,
Note: See TracChangeset for help on using the changeset viewer.