Changeset 2349


Ignore:
Timestamp:
Nov 20, 2017 11:19:40 AM (10 months ago)
Author:
forrest
Message:

put back tolerance a bit earlier and fix minor bug in mipstart

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcMipStartIO.cpp

    r2163 r2349  
    2424
    2525   for ( size_t i=0 ; i<l ; ++i )
    26      if (!(isdigit(str[i])||(str[i]=='.')||(str[i]=='-')||(str[i]=='e')))
     26     if (!(isdigit(str[i])||(str[i]=='.')||
     27           (str[i]=='-')||(str[i]=='+')||(str[i]=='e')))
    2728         return false;
    2829
  • trunk/Cbc/src/CbcModel.cpp

    r2347 r2349  
    1278812788#endif
    1278912789                double largestInfeasibility = 0.0;
     12790#ifdef COIN_HAS_CLP
     12791                if (clpContinuousSolver) {
     12792                  ClpSimplex * clp = clpContinuousSolver->getModelPtr();
     12793                  if ((modifiedTolerances&1)!=0)
     12794                    clp->setPrimalTolerance(savePrimalTolerance);
     12795                  assert (savePrimalTolerance);
     12796                }
     12797#endif
    1279012798                double primalTolerance ;
    1279112799                solver_->getDblParam(OsiPrimalTolerance, primalTolerance) ;
Note: See TracChangeset for help on using the changeset viewer.