Changeset 516

Timestamp:

Feb 20, 2006, 7:37:42 PM (16 years ago)

Author:

Peter

Message:

added function generating weight matrix with respect to not-a-number vs number

Location:

trunk

Files:

• lib/gslapi/matrix.cc (modified) (1 diff)
• lib/gslapi/matrix.h (modified) (1 diff)
• test/matrix_test.cc (modified) (1 diff)

trunk/lib/gslapi/matrix.cc

@@ -137 +137 @@
 
 
+  matrix matrix::nan(void) const
+  {
+    matrix m(rows(),columns(),1.0);
+    for (size_t i=0; i<rows(); i++)
+      for (size_t j=0; j<columns(); j++) 
+        if (std::isnan(operator()(i,j)))
+          m(i,j)=0;
+    return m;
+  }
+
+
+
   // Jari, checkout GSL transpose support in GSL manual 8.4.9
   void matrix::transpose(void)

trunk/lib/gslapi/matrix.h

@@ -225 +225 @@
 
     ///
+    /// @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;
+
+    ///
     /// Multiply the elements of matrix \a b with the elements of the
     /// calling matrix ,\f$a_{ij} = a_{ij} * b_{ij} \; \forall

trunk/test/matrix_test.cc

@@ -194 +194 @@
   }
 
+  *error << "\tmatrix::nan()" << std::endl;
+  is.open("data/sorlie_centroids.txt");
+  gslapi::matrix* m_nan = new gslapi::matrix(is,'\t');
+  gslapi::matrix m_weight = m_nan->nan();
+  is.close();
+  if (m_weight(0,0)!=1){
+    *error << "error in matrix::nan(): element(0,0) is " << m_weight(0,0)
+           << " expected 1." << std::endl;
+    ok=false;
+  }
+  if (m_weight(3,2)!=0){
+    *error << "error in matrix::nan(): element(3,2) is " << m_weight(3,2)
+           << " expected 0." << std::endl;
+    ok=false;
+  }
+  delete m_nan;
+
   if (error!=&std::cerr)
     delete error;