Changeset 1390


Ignore:
Timestamp:
Dec 10, 2009 10:22:06 AM (9 years ago)
Author:
lou
Message:

Remove CPX_KEEP_RESULT. Use CBC_OTHER_SOLVER = 1.

Location:
branches/sandbox/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/sandbox/Cbc/src/CbcSolver.cpp

    r1386 r1390  
    738738
    739739/*
    740   The only other solver that's ever been used is cplex, and the use is very
     740  The only other solver that's ever been used is cplex, and the use is
    741741  limited -- do the root with clp and all the cbc smarts, then give the
    742742  problem over to cplex to finish. Although the defines can be read in some
     
    747747*/
    748748
    749 #ifdef CPX_KEEP_RESULTS
    750 #define CBC_OTHER_SOLVER 1
    751 #endif
    752 
    753 #ifdef COIN_HAS_CPX
    754 #include "OsiCpxSolverInterface.hpp"
    755 #endif
    756 
    757 #ifdef CBC_OTHER_SOLVER
    758749#if CBC_OTHER_SOLVER==1
    759 #include "OsiCpxSolverInterface.hpp"
    760 #endif
     750#  ifndef COIN_HAS_CPX
     751#    error "Configuration did not detect cplex installation."
     752#  else
     753#    include "OsiCpxSolverInterface.hpp"
     754#  endif
    761755#endif
    762756
  • branches/sandbox/Cbc/src/CoinSolve.cpp

    r1387 r1390  
    1616  We have the following compile-time symbols.
    1717
    18   NEW_STYLE_SOLVER      CoinSolve.cpp, CbcSolver.cpp
    19 
    20     Unclear what this does just yet. A value of 0 seems to be `old style
    21     solver'.
    22 
    23 
    2418  CBC_OTHER_SOLVER      CoinSolve.cpp, CbcSolver.[cpp,hpp], CbcModel.cpp
    2519
    26     Usage in CbcSolver.hpp says `other solver' is Cplex (only).
    27 
    28     Here in CoinSolver, CBC_OTHER_SOLVER dominates NEW_STYLE_SOLVER.
     20    A value of 1 says `cplex'. Other values not defined. The intent with
     21    cplex is to apply all of cbc's smarts at the root, then hand the problem
     22    over to cplex to finish. Cplex is not used as an alternate lp solver
     23    under cbc control.
    2924
    3025    Usage in CbcModel is a fake; a small bit of code that's now `#if 0'.
    31 
    32 
    33   CPX_KEEP_RESULTS      CoinSolve.cpp, CbcSolver.cpp
    34 
    35     Unclear what this does just yet. The name seems clear, but how / what is
    36     affected is not. Defining this symbol forces CBC_OTHER_SOLVER.
    3726
    3827
     
    5645
    5746
    58 /*
    59   Allow (force?) use of cplex for something.
    60 */
    61 
    62 #ifdef CPX_KEEP_RESULTS
    63 #define CBC_OTHER_SOLVER 1
    64 #endif
    65 #if CBC_OTHER_SOLVER==1
    66 #include "OsiCpxSolverInterface.hpp"
     47#if CBC_OTHER_SOLVER == 1
     48#  ifndef COIN_HAS_CPX
     49#    error "Configuration did not detect cplex installation."
     50#  else
     51#    include "OsiCpxSolverInterface.hpp"
     52#  endif
    6753#endif
    6854
Note: See TracChangeset for help on using the changeset viewer.