Ignore:
Timestamp:
Jun 13, 2010 9:08:03 AM (8 years ago)
Author:
stefan
Message:

make check for sample dir work without including ClpConfig?.h

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/examples/decomp3.cpp

    r1559 r1561  
    33// Corporation and others.  All Rights Reserved.
    44
    5 #include "ClpConfig.h"
    65#include "ClpSimplex.hpp"
    76#include "ClpPresolve.hpp"
     
    3231     //#define PRESOLVE
    3332#ifndef PRESOLVE
    34 #if defined(COIN_HAS_NETLIB) && defined(NETLIBDIR)
     33#if defined(NETLIBDIR)
    3534     CoinStructuredModel model((argc < 2) ? NETLIBDIR "/czprob.mps"
    3635                               : argv[1], decompose, maxBlocks);
     
    5857#else
    5958     ClpSimplex  model;
    60 #if defined(COIN_HAS_NETLIB) && defined(NETLIBDIR)
     59#if defined(NETLIBDIR)
    6160     int status = model.readMps((argc < 2) ? NETLIBDIR "/czprob.mps"
    6261                                : argv[1]);
     
    9392     return 0;
    9493     ClpSimplex solver2;
    95 #if defined(COIN_HAS_NETLIB) && defined(NETLIBDIR)
     94#if defined(NETLIBDIR)
    9695     solver2.readMps((argc < 2) ? NETLIBDIR "/czprob.mps" : argv[1]);
    9796#else
Note: See TracChangeset for help on using the changeset viewer.