Changeset 1517 for trunk/Clp

Timestamp:

Feb 13, 2010 5:14:44 AM (11 years ago)

Author:

forrest

Message:

fix odd behavior on crossover from idiot

Location:

trunk/Clp/src

Files:

• ClpSimplexPrimal.cpp (modified) (1 diff)
• ClpSolve.cpp (modified) (1 diff)

trunk/Clp/src/ClpSimplexPrimal.cpp

@@ -1262 +1262 @@
       if (perturbation_==101) {
         goToDual=unPerturb(); // stop any further perturbation
-        if (numberRows_>20000&&!numberTimesOptimal_)
+        if ((numberRows_>20000||numberDualInfeasibilities_)&&!numberTimesOptimal_)
           goToDual=false; // Better to carry on a bit longer
         lastCleaned=-1; // carry on

trunk/Clp/src/ClpSolve.cpp

@@ -1287 +1287 @@
 #else
         // Allow for crossover
-#define LACI_TRY
+        //#define LACI_TRY
 #ifndef LACI_TRY
         //if (doIdiot>0)