Changeset 1907 for stable/1.14

Timestamp:

Jan 16, 2013 9:48:15 AM (7 years ago)

Author:

forrest

Message:

more options

Location:

stable/1.14/Clp/src

Files:

• CbcOrClpParam.cpp (modified) (22 diffs)
• CbcOrClpParam.hpp (modified) (2 diffs)

stable/1.14/Clp/src/CbcOrClpParam.cpp

@@ -50 +50 @@
 #define CBC_THREAD
 #endif
+#endif
+#if CLP_HAS_ABC
+#include "AbcCommon.hpp"
 #endif
 static bool doPrinting = true;
@@ -608 +611 @@
           case CLP_PARAM_INT_SPECIALOPTIONS:
                model->setSpecialOptions(value);
+               break;
           case CLP_PARAM_INT_RANDOMSEED:
             {
@@ -931 +935 @@
                break;
 #endif
-#endif
-#if defined(COIN_HAS_CBC) && ((CBC_VERSION_MAJOR > 2) || (CBC_VERSION_MINOR > 7))
+#ifdef CBC_AFTER_2_8
           case CBC_PARAM_INT_RANDOMSEED:
                oldValue = model.getRandomSeed();
                model.setRandomSeed(value);
                break;
-               
+#endif
 #endif
           default:
@@ -987 +990 @@
      case CBC_PARAM_INT_THREADS:
           value = model.getNumberThreads();
-          break;
-#endif
-#endif
-#if defined(COIN_HAS_CBC) && ((CBC_VERSION_MAJOR > 2) || (CBC_VERSION_MINOR > 7))
+#endif
+#ifdef CBC_AFTER_2_8
      case CBC_PARAM_INT_RANDOMSEED:
           value = model.getRandomSeed();
           break;
+#endif
 #endif
      default:
@@ -1131 +1133 @@
 #else
           if (CbcOrClpReadCommand == stdin) {
-               fprintf(stdout, coin_prompt);
+               fputs(coin_prompt,stdout);
                fflush(stdout);
           }
@@ -1356 +1358 @@
           CbcOrClpParam("-", "From stdin",
                         CLP_PARAM_ACTION_STDIN, 3, 0);
+#ifdef ABC_INHERIT
+      parameters[numberParameters++] =
+          CbcOrClpParam("abc", "Whether to visit Aboca",
+                        "off", CLP_PARAM_STR_ABCWANTED, 7, 0);
+     parameters[numberParameters-1].append("one");
+     parameters[numberParameters-1].append("two");
+     parameters[numberParameters-1].append("three");
+     parameters[numberParameters-1].append("four");
+     parameters[numberParameters-1].append("five");
+     parameters[numberParameters-1].append("six");
+     parameters[numberParameters-1].append("seven");
+     parameters[numberParameters-1].append("eight");
+     parameters[numberParameters-1].append("on");
+     parameters[numberParameters-1].append("decide");
+     parameters[numberParameters-1].setLonghelp
+     (
+          "Decide whether to use A Basic Optimization Code (Accelerated?) \
+and whether to try going parallel!"
+     );
+#endif
      parameters[numberParameters++] =
           CbcOrClpParam("allC!ommands", "Whether to print less used commands",
@@ -1602 +1624 @@
      parameters[numberParameters-1].append("so!low_halim");
      parameters[numberParameters-1].append("lots");
-     //  parameters[numberParameters-1].append("4");
-     //  parameters[numberParameters-1].append("5");
+#ifdef ABC_INHERIT
+     parameters[numberParameters-1].append("dual");
+     parameters[numberParameters-1].append("dw");
+     parameters[numberParameters-1].append("idiot");
+#endif
      parameters[numberParameters-1].setLonghelp
      (
@@ -1972 +1997 @@
 #ifdef COIN_HAS_CBC
      parameters[numberParameters++] =
-          CbcOrClpParam("exp!eriment", "Whether to use testing features",
+          CbcOrClpParam("exper!iment", "Whether to use testing features",
                         -1, 200, CBC_PARAM_INT_EXPERIMENT, 0);
      parameters[numberParameters-1].setLonghelp
@@ -1980 +2005 @@
      );
      parameters[numberParameters-1].setIntValue(0);
+#ifdef CBC_AFTER_2_8
+     parameters[numberParameters++] =
+          CbcOrClpParam("expensive!Strong", "Whether to do even more strong branching",
+                        0, COIN_INT_MAX, CBC_PARAM_INT_STRONG_STRATEGY, 0);
+     parameters[numberParameters-1].setLonghelp
+     (
+      "Strategy for extra strong branching \n\
+\t0 - normal\n\
+\twhen to do all fractional\n\
+\t1 - root node\n\
+\t2 - depth less than modifier\n\
+\t4 - if objective == best possible\n\
+\t6 - as 2+4\n\
+\twhen to do all including satisfied\n\
+\t10 - root node etc.\n\
+\tIf >=100 then do when depth <= strategy/100 (otherwise 5)"
+     );
+     parameters[numberParameters-1].setIntValue(0);
+#endif
 #endif
      parameters[numberParameters++] =
@@ -2029 +2073 @@
      parameters[numberParameters-1].setLonghelp
      (
+#ifndef ABC_INHERIT
           "The default is to use the normal CoinFactorization, but \
 other choices are a dense one, osl's or one designed for small problems."
+#else
+          "Normally the default is to use the normal CoinFactorization, but \
+other choices are a dense one, osl's or one designed for small problems. \
+However if at Aboca then the default is CoinAbcFactorization and other choices are \
+a dense one, one designed for small problems or if enabled a long factorization."
+#endif
      );
      parameters[numberParameters++] =
@@ -2433 +2484 @@
  you intend to override the behavior of a particular message.  This only affects Clp not Cbc."
      );
+     parameters[numberParameters++] =
+          CbcOrClpParam("miplib", "Do some of miplib test set",
+                        CBC_PARAM_ACTION_MIPLIB, 3, 1);
 #ifdef COIN_HAS_CBC
       parameters[numberParameters++] =
@@ -2444 +2498 @@
 text file format used is the same of the solutions saved by CBC, but \
 not all fields are required to be filled. First line may contain the \
-solution status and will be ignored, remaning lines contain column \
+solution status and will be ignored, remaining lines contain column \
 indexes, names and values as in this example:\n\
 \n\
@@ -2462 +2516 @@
 user provides one. Feasibility Pump (FP) is a heuristic which tries to \
 overcome the problem of taking too long to find feasible solution (or \
-not finding at all), but it not always suceeds. If you provide one \
+not finding at all), but it not always succeeds. If you provide one \
 starting solution you will probably save some time by disabling FP. \
 \n\n\
@@ -2494 +2548 @@
      );
      parameters[numberParameters-1].setIntValue(0);
