Changeset 1304 for trunk/Clp


Ignore:
Timestamp:
Nov 6, 2008 4:46:53 PM (11 years ago)
Author:
forrest
Message:

add keyword for naive heuristic

Location:
trunk/Clp/src
Files:
3 edited

Legend:

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

    r1286 r1304  
    21082108    CbcOrClpParam("miplib","Do some of miplib test set",
    21092109                  MIPLIB,3);
     2110  parameters[numberParameters++]=
     2111      CbcOrClpParam("naive!Heuristics","Whether to try some stupid heuristic",
     2112                    "off",NAIVE);
     2113  parameters[numberParameters-1].append("on");
     2114  parameters[numberParameters-1].append("do");
     2115  parameters[numberParameters-1].setLonghelp
     2116    (
     2117     "Really silly stuff e.g. fix all integers with costs to zero!."
     2118     );
    21102119#endif
    21112120#ifdef COIN_HAS_CLP
  • trunk/Clp/src/CbcOrClpParam.hpp

    r1284 r1304  
    8080    TWOMIRCUTS,PREPROCESS,FPUMP,GREEDY,COMBINE,LOCALTREE,SOS,
    8181    LANDPCUTS,RINS,RESIDCUTS,RENS,DIVINGS,DIVINGC,DIVINGF,DIVINGG,DIVINGL,
    82     DIVINGP,DIVINGV,DINS,PIVOTANDFIX,RANDROUND,
     82    DIVINGP,DIVINGV,DINS,PIVOTANDFIX,RANDROUND,NAIVE,
    8383   
    8484    DIRECTORY=301,DIRSAMPLE,DIRNETLIB,DIRMIPLIB,IMPORT,EXPORT,RESTORE,SAVE,DUALSIMPLEX,PRIMALSIMPLEX,EITHERSIMPLEX,
  • trunk/Clp/src/ClpSimplex.cpp

    r1295 r1304  
    56745674  if (!problemStatus_) {
    56755675    //assert (!numberPrimalInfeasibilities_);
     5676    //if (returnCode!=10)
    56765677    //assert (!numberDualInfeasibilities_);
    56775678  }
Note: See TracChangeset for help on using the changeset viewer.