Ignore:
Timestamp:
Apr 10, 2013 12:58:16 PM (6 years ago)
Author:
stefan
Message:

sync with trunk rev 1901

Location:
stable/2.8/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/src/CbcModel.cpp

    r1888 r1902  
    62656265    maximumDepthActual_ = 0;
    62666266    numberDJFixed_ = 0.0;
    6267     delete probingInfo_;
    6268     probingInfo_ = NULL;
     6267    if (probingInfo_) {
     6268      delete probingInfo_;
     6269      probingInfo_ = NULL;
     6270      if (!generator_)
     6271        numberCutGenerators_=0;
     6272      // also get rid of cut generator
     6273      int n=0;
     6274      for (int i = 0; i < numberCutGenerators_; i++) {
     6275        CglImplication * cutGen;
     6276        cutGen = dynamic_cast<CglImplication *>(generator_[i]->generator());
     6277        if (!cutGen) {
     6278          generator_[n]=generator_[i];
     6279          virginGenerator_[n]=virginGenerator_[i];
     6280          n++;
     6281        } else {
     6282          cutGen->setProbingInfo(NULL);
     6283          delete generator_[i];
     6284          cutGen = dynamic_cast<CglImplication *>(virginGenerator_[i]->generator());
     6285          assert (cutGen);
     6286          cutGen->setProbingInfo(NULL);
     6287          delete virginGenerator_[i];
     6288        }
     6289      }
     6290      numberCutGenerators_=n;
     6291    }
    62696292    maximumStatistics_ = 0;
    62706293    delete [] analyzeResults_;
     
    1631116334    }
    1631216335}
     16336#else
     16337CbcModel::goToDantzig(int numberNodes, ClpDualRowPivot *& savePivotMethod)
     16338{
     16339   printf("Need Clp to go to Dantzig\n");
     16340   abort();
     16341}
    1631316342#endif
    1631416343// Below this is deprecated or at least fairly deprecated
Note: See TracChangeset for help on using the changeset viewer.