Changeset 2187
- Timestamp:
- May 5, 2015 9:04:34 AM (6 years ago)
- Location:
- stable/2.9/Cbc
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/2.9/Cbc
- Property svn:mergeinfo changed
/trunk/Cbc merged: 2161,2163-2164,2166-2169,2181,2184-2185
- Property svn:mergeinfo changed
-
stable/2.9/Cbc/src
- Property svn:mergeinfo changed
/trunk/Cbc/src merged: 2161,2163-2164,2166-2167,2181,2184-2185
- Property svn:mergeinfo changed
-
stable/2.9/Cbc/src/CbcHeuristicDive.cpp
r2127 r2187 74 74 decayFactor_ = 1.0; 75 75 smallObjective_ = 1.0e-10; 76 setPriorities();77 76 } 78 77 … … 234 233 if (gotPriorities || priority1>priority2) { 235 234 priority_ = new PriorityType [numberIntegers]; 235 int nInteger=0; 236 236 for (int i = 0; i < numberObjects; i++) { 237 237 OsiObject * object = model_->modifiableObject(i); … … 241 241 int level=thisOne->priority()-priority2; 242 242 assert (level<(1<<29)); 243 priority_[i].priority=static_cast<unsigned int>(level); 243 assert (nInteger<numberIntegers); 244 priority_[nInteger].priority=static_cast<unsigned int>(level); 244 245 int direction=0; 245 246 if (thisOne->preferredWay()<0) … … 248 249 direction=1|1; 249 250 // at present don't try other way is not used 250 priority_[i].direction=static_cast<unsigned char>(direction); 251 } 251 priority_[nInteger++].direction=static_cast<unsigned char>(direction); 252 } 253 assert (nInteger==numberIntegers); 252 254 } 253 255 } -
stable/2.9/Cbc/src/CbcMipStartIO.cpp
r2186 r2187 111 111 double *sol, double &obj ) 112 112 { 113 if (!model->getNumCols()) 114 return 0; 115 113 116 int status = 0; 114 117 double compObj = COIN_DBL_MAX; -
stable/2.9/Cbc/src/CbcModel.cpp
r2186 r2187 13993 13993 CbcModel::makeGlobalCut(const OsiColCut * cut) 13994 13994 { 13995 abort(); // need to think about top of tree13996 13995 const double * lower; 13997 13996 const double * upper; -
stable/2.9/Cbc/src/CbcNode.cpp
r2182 r2187 2718 2718 if (20*numberInfeasible + 4*numberFixed < numberNodes) { 2719 2719 // Say never do 2720 if (numberBeforeTrust == 5)2720 if (numberBeforeTrust == 10) 2721 2721 skipAll = -1; 2722 2722 } -
stable/2.9/Cbc/src/CbcSolver.cpp
r2186 r2187 5436 5436 //if (model.getMIPStart().size()) 5437 5437 // mipStart = model.getMIPStart(); 5438 if (mipStart.size() && !mipStartBefore.size() )5438 if (mipStart.size() && !mipStartBefore.size() && babModel_->getNumCols()) 5439 5439 { 5440 5440 std::vector< std::string > colNames; … … 7237 7237 osiclp->getModelPtr()->checkUnscaledSolution(); 7238 7238 } 7239 7239 7240 assert (saveSolver->isProvenOptimal()); 7240 7241 #ifndef CBC_OTHER_SOLVER
Note: See TracChangeset
for help on using the changeset viewer.