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/allCuts.cpp

    r1854 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
    149
     10#include "CoinPragma.hpp"
    1511// For Branch and bound
    1612#include "OsiSolverInterface.hpp"
     
    4238#include "CbcHeuristic.hpp"
    4339
    44 #include  "CoinTime.hpp"
     40#include "CoinTime.hpp"
    4541// Need stored cuts
    4642
     
    254250  if (argc>=2) mpsFileName = argv[1];
    255251  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    256   assert(numMpsReadErrors==0);
     252  if( numMpsReadErrors != 0 )
     253  {
     254     printf("%d errors reading MPS file\n", numMpsReadErrors);
     255     return numMpsReadErrors;
     256  }
    257257  double time1 = CoinCpuTime();
    258258  OsiClpSolverInterface solverSave = solver1;
Note: See TracChangeset for help on using the changeset viewer.