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/driver4.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#include "CbcModel.hpp"
    1612#include "OsiClpSolverInterface.hpp"
    1713#include "CbcSolver.hpp"
    1814
    19 #include  "CoinTime.hpp"
     15#include "CoinTime.hpp"
    2016
    2117//#############################################################################
     
    221217  if (argc>=2) mpsFileName = argv[1];
    222218  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    223   assert(numMpsReadErrors==0);
     219  if( numMpsReadErrors != 0 )
     220  {
     221     printf("%d errors reading MPS file\n", numMpsReadErrors);
     222     return numMpsReadErrors;
     223  }
    224224  // Tell solver to return fast if presolve or initial solve infeasible
    225225  solver1.getModelPtr()->setMoreSpecialOptions(3);
Note: See TracChangeset for help on using the changeset viewer.