Changeset 1484 for trunk

Timestamp:

Dec 30, 2009 12:23:30 PM (11 years ago)

Author:

forrest

Message:

memory leak

Location:

trunk/Clp/src

Files:

• ClpModel.cpp (modified) (1 diff)
• ClpNode.cpp (modified) (1 diff)
• ClpSimplexDual.cpp (modified) (2 diffs)

trunk/Clp/src/ClpModel.cpp

@@ -777 +777 @@
       savedColumnScale_ = NULL;
       integerType_ = CoinCopyOfArray(rhs.integerType_,numberColumns_);
-      if (rhs.rowActivity_) {
-        rowActivity_= ClpCopyOfArray(rhs.rowActivity_, numberRows_);
-        columnActivity_= ClpCopyOfArray(rhs.columnActivity_,numberColumns_);
-        dual_= ClpCopyOfArray(rhs.dual_, numberRows_);
-        reducedCost_= ClpCopyOfArray(rhs.reducedCost_, numberColumns_);
-      } else {
-        rowActivity_=NULL;
-        columnActivity_=NULL;
-        dual_=NULL;
-        reducedCost_=NULL;
-      }
+      rowActivity_= ClpCopyOfArray(rhs.rowActivity_, numberRows_);
+      columnActivity_= ClpCopyOfArray(rhs.columnActivity_,numberColumns_);
+      dual_= ClpCopyOfArray(rhs.dual_, numberRows_);
+      reducedCost_= ClpCopyOfArray(rhs.reducedCost_, numberColumns_);
       rowLower_ = ClpCopyOfArray ( rhs.rowLower_, numberRows_ );
       rowUpper_ = ClpCopyOfArray ( rhs.rowUpper_, numberRows_ );

trunk/Clp/src/ClpNode.cpp

@@ -851 +851 @@
   }
   delete [] nodeInfo_;
+#ifdef CLP_INVESTIGATE
+  // Should be NULL - find out why not?
+  assert (!saveCosts_);
+#endif
+    delete [] saveCosts_;
 }
 // Return maximum number of nodes

trunk/Clp/src/ClpSimplexDual.cpp

@@ -6218 +6218 @@
 {
   if (solveLp) {
+    // make sure won't create fake objective
+    int saveOptions = specialOptions_;
+    specialOptions_ |= 16384;
     // solve
     dual(0,7);
@@ -6228 +6231 @@
       }
     }
+    specialOptions_ = saveOptions;
     if (problemStatus_==1)
       return NULL; // say infeasible