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

    r1574 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
     9#include "CoinPragma.hpp"
    1410
    1511// For Branch and bound
     
    3834#include "CbcHeuristic.hpp"
    3935
    40 #include  "CoinTime.hpp"
     36#include "CoinTime.hpp"
    4137
    4238//#############################################################################
     
    7470  if (argc>=2) mpsFileName = argv[1];
    7571  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    76   assert(numMpsReadErrors==0);
     72  if( numMpsReadErrors != 0 )
     73  {
     74     printf("%d errors reading MPS file\n", numMpsReadErrors);
     75     return numMpsReadErrors;
     76  }
    7777  double time1 = CoinCpuTime();
    7878
Note: See TracChangeset for help on using the changeset viewer.