- Timestamp:
- Apr 6, 2013 4:59:58 PM (7 years ago)
- Location:
- stable/1.15/Clp
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/1.15/Clp
- Property svn:mergeinfo changed
/trunk/Clp merged: 1932
- Property svn:mergeinfo changed
-
stable/1.15/Clp/src
- Property svn:mergeinfo changed
/trunk/Clp/src merged: 1932
- Property svn:mergeinfo changed
-
stable/1.15/Clp/src/CbcOrClpParam.cpp
r1928 r1933 13 13 14 14 #ifdef COIN_HAS_CBC 15 #if CBC_VERSION_MAJOR==216 #if CBC_VERSION_MINOR>917 #define CBC_AFTER_2_918 #endif19 #else20 #define CBC_AFTER_2_921 #endif22 15 #ifdef COIN_HAS_CLP 23 16 #include "OsiClpSolverInterface.hpp" … … 1572 1565 See Rounding for meaning of on,both,before" 1573 1566 ); 1574 #ifdef CBC_AFTER_2_9 1575 parameters[numberParameters++] = 1567 parameters[numberParameters++] = 1576 1568 CbcOrClpParam("constraint!fromCutoff", "Whether to use cutoff as constraint", 1577 1569 "off", CBC_PARAM_STR_CUTOFF_CONSTRAINT); … … 1581 1573 "This adds the objective as a constraint with best solution as RHS" 1582 1574 ); 1583 #endif1584 1575 parameters[numberParameters++] = 1585 1576 CbcOrClpParam("cost!Strategy", "How to use costs as priorities", … … 2405 2396 The length options for gomory cuts are used." 2406 2397 ); 2407 #ifdef CBC_AFTER_2_9 2408 parameters[numberParameters++] = 2398 parameters[numberParameters++] = 2409 2399 CbcOrClpParam("latwomir!Cuts", "Whether to use Lagrangean TwoMir cuts", 2410 2400 "off", CBC_PARAM_STR_LATWOMIRCUTS); … … 2426 2416 lagomoryCuts for description of options." 2427 2417 ); 2428 #endif2429 2418 parameters[numberParameters++] = 2430 2419 CbcOrClpParam("lift!AndProjectCuts", "Whether to use Lift and Project cuts", … … 3378 3367 ); 3379 3368 #ifdef COIN_HAS_CBC 3380 #ifdef CBC_AFTER_2_93381 3369 parameters[numberParameters++] = 3382 3370 CbcOrClpParam("slow!cutpasses", "Maximum number of tries for slower cuts", … … 3387 3375 ); 3388 3376 parameters[numberParameters-1].setIntValue(10); 3389 #endif3390 3377 #endif 3391 3378 #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.