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/repeat.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
     
    3935#include "CbcHeuristic.hpp"
    4036
    41 #include  "CoinTime.hpp"
     37#include "CoinTime.hpp"
    4238
    4339//#############################################################################
     
    7975  if (argc>=2) mpsFileName = argv[1];
    8076  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    81   assert(numMpsReadErrors==0);
     77  if( numMpsReadErrors != 0 )
     78  {
     79     printf("%d errors reading MPS file\n", numMpsReadErrors);
     80     return numMpsReadErrors;
     81  }
    8282  double time1 = CoinCpuTime();
    8383
     
    301301    OsiSolverInterface * refSolver = model.referenceSolver();
    302302    const double * bestSolution = model.bestSolution();
     303#ifndef NDEBUG
    303304    const double * originalLower = refSolver->getColLower();
    304305    const double * originalUpper = refSolver->getColUpper();
     306#endif
    305307    CoinPackedVector cut;
    306308    double rhs = 1.0;
Note: See TracChangeset for help on using the changeset viewer.