Changeset 452 for branches/devel/Cbc/src


Ignore:
Timestamp:
Oct 16, 2006 2:28:36 PM (13 years ago)
Author:
forrest
Message:

modify CoinSolve? so will solve all 44 with -miplib

Location:
branches/devel/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CoinSolve.cpp

    r449 r452  
    21312131                }
    21322132              }
     2133              if (type==MIPLIB) {
     2134                if (babModel->numberStrong()==5&&babModel->numberBeforeTrust()==5)
     2135                  babModel->setNumberBeforeTrust(50);
     2136              }
    21332137              // add cut generators if wanted
    21342138              int switches[20];
     
    25752579                }
    25762580                if (useStrategy) {
    2577                   CbcStrategyDefault strategy(true,5,5);
     2581                  CbcStrategyDefault strategy(true,babModel->numberStrong(),babModel->numberBeforeTrust());
    25782582                  strategy.setupPreProcessing(1);
    25792583                  babModel->setStrategy(strategy);
     
    25912595                checkSOS(babModel, babModel->solver());
    25922596              } else if (type==MIPLIB) {
    2593                 CbcStrategyDefault strategy(true,5,5);
     2597                CbcStrategyDefault strategy(true,babModel->numberStrong(),babModel->numberBeforeTrust());
    25942598                // Set up pre-processing
    25952599                int translate2[]={9999,1,1,3,2,4,5};
  • branches/devel/Cbc/src/unitTestClp.cpp

    r424 r452  
    20062006      }
    20072007      //std::cout<<"Largest (scaled) away from bound "<<largest<<std::endl;
    2008       modelC->setDualBound(CoinMin(1000.0*largest,1.00001e10));
     2008      modelC->setDualBound(CoinMax(1.0001e8,CoinMin(1000.0*largest,1.00001e10)));
    20092009    }
    20102010    model->setMinimumDrop(min(5.0e-2,
Note: See TracChangeset for help on using the changeset viewer.