Changeset 611

Timestamp:

Aug 30, 2006, 2:39:20 PM (16 years ago)

Author:

Markus Ringnér

Message:

Fixes #100

Location:

trunk

Files:

• c++_tools/classifier/MatrixLookupWeighted.cc (modified) (1 diff)
• c++_tools/gslapi/matrix.cc (modified) (1 diff)
• c++_tools/gslapi/matrix.h (modified) (1 diff)
• test/matrix_test.cc (modified) (1 diff)

trunk/c++_tools/classifier/MatrixLookupWeighted.cc

@@ -148 +148 @@
     for(size_t i=0;i<(*data_).columns();i++)
       column_index_.push_back(i);
-    // Peter, a lot of copying in this line
-    weights_ = new gslapi::matrix(data_->nan());
+    gslapi::matrix weights;
+    data_->nan(weights);    
+    weights_= new gslapi::matrix(weights);
   }
   

trunk/c++_tools/gslapi/matrix.cc

@@ -161 +161 @@
 
 
-  matrix matrix::nan(void) const
-  {
-    matrix m(rows(),columns(),1.0);
+  bool matrix::nan(matrix &m) const
+  {
+    m=matrix(rows(),columns(),1.0);
+    bool nan=false;
     for (size_t i=0; i<rows(); i++)
       for (size_t j=0; j<columns(); j++) 
-        if (std::isnan(operator()(i,j)))
+        if (std::isnan(operator()(i,j))) {
           m(i,j)=0;
-    return m;
+          nan=true;
+        }
+    return nan;
   }
 

trunk/c++_tools/gslapi/matrix.h

@@ -250 +250 @@
 
     ///
-    /// @return matrix containing 1 and 0 only. 1 means element in
-    /// matrix is valid and a zero means element is a NaN.
-    ///
-    matrix nan(void) const;
+    /// The argument is changed into a matrix containing 1's and 0's
+    /// only. 1 means element in matrix is valid and a zero means
+    /// element is a NaN.
+    ///
+    /// @return true if matrix contains at least one NaN.
+    ///
+    bool nan(matrix&) const;
 
     ///

trunk/test/matrix_test.cc

@@ -197 +197 @@
   is.open("data/sorlie_centroids.txt");
   gslapi::matrix* m_nan = new gslapi::matrix(is,'\t');
-  gslapi::matrix m_weight = m_nan->nan();
+  gslapi::matrix m_weight;
+  m_nan->nan(m_weight);
   is.close();
   if (m_weight(0,0)!=1){