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/fast0507b.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 "CbcConfig.h"
    127
     
    149#include <iomanip>
    1510
     11#include "CoinPragma.hpp"
    1612
    1713// For Branch and bound
     
    3935#include "CglPreProcess.hpp"
    4036
    41 #include  "CoinTime.hpp"
     37#include "CoinTime.hpp"
    4238
    4339//#############################################################################
     
    8379  if (argc>=2) mpsFileName = argv[1];
    8480  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    85   assert(numMpsReadErrors==0);
     81  if( numMpsReadErrors != 0 )
     82  {
     83     printf("%d errors reading MPS file\n", numMpsReadErrors);
     84     return numMpsReadErrors;
     85  }
    8686  double time1 = CoinCpuTime();
    8787  /* Options are:
Note: See TracChangeset for help on using the changeset viewer.