Ignore:
Timestamp:
Sep 11, 2008 11:54:47 AM (11 years ago)
Author:
forrest
Message:

back closer to 2.2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpPresolve.cpp

    r1266 r1270  
    441441    const bool doubleton = doDoubleton();
    442442    const bool tripleton = doTripleton();
    443 #define NO_FORCING
     443    //#define NO_FORCING
    444444#ifndef NO_FORCING
    445445    const bool forcing = doForcing();
     
    506506      const CoinPresolveAction * const paction0 = paction_;
    507507      // look for substitutions with no fill
     508      //#define IMPLIED 3
     509#ifdef IMPLIED
    508510      int fill_level=3;
    509 #define IMPLIED 3
    510511#define IMPLIED2 99
    511512#if IMPLIED!=3
     
    518519      printf("** fill_level == %d !\n",fill_level);
    519520#endif
     521#endif
     522#else
     523      int fill_level=2;
    520524#endif
    521525      int whichPass=0;
     
    665669          const CoinPresolveAction * const paction2 = paction_;
    666670          if (ifree) {
     671#ifdef IMPLIED
    667672#if IMPLIED2 ==0
    668673            int fill_level=0; // switches off substitution
    669674#elif IMPLIED2!=99
    670675            int fill_level=IMPLIED2;
     676#endif
    671677#endif
    672678            if ((itry&1)==0)
     
    680686      } else if (ifree) {
    681687        // just free
     688#ifdef IMPLIED
    682689#if IMPLIED2 ==0
    683690        int fill_level=0; // switches off substitution
    684691#elif IMPLIED2!=99
    685692        int fill_level=IMPLIED2;
     693#endif
    686694#endif
    687695        paction_ = implied_free_action::presolve(prob, paction_,fill_level);
Note: See TracChangeset for help on using the changeset viewer.