Changeset 2541


Ignore:
Timestamp:
Mar 26, 2019 8:27:29 AM (7 months ago)
Author:
forrest
Message:

set currentNode_ NULL

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/2.9/Cbc/src/CbcModel.cpp

    r2468 r2541  
    39393939        setObjectiveValue(newNode, NULL);
    39403940        anyAction = -1 ;
    3941         // To make depth available we may need a fake node
    3942         CbcNode fakeNode;
    3943         if (!currentNode_) {
    3944             // Not true if sub trees assert (!numberNodes_);
    3945             currentNode_ = &fakeNode;
    3946         }
    39473941        phase_ = 3;
    39483942        // only allow 1000 passes
     
    1501315007                if (clpSolver) {
    1501415008                    anyAction = newNode->chooseClpBranch(this, oldNode) ;
     15009                    currentNode_ = NULL;
    1501515010                    if (anyAction != -1)
    1501615011                        break;
     
    1507315068                    anyAction = newNode->chooseBranch(this, oldNode, numberPassesLeft) ; // dynamic did nothing
    1507415069            }
     15070            currentNode_ = NULL;
    1507515071#ifdef COIN_HAS_CLP
    1507615072            if (clpSolver&&(moreSpecialOptions_&4194304)!=0) {
     
    1508415080        } else {
    1508515081            OsiBranchingInformation usefulInfo = usefulInformation();
    15086             anyAction = newNode->chooseOsiBranch(this, oldNode, &usefulInfo, branchingState) ;; // Osi method
    15087             //branchingState=0;
     15082            anyAction = newNode->chooseOsiBranch(this, oldNode, &usefulInfo, branchingState) ;
     15083            currentNode_ = NULL;
    1508815084        }
    1508915085        if (!oldNode) {
Note: See TracChangeset for help on using the changeset viewer.