Changeset 1440 for trunk/Clp


Ignore:
Timestamp:
Sep 29, 2009 1:53:05 PM (10 years ago)
Author:
forrest
Message:

add pivot and complement

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r1429 r1440  
    25202520#ifdef COIN_HAS_CBC
    25212521  parameters[numberParameters++]=
    2522       CbcOrClpParam("pivot!AndFix","Whether to try Pivot and Fix heuristic",
     2522      CbcOrClpParam("pivotAndC!omplement","Whether to try Pivot and Complement heuristic",
     2523                    "off",PIVOTANDCOMPLEMENT);
     2524  parameters[numberParameters-1].append("on");
     2525  parameters[numberParameters-1].append("both");
     2526  parameters[numberParameters-1].append("before");
     2527  parameters[numberParameters-1].setLonghelp
     2528    (
     2529     "stuff needed. \
     2530Doh option does heuristic before preprocessing"     );
     2531  parameters[numberParameters++]=
     2532      CbcOrClpParam("pivotAndF!ix","Whether to try Pivot and Fix heuristic",
    25232533                    "off",PIVOTANDFIX);
    25242534  parameters[numberParameters-1].append("on");
  • trunk/Clp/src/CbcOrClpParam.hpp

    r1429 r1440  
    8585    LANDPCUTS,RINS,RESIDCUTS,RENS,DIVINGS,DIVINGC,DIVINGF,DIVINGG,DIVINGL,
    8686    DIVINGP,DIVINGV,DINS,PIVOTANDFIX,RANDROUND,NAIVE,ZEROHALFCUTS,CPX,
    87     CROSSOVER2,
     87    CROSSOVER2,PIVOTANDCOMPLEMENT,
    8888   
    8989    DIRECTORY=301,DIRSAMPLE,DIRNETLIB,DIRMIPLIB,IMPORT,EXPORT,RESTORE,SAVE,DUALSIMPLEX,PRIMALSIMPLEX,EITHERSIMPLEX,
Note: See TracChangeset for help on using the changeset viewer.