Changeset 1365 for trunk

Timestamp:

Apr 24, 2009 7:10:44 AM (12 years ago)

Author:

forrest

Message:

take out mini tree parameters

Location:

trunk/Clp/src

Files:

• CbcOrClpParam.cpp (modified) (3 diffs)
• CbcOrClpParam.hpp (modified) (1 diff)

trunk/Clp/src/CbcOrClpParam.cpp

@@ -858 +858 @@
       model.setNumberAnalyzeIterations(value);
       break;
-    case NUMBERMINI:
-      oldValue=model.sizeMiniTree();
-      model.setSizeMiniTree(value);
-      break;
     case CUTPASSINTREE:
       oldValue=model.getMaximumCutPasses();
@@ -912 +908 @@
   case NUMBERANALYZE:
     value=model.numberAnalyzeIterations();
-    break;
-  case NUMBERMINI:
-    value=model.sizeMiniTree();
     break;
   case CUTPASSINTREE:
@@ -2161 +2154 @@
      );
 #ifdef COIN_HAS_CBC
-  parameters[numberParameters++]=
-    CbcOrClpParam("miniT!ree","Size of fast mini tree",
-                  0,COIN_INT_MAX,NUMBERMINI,false);
-  parameters[numberParameters-1].setLonghelp
-    (
-     "The idea is that I can do a small tree fast. \
-This is a first try and will hopefully become more sophisticated."
-     ); 
   parameters[numberParameters++]=
     CbcOrClpParam("miplib","Do some of miplib test set",

trunk/Clp/src/CbcOrClpParam.hpp

@@ -64 +64 @@
 
     STRONGBRANCHING=151,CUTDEPTH, MAXNODES,NUMBERBEFORE,NUMBERANALYZE,
-    NUMBERMINI,MIPOPTIONS,MOREMIPOPTIONS,MAXHOTITS,FPUMPITS,MAXSOLS,
+    MIPOPTIONS,MOREMIPOPTIONS,MAXHOTITS,FPUMPITS,MAXSOLS,
     FPUMPTUNE,TESTOSI,EXTRA1,EXTRA2,EXTRA3,EXTRA4,CUTPASSINTREE,
     THREADS,CUTPASS,VUBTRY,DENSE,EXPERIMENT,DIVEOPT,STRATEGY,SMALLFACT,