- Timestamp:
- Dec 30, 2009 12:23:30 PM (11 years ago)
- Location:
- trunk/Clp/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/src/ClpModel.cpp
r1451 r1484 777 777 savedColumnScale_ = NULL; 778 778 integerType_ = CoinCopyOfArray(rhs.integerType_,numberColumns_); 779 if (rhs.rowActivity_) { 780 rowActivity_= ClpCopyOfArray(rhs.rowActivity_, numberRows_); 781 columnActivity_= ClpCopyOfArray(rhs.columnActivity_,numberColumns_); 782 dual_= ClpCopyOfArray(rhs.dual_, numberRows_); 783 reducedCost_= ClpCopyOfArray(rhs.reducedCost_, numberColumns_); 784 } else { 785 rowActivity_=NULL; 786 columnActivity_=NULL; 787 dual_=NULL; 788 reducedCost_=NULL; 789 } 779 rowActivity_= ClpCopyOfArray(rhs.rowActivity_, numberRows_); 780 columnActivity_= ClpCopyOfArray(rhs.columnActivity_,numberColumns_); 781 dual_= ClpCopyOfArray(rhs.dual_, numberRows_); 782 reducedCost_= ClpCopyOfArray(rhs.reducedCost_, numberColumns_); 790 783 rowLower_ = ClpCopyOfArray ( rhs.rowLower_, numberRows_ ); 791 784 rowUpper_ = ClpCopyOfArray ( rhs.rowUpper_, numberRows_ ); -
trunk/Clp/src/ClpNode.cpp
r1430 r1484 851 851 } 852 852 delete [] nodeInfo_; 853 #ifdef CLP_INVESTIGATE 854 // Should be NULL - find out why not? 855 assert (!saveCosts_); 856 #endif 857 delete [] saveCosts_; 853 858 } 854 859 // Return maximum number of nodes -
trunk/Clp/src/ClpSimplexDual.cpp
r1452 r1484 6218 6218 { 6219 6219 if (solveLp) { 6220 // make sure won't create fake objective 6221 int saveOptions = specialOptions_; 6222 specialOptions_ |= 16384; 6220 6223 // solve 6221 6224 dual(0,7); … … 6228 6231 } 6229 6232 } 6233 specialOptions_ = saveOptions; 6230 6234 if (problemStatus_==1) 6231 6235 return NULL; // say infeasible
Note: See TracChangeset
for help on using the changeset viewer.