Ignore:
Timestamp:
Jul 13, 2017 5:53:53 AM (3 years ago)
Author:
forrest
Message:

more information into CglTreeInfo? info

File:
1 edited

Legend:

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

    r2340 r2341  
    281281        info.formulation_rows = model_->numberRowsAtContinuous();
    282282        info.inTree = node != NULL;
    283         info.childModel = model_->parentModel() ? 1 : 0;
     283        if (model_->parentModel()) {
     284          info.parentSolver=model_->parentModel()->continuousSolver();
     285          // indicate if doing full search
     286          info.hasParent = ((model_->specialOptions()&67108864)==0) ? 1 : 2;
     287        } else {
     288          info.hasParent=0;
     289          info.parentSolver=NULL;
     290        }
    284291        info.originalColumns = model_->originalColumns();
    285292        info.randomNumberGenerator = randomNumberGenerator;
     
    320327                info2->formulation_rows = model_->numberRowsAtContinuous();
    321328                info2->inTree = node != NULL;
    322                 info2->childModel = model_->parentModel() ? 1 : 0;
     329                if (model_->parentModel()) {
     330                  info2->parentSolver=model_->parentModel()->continuousSolver();
     331                  // indicate if doing full search
     332                  info2->hasParent = ((model_->specialOptions()&67108864)==0) ? 1 : 2;
     333                } else {
     334                  info2->hasParent=0;
     335                  info2->parentSolver=NULL;
     336                }
    323337                info2->originalColumns = model_->originalColumns();
    324338                info2->randomNumberGenerator = randomNumberGenerator;
Note: See TracChangeset for help on using the changeset viewer.