Ignore:
Timestamp:
May 12, 2006 2:30:07 PM (14 years ago)
Author:
andreasw
Message:

finished (for now) conversion of Cbc to autotools

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        22Data/Netlib   https://www.coin-or.org/svn/Data/trunk/Netlib
        33Data/Sample   https://www.coin-or.org/svn/Data/trunk/Sample
         4Data/miplib3  https://www.coin-or.org/svn/Data/trunk/miplib3
        45CoinBase      https://www.coin-or.org/svn/CoinBase/trunk/CoinBase
        56Cgl           https://www.coin-or.org/svn/Cgl/trunk/Cgl
  • trunk/Cbc/src/unitTest.cpp

    r311 r312  
    22// Corporation and others.  All Rights Reserved.
    33// Test individual classes or groups of classes
     4
     5#include "CbcConfig.hpp"
    46
    57#if defined(_MSC_VER)
     
    1618#include "CoinHelperFunctions.hpp"
    1719
    18 #ifdef CBC_USE_CBC
     20#ifdef COIN_HAS_CBC
    1921#include "OsiCbcSolverInterface.hpp"
    2022#endif
    21 #ifdef CBC_USE_OSL
     23#ifdef COIN_HAS_OSL
    2224#include "OsiOslSolverInterface.hpp"
    2325#endif
    24 #ifdef CBC_USE_SPX
     26#ifdef COIN_HAS_SPX
    2527#include "OsiSpxSolverInterface.hpp"
    2628#endif
    27 #ifdef CBC_USE_DYLP
     29#ifdef COIN_HAS_DYLP
    2830#include "OsiDylpSolverInterface.hpp"
    2931#endif
    30 #ifdef CBC_USE_GLPK
     32#ifdef COIN_HAS_GLPK
    3133#include "OsiGlpkSolverInterface.hpp"
    3234#endif
    33 #ifdef CBC_USE_CLP
     35#ifdef COIN_HAS_CLP
    3436#include "OsiClpSolverInterface.hpp"
    3537#endif
     
    4244void testingMessage( const char * const msg );
    4345
    44 #ifdef CBC_USE_CBC
     46#ifdef COIN_HAS_CBC
    4547void CbcMiplibTest (const std::vector<OsiCbcSolverInterface*> & vecEmptySiP,
    4648                    const std::string & mpsDir)
     
    300302  }
    301303}
    302 #endif  // CBC_USE_CBC
     304#endif  // COIN_HAS_CBC
    303305
    304306//----------------------------------------------------------------
     
    361363  else
    362364    miplibDir = dirsep == '/' ? "./Samples/miplib3/" : ".\\Samples\\miplib3\\";
    363 #ifdef CBC_USE_CBC
     365#ifdef COIN_HAS_CBC
    364366
    365367  {
     
    367369    std::vector<OsiCbcSolverInterface*> vecSi;
    368370    CbcStrategyDefault strategy(false);
    369 #   if CBC_USE_OSL
     371#   if COIN_HAS_OSL
    370372    OsiSolverInterface * oslSi = new OsiOslSolverInterface;
    371373    vecSi.push_back(new OsiCbcSolverInterface(oslSi,&strategy));
    372374#endif
    373 #   if CBC_USE_SPX
     375#   if COIN_HAS_SPX
    374376    OsiSolverInterface * spxSi = new OsiSpxSolverInterface;
    375377    vecSi.push_back(new OsiCbcSolverInterface(spxSi,&strategy));
    376378#endif
    377 #   if CBC_USE_CLP
     379#   if COIN_HAS_CLP
    378380    OsiSolverInterface *clpSi = new OsiClpSolverInterface ;
    379381    /* Quiet, already! */
     
    381383    vecSi.push_back(new OsiCbcSolverInterface(clpSi,&strategy));
    382384#endif
    383 #   if CBC_USE_DYLP
     385#   if COIN_HAS_DYLP
    384386    OsiSolverInterface * dylpSi = new OsiDylpSolverInterface;
    385387    vecSi.push_back(new OsiCbcSolverInterface(dylpSi,&strategy));
    386388#endif
    387 #   if CBC_USE_GLPK
     389#   if COIN_HAS_GLPK
    388390    OsiSolverInterface * glpkSi = new OsiGlpkSolverInterface;
    389391    vecSi.push_back(new OsiCbcSolverInterface(glpkSi,&strategy));
     
    397399      delete vecSi[i];
    398400  }
    399 #else   // CBC_USE_CBC
     401#else   // COIN_HAS_CBC
    400402  std::cerr
    401403    << "cbc has been built without OsiCbc support. To enable the -miplib\n"
     
    403405    << "execute the command `make clean cbc' to rebuild the cbc program."
    404406    << std::endl ;
    405 #endif  // CBC_USE_CBC
     407#endif  // COIN_HAS_CBC
    406408  testingMessage( "All tests completed successfully\n" );
    407409  return 0;
Note: See TracChangeset for help on using the changeset viewer.