Changeset 774 for trunk/yat

Timestamp:

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

Author:

Jari Häkkinen

Message:

Fixes #194.

Location:

trunk/yat

Files:

• classifier/MatrixLookupWeighted.cc (modified) (2 diffs)
• utility/matrix.cc (modified) (3 diffs)
• utility/matrix.h (modified) (4 diffs)

trunk/yat/classifier/MatrixLookupWeighted.cc

@@ -53 +53 @@
   {
     utility::matrix weights;
-    data_->nan(weights);    
+    utility::nan(*data_,weights);
     weights_= new utility::matrix(weights);
     ref_count_weights_=new u_int(1);
@@ -214 +214 @@
       column_index_.push_back(i);
     utility::matrix weights;
-    data_->nan(weights);    
+    utility::nan(*data_,weights);
     weights_= new utility::matrix(weights);
     ref_count_weights_=new u_int(1);

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)
   {

trunk/yat/utility/matrix.h

@@ -177 +177 @@
 
     ///
-    /// @return True if all elements in the matrix is zero, false
-    /// othwerwise;
-    ///
-    bool isnull(void) const;
-
-    ///
     /// @brief Check if the matrix object is a view (sub-matrix) to
     /// another matrix.
@@ -189 +183 @@
     ///
     bool isview(void) const;
-
-    ///
-    /// @return The maximum value of the matrix.
-    ///
-    double max(void) const;
-
-    ///
-    /// @return The minimum value of the matrix.
-    ///
-    double min(void) const;
-
-    ///
-    /// @return The indecies to the element with the minimum and
-    /// maximum values of the matrix, respectively. The lowest index
-    /// has precedence (searching in row-major order).
-    ///
-    void minmax_index(std::pair<size_t,size_t>& min,
-                      std::pair<size_t,size_t>& max) 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;
 
     /**
@@ -266 +233 @@
     */
     void set_row(const size_t row, const vector& vec);
-
-    /**
-       \brief Exchange the elements of the this and \a other by copying.
-
-       The two matrices must have the same size.
-
-       \throw GSL_error if either index is out of bounds.
-    */
-    void swap(matrix& other);
 
     /**
@@ -453 +411 @@
   };
 
-  ///
-  /// The output operator for the matrix class.
-  ///
+  /**
+     \brief Check if all elements of the matrix are zero.
+
+     \return True if all elements in the matrix is zero, false othwerwise
+  */
+  bool isnull(const matrix&);
+
+  /**
+     \brief Get the maximum value in the matrix.
+
+     \return The maximum value of the matrix.
+  */
+  double max(const matrix&);
+
+  /**
+     \brief Get the minimum value in the matrix.
+
+     \return The minimum value of the matrix.
+  */
+  double min(const matrix&);
+
+  /**
+     \brief Locate the maximum and minumum element in the matrix.
+
+     \return The indecies to the element with the minimum and maximum
+     values of the matrix, respectively.
+
+     \note The lowest index has precedence (searching in row-major
+     order).
+  */
+  void minmax_index(const matrix&,
+                    std::pair<size_t,size_t>& min,
+                    std::pair<size_t,size_t>& max);
+
+  /**
+     \brief Create a matrix \a flag indicating NaN's in another matrix
+     \a templat.
+
+     The \a flag matrix is changed to contain 1's and 0's only. A 1
+     means that the corresponding element in the \a templat matrix is
+     valid and a zero means that the corresponding element is a NaN.
+
+     \note Space for matrix \a flag is reallocated to fit the size of
+     matrix \a templat if sizes mismatch.
+
+     \return True if the \a templat matrix contains at least one NaN.
+  */
+  bool nan(const matrix& templat, matrix& flag);
+
+  /**
+     \brief Exchange all elements between the matrices by copying.
+
+     The two matrices must have the same size.
+
+     \throw GSL_error if either index is out of bounds.
+  */
+  void swap(matrix&, matrix&);
+
+  /**
+     \brief The output operator for the matrix class.
+  */
   std::ostream& operator<< (std::ostream& s, const matrix&);