Changeset 1506 for trunk

Timestamp:

Feb 2, 2010 5:48:50 AM (11 years ago)

Author:

forrest

Message:

changes for idiot code

Location:

trunk/Clp/src

Files:

• ClpSolve.cpp (modified) (3 diffs)
• Idiot.cpp (modified) (1 diff)

trunk/Clp/src/ClpSolve.cpp

@@ -1287 +1287 @@
 #else
         // Allow for crossover
+#define LACI_TRY
+#ifndef LACI_TRY
         //if (doIdiot>0)
           info.setStrategy(512|info.getStrategy());
+#endif
         // Allow for scaling
         info.setStrategy(32|info.getStrategy());
@@ -1328 +1331 @@
     }
 #endif
+#ifndef LACI_TRY
     if (options.getSpecialOption(1)!=2||
         options.getExtraInfo(1)<1000000) {
@@ -1347 +1351 @@
       }
     }
+#endif
     time2 = CoinCpuTime();
     timeCore = time2-timeX;

trunk/Clp/src/Idiot.cpp

@@ -1318 +1318 @@
     int * negSlack = posSlack+nrows;
     int * nextSlack = negSlack + nrows;
-#if 1
+    /* Laci - try both ways - to see what works -
+       you can change second part as much as you want */
+#ifndef LACI_TRY  // was #if 1
     // Array for sorting out slack values
     double * ratio = new double [ncols];