Ignore:
Timestamp:
Mar 16, 2009 6:30:25 AM (11 years ago)
Author:
forrest
Message:

chnages to try and make faster

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CoinSolve.cpp

    r931 r1132  
    77#include "CbcOrClpParam.hpp"
    88#include "OsiClpSolverInterface.hpp"
     9#ifdef CPX_KEEP_RESULTS
     10#define CBC_OTHER_SOLVER 1
     11#endif
     12#if CBC_OTHER_SOLVER==1
     13#include "OsiCpxSolverInterface.hpp"
     14#endif
    915
    1016#include <cassert>
     
    2531#endif
    2632#endif
     33#ifdef CBC_OTHER_SOLVER
     34#undef NEW_STYLE_SOLVER
     35#define NEW_STYLE_SOLVER 0
     36#endif
    2737#if NEW_STYLE_SOLVER==0
    2838  // define TEST_MESSAGE_HANDLER to check works on all messages
     
    206216int main (int argc, const char *argv[])
    207217{
     218#ifndef CBC_OTHER_SOLVER
    208219  OsiClpSolverInterface solver1;
     220#elif CBC_OTHER_SOLVER==1
     221  OsiCpxSolverInterface solver1;
     222#endif
    209223  CbcModel model(solver1);
    210224  // define TEST_MESSAGE_HANDLER at top of file to check works on all messages
Note: See TracChangeset for help on using the changeset viewer.