Changeset 774 for trunk/yat/utility/matrix.cc

Timestamp:

Mar 1, 2007, 10:52:48 PM (16 years ago)

Author:

Jari Häkkinen

Message:

Fixes #194.

File:

• trunk/yat/utility/matrix.cc (modified) (3 diffs)

trunk/yat/utility/matrix.cc

@@ -213 +213 @@
 
 
-  bool matrix::isnull(void) const
-  {
-    return gsl_matrix_isnull(m_);
-  }
-
-
   bool matrix::isview(void) const
   {
     return view_;
-  }
-
-
-  double matrix::max(void) const
-  {
-    return gsl_matrix_max(m_);
-  }
-
-
-  double matrix::min(void) const
-  {
-    return gsl_matrix_min(m_);
-  }
-
-
-  void matrix::minmax_index(std::pair<size_t,size_t>& min,
-                            std::pair<size_t,size_t>& max) const
-  {
-    gsl_matrix_minmax_index(m_, &min.first, &min.second, &max.first,
-                            &max.second);
-  }
-
-
-  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))) {
-          m(i,j)=0;
-          nan=true;
-        }
-    return nan;
   }
 
@@ -302 +262 @@
     if (status)
       throw utility::GSL_error(std::string("matrix::set_row",status));
-  }
-
-
-  void matrix::swap(matrix& other)
-  {
-    int status=gsl_matrix_swap(m_, other.m_);
-    if (status)
-      throw utility::GSL_error(std::string("matrix::swap",status));
   }
 
@@ -455 +407 @@
 
 
+  bool isnull(const matrix& m)
+  {
+    return gsl_matrix_isnull(m.gsl_matrix_p());
+  }
+
+
+  double max(const matrix& m)
+  {
+    return gsl_matrix_max(m.gsl_matrix_p());
+  }
+
+
+  double min(const matrix& m)
+  {
+    return gsl_matrix_min(m.gsl_matrix_p());
+  }
+
+
+  void minmax_index(const matrix& m,
+                    std::pair<size_t,size_t>& min, std::pair<size_t,size_t>& max)
+  {
+    gsl_matrix_minmax_index(m.gsl_matrix_p(), &min.first, &min.second,
+                            &max.first, &max.second);
+  }
+
+
+  bool nan(const matrix& templat, matrix& flag)
+  {
+    size_t rows=templat.rows();
+    size_t columns=templat.columns();
+    if (rows!=flag.rows() && columns!=flag.columns())
+      flag=matrix(rows,columns,1.0);
+    else
+      flag.set_all(1.0);
+    bool nan=false;
+    for (size_t i=0; i<rows; i++)
+      for (size_t j=0; j<columns; j++) 
+        if (std::isnan(templat(i,j))) {
+          flag(i,j)=0;
+          nan=true;
+        }
+    return nan;
+  }
+
+
+  void swap(matrix& a, matrix& b)
+  {
+    int status=gsl_matrix_swap(a.gsl_matrix_p(), b.gsl_matrix_p());
+    if (status)
+      throw utility::GSL_error(std::string("matrix::swap",status));
+  }
+
+
   std::ostream& operator<<(std::ostream& s, const matrix& m)
   {