-     parameters[numberParameters++] =
-          CbcOrClpParam("miplib", "Do some of miplib test set",
-                        CBC_PARAM_ACTION_MIPLIB, 3, 1);
 #ifdef CBC_AFTER_2_8
      parameters[numberParameters++] =
@@ -2509 +2560 @@
 then it is number of threads to use (otherwise uses threads setting) and \
 cc is number of times to do root phase.  Yet another one from the Italian idea factory \
-(Andrea Lodi , Matteo Fischetti , Michele Monaci , Domenico Salvagnin , and Andrea Tramontani3)"
+(This time - Andrea Lodi , Matteo Fischetti , Michele Monaci , Domenico Salvagnin , \
+and Andrea Tramontani)"
      );
 #endif
@@ -2885 +2937 @@
      parameters[numberParameters-1].append("rhs!ranging");
      parameters[numberParameters-1].append("objective!ranging");
+     parameters[numberParameters-1].append("stats");
      parameters[numberParameters-1].setLonghelp
      (
@@ -2936 +2989 @@
 but strong options do more probing"
      );
-#if (CBC_VERSION_MAJOR > 2) || (CBC_VERSION_MINOR > 7)
      parameters[numberParameters++] =
           CbcOrClpParam("proximity!Search", "Whether to do proximity search heuristic",
@@ -2953 +3005 @@
 The ones at end have different maxNode settings (and are 'on'(on==30))."
      );
-#endif
      parameters[numberParameters++] =
           CbcOrClpParam("pumpC!utoff", "Fake cutoff for use in feasibility pump",
@@ -2997 +3048 @@
      );
 #ifdef COIN_HAS_CBC
+#ifdef CBC_AFTER_2_8
      parameters[numberParameters++] =
           CbcOrClpParam("randomC!bcSeed", "Random seed for Cbc",
@@ -3006 +3058 @@
      );
      parameters[numberParameters-1].setIntValue(-1);
-     parameters[numberParameters++] =
-          CbcOrClpParam("rand!omizedRounding", "Whether to try randomized rounding heuristic",
+#endif
+     parameters[numberParameters++] =
+          CbcOrClpParam("randomi!zedRounding", "Whether to try randomized rounding heuristic",
                         "off", CBC_PARAM_STR_RANDROUND);
      parameters[numberParameters-1].append("on");
@@ -3275 +3328 @@
      );
 #else
-     // allow solve as synonym for dual
-     parameters[numberParameters++] =
-          CbcOrClpParam("solv!e", "Solve problem using dual simplex",
-                        CBC_PARAM_ACTION_BAB);
+     // allow solve as synonym for possible dual
+     parameters[numberParameters++] =
+       CbcOrClpParam("solv!e", "Solve problem using dual simplex (probably)",
+                        CLP_PARAM_ACTION_EITHERSIMPLEX);
      parameters[numberParameters-1].setLonghelp
      (
@@ -3347 +3400 @@
      parameters[numberParameters++] =
           CbcOrClpParam("strong!Branching", "Number of variables to look at in strong branching",
-                        0, 999999, CBC_PARAM_INT_STRONGBRANCHING);
+                        0, COIN_INT_MAX, CBC_PARAM_INT_STRONGBRANCHING);
      parameters[numberParameters-1].setLonghelp
      (

stable/1.14/Clp/src/CbcOrClpParam.hpp

@@ -139 +139 @@
      CBC_PARAM_INT_RANDOMSEED,
      CBC_PARAM_INT_MULTIPLEROOTS,
+     CBC_PARAM_INT_STRONG_STRATEGY,
 
      CLP_PARAM_STR_DIRECTION = 201,
@@ -164 +165 @@
      CLP_PARAM_STR_ALLCOMMANDS,
      CLP_PARAM_STR_TIME_MODE,
+     CLP_PARAM_STR_ABCWANTED,
 
      CBC_PARAM_STR_NODESTRATEGY = 251,