Changeset 937 for trunk


Ignore:
Timestamp:
May 8, 2008 10:41:18 AM (12 years ago)
Author:
forrest
Message:

allow user more control over when cut generators called

File:
1 edited

Legend:

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

    r931 r937  
    59045904    int i;
    59055905    if ((threadMode_&2)==0||numberNodes_) {
    5906       int nGen = numberCutGenerators_;
    5907       if (node&&node->depth()>10&&(node->depth()&1)==0&&!fullScan)
    5908         nGen=0;
    59095906# ifdef COIN_HAS_CLP
    59105907      if (!node&&!parentModel_&& intParam_[CbcMaxNumNode] == -123456) {
     
    59165913      }
    59175914# endif
    5918       for (i = 0;i<nGen;i++) {
     5915      for (i = 0;i<numberCutGenerators_;i++) {
    59195916        int numberRowCutsBefore = theseCuts.sizeRowCuts() ;
    59205917        int numberColumnCutsBefore = theseCuts.sizeColCuts() ;
     
    59295926        if (generator_[i]->switchedOff())
    59305927          generate=false;;
     5928        if (node&&node->depth()>10&&(node->depth()&1)==0&&!fullScan) {
     5929          // switch off if default
     5930          if (generator_[i]->howOften()==1&&generator_[i]->whatDepth()<0)
     5931            generate=false;
     5932        }
    59315933        if (generate) {
    59325934          bool mustResolve =
Note: See TracChangeset for help on using the changeset viewer.