Changeset 1933 for stable


Ignore:
Timestamp:
Apr 6, 2013 4:59:58 PM (7 years ago)
Author:
stefan
Message:

sync with trunk rev1932

Location:
stable/1.15/Clp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp

  • stable/1.15/Clp/src

  • stable/1.15/Clp/src/CbcOrClpParam.cpp

    r1928 r1933  
    1313
    1414#ifdef COIN_HAS_CBC
    15 #if CBC_VERSION_MAJOR==2
    16 #if CBC_VERSION_MINOR>9
    17 #define CBC_AFTER_2_9
    18 #endif
    19 #else
    20 #define CBC_AFTER_2_9
    21 #endif
    2215#ifdef COIN_HAS_CLP
    2316#include "OsiClpSolverInterface.hpp"
     
    15721565See Rounding for meaning of on,both,before"
    15731566     );
    1574 #ifdef CBC_AFTER_2_9
    1575       parameters[numberParameters++] =
     1567     parameters[numberParameters++] =
    15761568          CbcOrClpParam("constraint!fromCutoff", "Whether to use cutoff as constraint",
    15771569                        "off", CBC_PARAM_STR_CUTOFF_CONSTRAINT);
     
    15811573          "This adds the objective as a constraint with best solution as RHS"
    15821574     );
    1583 #endif
    15841575     parameters[numberParameters++] =
    15851576          CbcOrClpParam("cost!Strategy", "How to use costs as priorities",
     
    24052396The length options for gomory cuts are used."
    24062397     );
    2407 #ifdef CBC_AFTER_2_9
    2408       parameters[numberParameters++] =
     2398     parameters[numberParameters++] =
    24092399          CbcOrClpParam("latwomir!Cuts", "Whether to use Lagrangean TwoMir cuts",
    24102400                        "off", CBC_PARAM_STR_LATWOMIRCUTS);
     
    24262416lagomoryCuts for description of options."
    24272417     );
    2428 #endif
    24292418     parameters[numberParameters++] =
    24302419          CbcOrClpParam("lift!AndProjectCuts", "Whether to use Lift and Project cuts",
     
    33783367     );
    33793368#ifdef COIN_HAS_CBC
    3380 #ifdef CBC_AFTER_2_9
    33813369     parameters[numberParameters++] =
    33823370          CbcOrClpParam("slow!cutpasses", "Maximum number of tries for slower cuts",
     
    33873375     );
    33883376     parameters[numberParameters-1].setIntValue(10);
    3389 #endif
    33903377#endif
    33913378#ifdef COIN_HAS_CLP
  • stable/1.15/Clp/src/OsiClp

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.