Changeset 867

Timestamp:

Feb 7, 2008 4:46:54 PM (14 years ago)

Author:

forrest

Message:

try and fix bug reported by Kim Hansen

File:

• trunk/Cbc/src/CbcModel.cpp (modified) (4 diffs)

trunk/Cbc/src/CbcModel.cpp

@@ -1513 +1513 @@
     int preferredWay ;
     int numberUnsatisfied = 0 ;
+    delete [] currentSolution_;
+    currentSolution_ = new double [numberColumns];
+    testSolution_ = currentSolution_;
     memcpy(currentSolution_,solver_->getColSolution(),
            numberColumns*sizeof(double)) ;
@@ -3727 +3730 @@
     continuousSolution_ = new double[numberColumns];
     usedInSolution_ = new int[numberColumns];
+    CoinZeroN(usedInSolution_,numberColumns);
     for (iColumn=0;iColumn<numberColumns;iColumn++) {
       if( solver_->isInteger(iColumn)) 
@@ -4040 +4044 @@
   if (!noTree) {
     int numberColumns = solver_->getNumCols();
-    currentSolution_ = CoinCopyOfArray(rhs.currentSolution_,numberColumns);
-    continuousSolution_ = CoinCopyOfArray(rhs.continuousSolution_,numberColumns);
-    usedInSolution_ = CoinCopyOfArray(rhs.usedInSolution_,numberColumns);
+    // Space for current solution
+    currentSolution_ = new double[numberColumns];
+    continuousSolution_ = new double[numberColumns];
+    usedInSolution_ = new int[numberColumns];
+    CoinZeroN(usedInSolution_,numberColumns);
   } else {
     currentSolution_=NULL;
@@ -4144 +4150 @@
     }
     int numberColumns = rhs.getNumCols();
-    currentSolution_ = CoinCopyOfArray(rhs.currentSolution_,numberColumns);
-    continuousSolution_ = CoinCopyOfArray(rhs.continuousSolution_,numberColumns);
-    usedInSolution_ = CoinCopyOfArray(rhs.usedInSolution_,numberColumns);
+    if (numberColumns) {
+      // Space for current solution
+      currentSolution_ = new double[numberColumns];
+      continuousSolution_ = new double[numberColumns];
+      usedInSolution_ = new int[numberColumns];
+      CoinZeroN(usedInSolution_,numberColumns);
+    } else {
+      currentSolution_=NULL;
+      continuousSolution_=NULL;
+      usedInSolution_=NULL;
+    }
     testSolution_=currentSolution_;
     minimumDrop_ = rhs.minimumDrop_;