Changeset 611
- Timestamp:
- Aug 30, 2006, 2:39:20 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/c++_tools/classifier/MatrixLookupWeighted.cc
r608 r611 148 148 for(size_t i=0;i<(*data_).columns();i++) 149 149 column_index_.push_back(i); 150 // Peter, a lot of copying in this line 151 weights_ = new gslapi::matrix(data_->nan()); 150 gslapi::matrix weights; 151 data_->nan(weights); 152 weights_= new gslapi::matrix(weights); 152 153 } 153 154 -
trunk/c++_tools/gslapi/matrix.cc
r593 r611 161 161 162 162 163 matrix matrix::nan(void) const 164 { 165 matrix m(rows(),columns(),1.0); 163 bool matrix::nan(matrix &m) const 164 { 165 m=matrix(rows(),columns(),1.0); 166 bool nan=false; 166 167 for (size_t i=0; i<rows(); i++) 167 168 for (size_t j=0; j<columns(); j++) 168 if (std::isnan(operator()(i,j))) 169 if (std::isnan(operator()(i,j))) { 169 170 m(i,j)=0; 170 return m; 171 nan=true; 172 } 173 return nan; 171 174 } 172 175 -
trunk/c++_tools/gslapi/matrix.h
r597 r611 250 250 251 251 /// 252 /// @return matrix containing 1 and 0 only. 1 means element in 253 /// matrix is valid and a zero means element is a NaN. 254 /// 255 matrix nan(void) const; 252 /// The argument is changed into a matrix containing 1's and 0's 253 /// only. 1 means element in matrix is valid and a zero means 254 /// element is a NaN. 255 /// 256 /// @return true if matrix contains at least one NaN. 257 /// 258 bool nan(matrix&) const; 256 259 257 260 /// -
trunk/test/matrix_test.cc
r516 r611 197 197 is.open("data/sorlie_centroids.txt"); 198 198 gslapi::matrix* m_nan = new gslapi::matrix(is,'\t'); 199 gslapi::matrix m_weight = m_nan->nan(); 199 gslapi::matrix m_weight; 200 m_nan->nan(m_weight); 200 201 is.close(); 201 202 if (m_weight(0,0)!=1){
Note: See TracChangeset
for help on using the changeset viewer.