Changeset 2115 for trunk/Clp/src/ClpSimplexDual.cpp

Timestamp:

Feb 10, 2015 7:15:50 AM (5 years ago)

Author:

forrest

Message:

make more threadsafe

Location:

trunk/Clp/src

Files:

• . (modified) (1 prop)
• ClpSimplexDual.cpp (modified) (3 diffs)

trunk/Clp/src/ClpSimplexDual.cpp

@@ -135 +135 @@
 #define NDEBUG_CLP
 #endif
-extern double minimumPrimalToleranceZZ;
-#define CLP_INFEAS_SAVE 5
-extern double averageInfeasZZ[CLP_INFEAS_SAVE];
 // dual
 
@@ -604 +601 @@
      if (alphaAccuracy_ != -1.0)
           alphaAccuracy_ = 1.0;
-     minimumPrimalToleranceZZ=primalTolerance();
+     minimumPrimalTolerance_=primalTolerance();
      int returnCode = startupSolve(ifValuesPass, saveDuals, startFinishOptions);
      // Save so can see if doing after primal
@@ -4356 +4353 @@
 #endif
          primalTolerance_=1.0e-6;
-         minimumPrimalToleranceZZ=primalTolerance_;
+         minimumPrimalTolerance_=primalTolerance_;
          dblParam_[ClpPrimalTolerance]=1.0e-6;
          moreSpecialOptions_ |= 4194304;