Changeset 1787 for stable/1.14

Timestamp:

Sep 3, 2011 9:06:58 AM (9 years ago)

Author:

stefan

Message:

merge chgset 1786 from trunk

Location:

stable/1.14

Files:

• . (modified) (1 prop)
• Clp/src (modified) (1 prop)
• Clp/src/ClpModel.cpp (modified) (1 diff)

stable/1.14/Clp/src/ClpModel.cpp

@@ -3232 +3232 @@
      rowObjective_ = whichDouble(rhs->rowObjective_, numberRows, whichRow);
      // status has to be done in two stages
-     status_ = new unsigned char[numberColumns_+numberRows_];
-     unsigned char * rowStatus = whichUnsignedChar(rhs->status_ + rhs->numberColumns_,
-                                 numberRows_, whichRow);
-     unsigned char * columnStatus = whichUnsignedChar(rhs->status_,
-                                    numberColumns_, whichColumn);
-     CoinMemcpyN(rowStatus, numberRows_, status_ + numberColumns_);
-     delete [] rowStatus;
-     CoinMemcpyN(columnStatus, numberColumns_, status_);
-     delete [] columnStatus;
+     if (rhs->status_) {
+       status_ = new unsigned char[numberColumns_+numberRows_];
+       unsigned char * rowStatus = whichUnsignedChar(rhs->status_ + rhs->numberColumns_,
+                                                     numberRows_, whichRow);
+       unsigned char * columnStatus = whichUnsignedChar(rhs->status_,
+                                                        numberColumns_, whichColumn);
+       CoinMemcpyN(rowStatus, numberRows_, status_ + numberColumns_);
+       delete [] rowStatus;
+       CoinMemcpyN(columnStatus, numberColumns_, status_);
+       delete [] columnStatus;
+     } else {
+       status_=NULL;
+     }
      ray_ = NULL;
      if (problemStatus_ == 1)