Changeset 1270
- Timestamp:
- Sep 11, 2008 11:54:47 AM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/src/ClpPresolve.cpp
r1266 r1270 441 441 const bool doubleton = doDoubleton(); 442 442 const bool tripleton = doTripleton(); 443 #define NO_FORCING443 //#define NO_FORCING 444 444 #ifndef NO_FORCING 445 445 const bool forcing = doForcing(); … … 506 506 const CoinPresolveAction * const paction0 = paction_; 507 507 // look for substitutions with no fill 508 //#define IMPLIED 3 509 #ifdef IMPLIED 508 510 int fill_level=3; 509 #define IMPLIED 3510 511 #define IMPLIED2 99 511 512 #if IMPLIED!=3 … … 518 519 printf("** fill_level == %d !\n",fill_level); 519 520 #endif 521 #endif 522 #else 523 int fill_level=2; 520 524 #endif 521 525 int whichPass=0; … … 665 669 const CoinPresolveAction * const paction2 = paction_; 666 670 if (ifree) { 671 #ifdef IMPLIED 667 672 #if IMPLIED2 ==0 668 673 int fill_level=0; // switches off substitution 669 674 #elif IMPLIED2!=99 670 675 int fill_level=IMPLIED2; 676 #endif 671 677 #endif 672 678 if ((itry&1)==0) … … 680 686 } else if (ifree) { 681 687 // just free 688 #ifdef IMPLIED 682 689 #if IMPLIED2 ==0 683 690 int fill_level=0; // switches off substitution 684 691 #elif IMPLIED2!=99 685 692 int fill_level=IMPLIED2; 693 #endif 686 694 #endif 687 695 paction_ = implied_free_action::presolve(prob, paction_,fill_level);
Note: See TracChangeset
for help on using the changeset viewer.