Changeset 2340


Ignore:
Timestamp:
Jul 12, 2017 4:39:11 AM (15 months ago)
Author:
forrest
Message:

set info in CglTreeInfo?

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

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

    r2151 r2340  
    281281        info.formulation_rows = model_->numberRowsAtContinuous();
    282282        info.inTree = node != NULL;
     283        info.childModel = model_->parentModel() ? 1 : 0;
     284        info.originalColumns = model_->originalColumns();
    283285        info.randomNumberGenerator = randomNumberGenerator;
    284286        info.options = (globalCutsAtRoot()) ? 8 : 0;
     
    318320                info2->formulation_rows = model_->numberRowsAtContinuous();
    319321                info2->inTree = node != NULL;
     322                info2->childModel = model_->parentModel() ? 1 : 0;
     323                info2->originalColumns = model_->originalColumns();
    320324                info2->randomNumberGenerator = randomNumberGenerator;
    321325                generator->generateCutsAndModify(*solver, cs, info2);
  • trunk/Cbc/src/CbcModel.cpp

    r2332 r2340  
    40274027              info.formulation_rows = solver_->getNumRows();
    40284028              info.inTree = false;
     4029              info.childModel=parentModel_ ? 1 : 0;
     4030              info.originalColumns=originalColumns();
    40294031              info.randomNumberGenerator=&randomGenerator;
    40304032              info.pass=4;
Note: See TracChangeset for help on using the changeset viewer.