Ignore:
Timestamp:
Jan 6, 2015 12:48:17 PM (5 years ago)
Author:
forrest
Message:

take out xxx ? 0 : 0

File:
1 edited

Legend:

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

    r2105 r2106  
    39033903        if (numberAnalyzeIterations_ && !parentModel_) {
    39043904            delete [] analyzeResults_;
    3905             int numberColumns = solver_->getNumCols();
     3905            //int numberColumns = solver_->getNumCols();
    39063906            analyzeResults_ = new double [5*numberIntegers_];
    39073907            numberFixedAtRoot_ = newNode->analyze(this, analyzeResults_);
     
    79467946                double objectiveValue = solver_->getObjValue() * solver_->getObjSense();
    79477947                double changeInObjective = CoinMax(0.0, objectiveValue - originalValue);
    7948                 int iStatus = (feasible) ? 0 : 0;
    79497948                double value = obj->value();
    79507949                double movement;
     
    79547953                    movement = value - floor(value);
    79557954                branchingMethod_->chooseMethod()->updateInformation(iObject, branch, changeInObjective,
    7956                         movement, iStatus);
     7955                                            movement, 0 /*(feasible) ? 0 : 1; */);
    79577956            }
    79587957        }
Note: See TracChangeset for help on using the changeset viewer.