Changeset 2349
- Timestamp:
- Nov 20, 2017 11:19:40 AM (3 years ago)
- Location:
- trunk/Cbc/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/src/CbcMipStartIO.cpp
r2163 r2349 24 24 25 25 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'))) 27 28 return false; 28 29 -
trunk/Cbc/src/CbcModel.cpp
r2347 r2349 12788 12788 #endif 12789 12789 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 12790 12798 double primalTolerance ; 12791 12799 solver_->getDblParam(OsiPrimalTolerance, primalTolerance) ;
Note: See TracChangeset
for help on using the changeset viewer.