Changeset 1933 for stable

Timestamp:

Apr 6, 2013 4:59:58 PM (7 years ago)

Author:

stefan

Message:

sync with trunk rev1932

Location:

stable/1.15/Clp

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/CbcOrClpParam.cpp (modified) (7 diffs)
• src/OsiClp (modified) (1 prop)

stable/1.15/Clp/src/CbcOrClpParam.cpp

@@ -13 +13 @@
 
 #ifdef COIN_HAS_CBC
-#if CBC_VERSION_MAJOR==2
-#if CBC_VERSION_MINOR>9
-#define CBC_AFTER_2_9
-#endif
-#else
-#define CBC_AFTER_2_9
-#endif
 #ifdef COIN_HAS_CLP
 #include "OsiClpSolverInterface.hpp"
@@ -1572 +1565 @@
 See Rounding for meaning of on,both,before"
      );
-#ifdef CBC_AFTER_2_9
-      parameters[numberParameters++] =
+     parameters[numberParameters++] =
           CbcOrClpParam("constraint!fromCutoff", "Whether to use cutoff as constraint",
                         "off", CBC_PARAM_STR_CUTOFF_CONSTRAINT);
@@ -1581 +1573 @@
           "This adds the objective as a constraint with best solution as RHS"
      );
-#endif
      parameters[numberParameters++] =
           CbcOrClpParam("cost!Strategy", "How to use costs as priorities",
@@ -2405 +2396 @@
 The length options for gomory cuts are used."
      );
-#ifdef CBC_AFTER_2_9
-      parameters[numberParameters++] =
+     parameters[numberParameters++] =
           CbcOrClpParam("latwomir!Cuts", "Whether to use Lagrangean TwoMir cuts",
                         "off", CBC_PARAM_STR_LATWOMIRCUTS);
@@ -2426 +2416 @@
 lagomoryCuts for description of options."
      );
-#endif
      parameters[numberParameters++] =
           CbcOrClpParam("lift!AndProjectCuts", "Whether to use Lift and Project cuts",
@@ -3378 +3367 @@
      );
 #ifdef COIN_HAS_CBC
-#ifdef CBC_AFTER_2_9
      parameters[numberParameters++] =
           CbcOrClpParam("slow!cutpasses", "Maximum number of tries for slower cuts",
@@ -3387 +3375 @@
      );
      parameters[numberParameters-1].setIntValue(10);
-#endif
 #endif
 #ifdef COIN_HAS_CLP