Changeset 2349

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:

• CbcMipStartIO.cpp (modified) (1 diff)
• CbcModel.cpp (modified) (1 diff)

trunk/Cbc/src/CbcMipStartIO.cpp

@@ -24 +24 @@
 
    for ( size_t i=0 ; i<l ; ++i )
-     if (!(isdigit(str[i])||(str[i]=='.')||(str[i]=='-')||(str[i]=='e')))
+     if (!(isdigit(str[i])||(str[i]=='.')||
+           (str[i]=='-')||(str[i]=='+')||(str[i]=='e')))
          return false;
 

trunk/Cbc/src/CbcModel.cpp

@@ -12788 +12788 @@
 #endif
                 double largestInfeasibility = 0.0;
+#ifdef COIN_HAS_CLP
+                if (clpContinuousSolver) {
+                  ClpSimplex * clp = clpContinuousSolver->getModelPtr();
+                  if ((modifiedTolerances&1)!=0)
+                    clp->setPrimalTolerance(savePrimalTolerance);
+                  assert (savePrimalTolerance);
+                }
+#endif
                 double primalTolerance ;
                 solver_->getDblParam(OsiPrimalTolerance, primalTolerance) ;