Changeset 2106


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

take out xxx ? 0 : 0

Location:
trunk/Cbc/src
Files:
2 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        }
  • trunk/Cbc/src/CbcSolver.cpp

    r2105 r2106  
    12951295  return CbcMain1(argc,argv,model,callBack,staticParameterData);
    12961296}
     1297#if CLP_USE_OPENBLAS
     1298extern "C"
     1299{
     1300  void openblas_set_num_threads(int num_threads);
     1301}
     1302#endif
    12971303static void printGeneralMessage(CbcModel &model,const char * message);
    12981304/*
     
    13201326    int whichArgument=1;
    13211327#endif
     1328#if CLP_USE_OPENBLAS
     1329    openblas_set_num_threads(CLP_USE_OPENBLAS);
     1330#endif 
    13221331#ifdef CBC_USE_INITIAL_TIME
    13231332    if (model_.useElapsedTime())
Note: See TracChangeset for help on using the changeset viewer.