Changeset 2350
- Timestamp:
- Nov 27, 2017 5:36:22 AM (3 years ago)
- Location:
- stable/2.9/Cbc/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/2.9/Cbc/src/CbcHeuristicLocal.cpp
r2105 r2350 1662 1662 } 1663 1663 } 1664 delete [] fixed; 1664 1665 int returnCode = smallBranchAndBound(solver, numberNodes_, betterSolution, 1665 1666 solutionValue, -
stable/2.9/Cbc/src/CbcSolver.cpp
r2334 r2350 323 323 presolvedModel->solver()->setColSolution(bestSolution); 324 324 //presolvedModel->setBestSolution(bestSolution,numberColumns,objectiveValue); 325 delete [] bestSolution; 325 326 } 326 327 } … … 6907 6908 if (numberSolutions>1) { 6908 6909 for (int iSolution=numberSolutions-1;iSolution>=0;iSolution--) { 6909 model_.setBestSolution(babModel_->savedSolution(iSolution), 6910 model_.solver()->getNumCols(), 6910 const double * savedSolution =babModel_->savedSolution(iSolution); 6911 int numberColumns=model_.solver()->getNumCols(); 6912 // only set if dimensions OK 6913 int numberBabColumns=static_cast<int> 6914 (savedSolution[-2]); 6915 if (numberBabColumns>=numberColumns) 6916 model_.setBestSolution(savedSolution, 6917 numberColumns, 6911 6918 babModel_->savedSolutionObjective(iSolution)); 6912 6919 }
Note: See TracChangeset
for help on using the changeset viewer.