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/crew.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
    14 
     9#include "CoinPragma.hpp"
    1510// For Branch and bound
    1611#include "OsiClpSolverInterface.hpp"
     
    1914#include "CbcCompareUser.hpp"
    2015
    21 #include  "CoinTime.hpp"
     16#include "CoinTime.hpp"
    2217
    2318/************************************************************************
     
    4944  if (argc>=2) mpsFileName = argv[1];
    5045  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    51   assert(numMpsReadErrors==0);
     46  if( numMpsReadErrors != 0 )
     47  {
     48     printf("%d errors reading MPS file\n", numMpsReadErrors);
     49     return numMpsReadErrors;
     50  }
    5251  double time1 = CoinCpuTime();
    5352
     
    6059  // Point to solver
    6160  OsiSolverInterface * solver3 = model.solver();
    62   OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver3);
    63   assert (osiclp);
     61  assert (dynamic_cast< OsiClpSolverInterface*> (solver3));
    6462
    6563  // Definition of node choice
Note: See TracChangeset for help on using the changeset viewer.