Changeset 787

Timestamp:

Sep 21, 2007 1:57:32 PM (11 years ago)

Author:

forrest

Message:

fix bug for Stefano Gliozzi

Location:

stable/1.1/Cbc/src

Files:

• CbcModel.cpp (modified) (5 diffs)
• CbcModel.hpp (modified) (1 diff)

stable/1.1/Cbc/src/CbcModel.cpp

@@ -5615 +5615 @@
 */
 double 
-CbcModel::checkSolution (double cutoff, const double *solution,
+CbcModel::checkSolution (double cutoff, double *solution,
                          bool fixVariables, double objectiveValue)
 
@@ -5716 +5716 @@
     */
     if ((solver_->isProvenOptimal()||(specialOptions_&4)!=0) && objectiveValue <= cutoff) { 
-      double * solution = new double[numberColumns];
       memcpy(solution ,solver_->getColSolution(),numberColumns*sizeof(double)) ;
       
@@ -5754 +5753 @@
         delete [] rowActivity ;
       }
-      delete [] solution;
     } else {
       objectiveValue=1.0e50 ; 
@@ -5909 +5907 @@
 void
 CbcModel::setBestSolution (CBC_Message how,
-                           double & objectiveValue, const double *solution,
+                           double & objectiveValue, const double *solutionIn,
                            bool fixVariables)
 
 {
+  double * solution=CoinCopyOfArray(solutionIn,solver_->getNumCols());
   if (!solverCharacteristics_->solutionAddsCuts()) {
     // Can trust solution
@@ -6112 +6111 @@
     delete [] candidate;
   }
+  delete [] solution;
   return ;
 }

stable/1.1/Cbc/src/CbcModel.hpp

@@ -904 +904 @@
       Previously computed objective value is now passed in (in case user does not do solve)
  */
-  double checkSolution(double cutoff, const double * solution,
+  double checkSolution(double cutoff, double * solution,
                        bool fixVariables, double originalObjValue);
   /** Test the current solution for feasiblility.