Changeset 2341


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

more information into CglTreeInfo? info

Location:
trunk/Cbc/src
Files:
4 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;
  • trunk/Cbc/src/CbcHeuristic.cpp

    r2323 r2341  
    11471147                    // make sure can't do nested search! but allow heuristics
    11481148                    model.setSpecialOptions((model.specialOptions()&(~(512 + 2048))) | 1024);
     1149                    // but say we are doing full search
     1150                    model.setSpecialOptions(model.specialOptions()|67108864);
    11491151                    bool takeHint;
    11501152                    OsiHintStrength strength;
  • trunk/Cbc/src/CbcModel.cpp

    r2340 r2341  
    40274027              info.formulation_rows = solver_->getNumRows();
    40284028              info.inTree = false;
    4029               info.childModel=parentModel_ ? 1 : 0;
     4029              if (parentModel_) {
     4030                info.parentSolver=parentModel_->continuousSolver();
     4031                // indicate if doing full search
     4032                info.hasParent = ((specialOptions_&67108864)==0) ? 1 : 2;
     4033              } else {
     4034                info.hasParent=0;
     4035                info.parentSolver=NULL;
     4036              }
    40304037              info.originalColumns=originalColumns();
    40314038              info.randomNumberGenerator=&randomGenerator;
  • trunk/Cbc/src/CbcModel.hpp

    r2331 r2341  
    17911791        24 bit (16777216) - just get feasible if no cutoff
    17921792        25 bit (33554432) - feasibility pump after root cuts
     1793        26 bit (67108864) - child model but going for complete search
    17931794    */
    17941795    inline void setSpecialOptions(int value) {
Note: See TracChangeset for help on using the changeset viewer.