Changeset 1485

Timestamp:

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

Author:

forrest

Message:

memory leak

Location:

branches/sandbox/Clp/src

Files:

• ClpModel.cpp (modified) (1 diff)
• ClpNode.cpp (modified) (1 diff)

branches/sandbox/Clp/src/ClpModel.cpp

@@ -780 +780 @@
             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_ );

branches/sandbox/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