Changeset 1365


Ignore:
Timestamp:
Apr 24, 2009 7:10:44 AM (11 years ago)
Author:
forrest
Message:

take out mini tree parameters

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r1353 r1365  
    858858      model.setNumberAnalyzeIterations(value);
    859859      break;
    860     case NUMBERMINI:
    861       oldValue=model.sizeMiniTree();
    862       model.setSizeMiniTree(value);
    863       break;
    864860    case CUTPASSINTREE:
    865861      oldValue=model.getMaximumCutPasses();
     
    912908  case NUMBERANALYZE:
    913909    value=model.numberAnalyzeIterations();
    914     break;
    915   case NUMBERMINI:
    916     value=model.sizeMiniTree();
    917910    break;
    918911  case CUTPASSINTREE:
     
    21612154     );
    21622155#ifdef COIN_HAS_CBC
    2163   parameters[numberParameters++]=
    2164     CbcOrClpParam("miniT!ree","Size of fast mini tree",
    2165                   0,COIN_INT_MAX,NUMBERMINI,false);
    2166   parameters[numberParameters-1].setLonghelp
    2167     (
    2168      "The idea is that I can do a small tree fast. \
    2169 This is a first try and will hopefully become more sophisticated."
    2170      );
    21712156  parameters[numberParameters++]=
    21722157    CbcOrClpParam("miplib","Do some of miplib test set",
  • trunk/Clp/src/CbcOrClpParam.hpp

    r1344 r1365  
    6464
    6565    STRONGBRANCHING=151,CUTDEPTH, MAXNODES,NUMBERBEFORE,NUMBERANALYZE,
    66     NUMBERMINI,MIPOPTIONS,MOREMIPOPTIONS,MAXHOTITS,FPUMPITS,MAXSOLS,
     66    MIPOPTIONS,MOREMIPOPTIONS,MAXHOTITS,FPUMPITS,MAXSOLS,
    6767    FPUMPTUNE,TESTOSI,EXTRA1,EXTRA2,EXTRA3,EXTRA4,CUTPASSINTREE,
    6868    THREADS,CUTPASS,VUBTRY,DENSE,EXPERIMENT,DIVEOPT,STRATEGY,SMALLFACT,
Note: See TracChangeset for help on using the changeset viewer.