Ignore:
Timestamp:
Apr 10, 2013 12:58:16 PM (6 years ago)
Author:
stefan
Message:

sync with trunk rev 1901

Location:
stable/2.8/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/examples/driver.cpp

    r1574 r1902  
    33// Corporation and others.  All Rights Reserved.
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    5 
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    105
    116#include <cassert>
     
    149
    1510// For Branch and bound
     11#include "CoinPragma.hpp"
    1612#include "CbcModel.hpp"
    1713#include "CbcStrategy.hpp"
     
    2016#include "CglPreProcess.hpp"
    2117
    22 #include  "CoinTime.hpp"
     18#include "CoinTime.hpp"
    2319
    2420//#############################################################################
     
    5046  if (argc>=2) mpsFileName = argv[1];
    5147  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    52   assert(numMpsReadErrors==0);
     48  if( numMpsReadErrors != 0 )
     49  {
     50     printf("%d errors reading MPS file\n", numMpsReadErrors);
     51     return numMpsReadErrors;
     52  }
    5353  double time1 = CoinCpuTime();
    5454
Note: See TracChangeset for help on using the changeset viewer.