Ignore:
Timestamp:
Sep 4, 2008 4:48:22 PM (12 years ago)
Author:
forrest
Message:

trying to make go faster

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcCutGenerator.cpp

    r1016 r1053  
    168168CbcCutGenerator::generateCuts( OsiCuts & cs , int fullScan, OsiSolverInterface * solver, CbcNode * node)
    169169{
    170 #define PROBE1 0
     170#define PROBE1 1
    171171#define PROBE2 0
    172 #define PROBE3 0
     172#define PROBE3 1
    173173  int depth;
    174174  if (node)
     
    256256#if PROBE3
    257257        if ((numberTimes_==200||(numberTimes_>200&&(numberTimes_%2000)==0))
    258              &&!model_->parentModel()) {
     258             &&!model_->parentModel()&&info.formulation_rows>500) {
    259259          // in tree, maxStack, maxProbe
    260260          int test[]= {
     
    272272          int saveStack = generator->getMaxLook();
    273273          int saveNumber = generator->getMaxProbe();
     274#undef CLP_INVESTIGATE
    274275#ifdef CLP_INVESTIGATE
    275276          int kr1=0;
     
    315316#ifdef CLP_INVESTIGATE
    316317            printf("RRSwitching off number %d -> %d, stack %d -> %d\n",
    317                    saveNumber,saveNumber,saveStack,1);
     318                   saveNumber,saveNumber,saveStack,0);
    318319#endif
    319320          }
     
    512513      const double * solution = solver->getColSolution();
    513514      bool feasible=true;
     515      double primalTolerance = 1.0e-7;
    514516      for (k = numberRowCutsAfter-1;k>=numberRowCutsBefore;k--) {
    515517        const OsiRowCut * thisCut = cs.rowCutPtr(k) ;
     
    529531            sum += value*solution[column[i]];
    530532          }
    531           if (sum>thisCut->ub()) {
     533          if (sum>thisCut->ub()+primalTolerance) {
    532534            sum= sum-thisCut->ub();
    533           } else if (sum<thisCut->lb()) {
     535          } else if (sum<thisCut->lb()-primalTolerance) {
    534536            sum= thisCut->lb()-sum;
    535537          } else {
     
    608610        // Now see which ones are too similar
    609611        int nParallel=0;
     612        double testValue = (depth>1) ? 0.99 : 0.999999;
    610613        for (k = 0;k<nCuts;k++) {
    611614          int j=which[k];
     
    626629          }
    627630          int kkk = CoinMin(nCuts,k+5);
    628           double testValue = (depth>1) ? 0.9 : 0.99999;
    629631          for (int kk=k+1;kk<kkk;kk++) {
    630632            int jj=which[kk];
Note: See TracChangeset for help on using the changeset viewer.