Changeset 867
- Timestamp:
- Feb 7, 2008 4:46:54 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/src/CbcModel.cpp
r864 r867 1513 1513 int preferredWay ; 1514 1514 int numberUnsatisfied = 0 ; 1515 delete [] currentSolution_; 1516 currentSolution_ = new double [numberColumns]; 1517 testSolution_ = currentSolution_; 1515 1518 memcpy(currentSolution_,solver_->getColSolution(), 1516 1519 numberColumns*sizeof(double)) ; … … 3727 3730 continuousSolution_ = new double[numberColumns]; 3728 3731 usedInSolution_ = new int[numberColumns]; 3732 CoinZeroN(usedInSolution_,numberColumns); 3729 3733 for (iColumn=0;iColumn<numberColumns;iColumn++) { 3730 3734 if( solver_->isInteger(iColumn)) … … 4040 4044 if (!noTree) { 4041 4045 int numberColumns = solver_->getNumCols(); 4042 currentSolution_ = CoinCopyOfArray(rhs.currentSolution_,numberColumns); 4043 continuousSolution_ = CoinCopyOfArray(rhs.continuousSolution_,numberColumns); 4044 usedInSolution_ = CoinCopyOfArray(rhs.usedInSolution_,numberColumns); 4046 // Space for current solution 4047 currentSolution_ = new double[numberColumns]; 4048 continuousSolution_ = new double[numberColumns]; 4049 usedInSolution_ = new int[numberColumns]; 4050 CoinZeroN(usedInSolution_,numberColumns); 4045 4051 } else { 4046 4052 currentSolution_=NULL; … … 4144 4150 } 4145 4151 int numberColumns = rhs.getNumCols(); 4146 currentSolution_ = CoinCopyOfArray(rhs.currentSolution_,numberColumns); 4147 continuousSolution_ = CoinCopyOfArray(rhs.continuousSolution_,numberColumns); 4148 usedInSolution_ = CoinCopyOfArray(rhs.usedInSolution_,numberColumns); 4152 if (numberColumns) { 4153 // Space for current solution 4154 currentSolution_ = new double[numberColumns]; 4155 continuousSolution_ = new double[numberColumns]; 4156 usedInSolution_ = new int[numberColumns]; 4157 CoinZeroN(usedInSolution_,numberColumns); 4158 } else { 4159 currentSolution_=NULL; 4160 continuousSolution_=NULL; 4161 usedInSolution_=NULL; 4162 } 4149 4163 testSolution_=currentSolution_; 4150 4164 minimumDrop_ = rhs.minimumDrop_;
Note: See TracChangeset
for help on using the changeset viewer.