Changeset 1069
 Timestamp:
 Aug 9, 2007 12:40:59 PM (13 years ago)
 Location:
 branches/BSP/trunk/Clp/src
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

branches/BSP/trunk/Clp/src/ClpGubDynamicMatrix.cpp
r1054 r1069 107 107 CoinBigIndex numberElements = startColumn_[numberGubColumns_]; 108 108 row_ = ClpCopyOfArray(row,numberElements); 109 element_ = new float[numberElements];109 element_ = new double[numberElements]; 110 110 CoinBigIndex i; 111 111 for (i=0;i<numberElements;i++) 112 112 element_[i]=element[i]; 113 cost_ = new float[numberGubColumns_];113 cost_ = new double[numberGubColumns_]; 114 114 for (i=0;i<numberGubColumns_;i++) { 115 115 cost_[i]=cost[i]; … … 118 118 } 119 119 if (lowerColumn) { 120 lowerColumn_ = new float[numberGubColumns_];120 lowerColumn_ = new double[numberGubColumns_]; 121 121 for (i=0;i<numberGubColumns_;i++) 122 122 lowerColumn_[i]=lowerColumn[i]; … … 125 125 } 126 126 if (upperColumn) { 127 upperColumn_ = new float[numberGubColumns_];127 upperColumn_ = new double[numberGubColumns_]; 128 128 for (i=0;i<numberGubColumns_;i++) 129 129 upperColumn_[i]=upperColumn[i]; … … 132 132 } 133 133 if (upperColumnlowerColumn) { 134 lowerSet_ = new float[numberSets_];134 lowerSet_ = new double[numberSets_]; 135 135 for (i=0;i<numberSets_;i++) { 136 136 if (lower[i]>1.0e20) … … 139 139 lowerSet_[i] = 1.0e30; 140 140 } 141 upperSet_ = new float[numberSets_];141 upperSet_ = new double[numberSets_]; 142 142 for (i=0;i<numberSets_;i++) { 143 143 if (upper[i]<1.0e20) 
branches/BSP/trunk/Clp/src/ClpGubDynamicMatrix.hpp
r1055 r1069 126 126 { return row_;} 127 127 /// elements 128 inline float* element() const128 inline double * element() const 129 129 { return element_;} 130 130 /// costs 131 inline float* cost() const131 inline double * cost() const 132 132 { return cost_;} 133 133 /// full starts … … 138 138 { return id_;} 139 139 /// Optional lower bounds on columns 140 inline float* lowerColumn() const140 inline double * lowerColumn() const 141 141 { return lowerColumn_;} 142 142 /// Optional upper bounds on columns 143 inline float* upperColumn() const143 inline double * upperColumn() const 144 144 { return upperColumn_;} 145 145 /// Optional true lower bounds on sets 146 inline float* lowerSet() const146 inline double * lowerSet() const 147 147 { return lowerSet_;} 148 148 /// Optional true upper bounds on sets 149 inline float* upperSet() const149 inline double * upperSet() const 150 150 { return upperSet_;} 151 151 /// size … … 189 189 int * row_; 190 190 /// elements 191 float* element_;191 double * element_; 192 192 /// costs 193 float* cost_;193 double * cost_; 194 194 /// full starts 195 195 int * fullStart_; … … 199 199 unsigned char * dynamicStatus_; 200 200 /// Optional lower bounds on columns 201 float* lowerColumn_;201 double * lowerColumn_; 202 202 /// Optional upper bounds on columns 203 float* upperColumn_;203 double * upperColumn_; 204 204 /// Optional true lower bounds on sets 205 float* lowerSet_;205 double * lowerSet_; 206 206 /// Optional true upper bounds on sets 207 float* upperSet_;207 double * upperSet_; 208 208 /// size 209 209 int numberGubColumns_;
Note: See TracChangeset
for help on using the changeset viewer.