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

Remove CPX_KEEP_RESULT. Use CBC_OTHER_SOLVER = 1.

File:
1 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
Note: See TracChangeset for help on using the changeset viewer.