Changeset 1270

Timestamp:

Sep 11, 2008 11:54:47 AM (12 years ago)

Author:

forrest

Message:

back closer to 2.2

File:

• trunk/Clp/src/ClpPresolve.cpp (modified) (5 diffs)

trunk/Clp/src/ClpPresolve.cpp

@@ -441 +441 @@
     const bool doubleton = doDoubleton();
     const bool tripleton = doTripleton();
-#define NO_FORCING
+    //#define NO_FORCING
 #ifndef NO_FORCING
     const bool forcing = doForcing();
@@ -506 +506 @@
       const CoinPresolveAction * const paction0 = paction_;
       // look for substitutions with no fill
+      //#define IMPLIED 3
+#ifdef IMPLIED
       int fill_level=3;
-#define IMPLIED 3
 #define IMPLIED2 99
 #if IMPLIED!=3
@@ -518 +519 @@
       printf("** fill_level == %d !\n",fill_level);
 #endif
+#endif
+#else
+      int fill_level=2;
 #endif
       int whichPass=0;
@@ -665 +669 @@
           const CoinPresolveAction * const paction2 = paction_;
           if (ifree) {
+#ifdef IMPLIED
 #if IMPLIED2 ==0
             int fill_level=0; // switches off substitution
 #elif IMPLIED2!=99
             int fill_level=IMPLIED2;
+#endif
 #endif
             if ((itry&1)==0)
@@ -680 +686 @@
       } else if (ifree) {
         // just free
+#ifdef IMPLIED
 #if IMPLIED2 ==0
         int fill_level=0; // switches off substitution
 #elif IMPLIED2!=99
         int fill_level=IMPLIED2;
+#endif
 #endif
         paction_ = implied_free_action::presolve(prob, paction_,fill_level);