Changeset 808

Timestamp:

Mar 15, 2007, 9:07:01 PM (16 years ago)

Author:

Peter

Message:

previous argument was invalid, but here is an implementation. Fixes #205

Location:

trunk/yat

Files:

• classifier/NBC.cc (modified) (1 diff)
• classifier/NBC.h (modified) (1 diff)
• utility/matrix.cc (modified) (2 diffs)
• utility/matrix.h (modified) (3 diffs)
• utility/vector.cc (modified) (1 diff)
• utility/vector.h (modified) (1 diff)

trunk/yat/classifier/NBC.cc

@@ -106 +106 @@
     assert(data_.rows()==input.rows());
 
+    //    utility
+    //for (size_t i=0; 
+
+
     prediction = utility::matrix(centroids_.columns(),input.columns());
     for (size_t c=0; c<centroids_.columns(); ++c) {

trunk/yat/classifier/NBC.h

@@ -82 +82 @@
 
     
-    ///
-    /// For each sample, calculate the probabilies the sample belong
-    /// to the corresponding class.
-    ///
+    /**
+       For each sample, calculate the probabilities the sample belong
+       to the corresponding class.
+    */
     void predict(const DataLookup2D& data, utility::matrix& res) const;
 

trunk/yat/utility/matrix.cc

@@ -5 +5 @@
   Copyright (C) 2004 Jari Häkkinen, Peter Johansson
   Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson, Markus Ringnér
-  Copyright (C) 2007 Jari Häkkinen
+  Copyright (C) 2007 Jari Häkkinen, Peter Johansson
 
   This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -269 +269 @@
 
 
+  void matrix::resize(size_t r, size_t c, double init_value)
+  {
+      if (view_)
+        delete view_;
+      else if (view_const_)
+        delete view_const_;
+      else if (m_)
+        gsl_matrix_free(m_);
+      proxy_m_ = m_ = gsl_matrix_alloc(r,c);
+      if (!m_)
+        throw utility::GSL_error("matrix::matrix failed to allocate memory");
+      set_all(init_value);
+
+      // no need to delete blas_result_ if the number of rows fit, it
+      // may be useful later.
+      if (blas_result_ && (blas_result_->size1!=rows())) {
+        gsl_matrix_free(blas_result_);
+        blas_result_=NULL;
+      }
+  } 
+
+
   size_t matrix::rows(void) const
   {

trunk/yat/utility/matrix.h

@@ -9 +9 @@
   Copyright (C) 2005 Jari Häkkinen, Peter Johansson, Markus Ringnér
   Copyright (C) 2006 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2007 Jari Häkkinen
+  Copyright (C) 2007 Jari Häkkinen, Peter Johansson
 
   This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -146 +146 @@
 
        This function will make a deep copy of \a other. Memory is
-       resized and view state is changed if needed.
+       resized and view state is changed to same as in other.
     */
     const matrix& clone(const matrix& other);
@@ -201 +201 @@
     */
     void mul(const matrix& b);
+
+    ///
+    /// @breif resize matrix
+    ///
+    /// All elements are set to @a init_value.
+    ///
+    void resize(size_t, size_t, double init_value=0);
 
     ///

trunk/yat/utility/vector.cc

@@ -291 +291 @@
 
 
+  void vector::resize(size_t n, double init_value)
+  {
+    if (view_)
+      delete view_;
+    else if (view_const_)
+      delete view_const_;
+    else if (v_)
+      gsl_vector_free(v_);
+    proxy_v_ = v_ = gsl_vector_alloc(n);
+
+    if (!v_)
+      throw utility::GSL_error("vector::vector failed to allocate memory");
+    set_all(init_value);
+  } 
+
+
   void vector::reverse(void)
   {

trunk/yat/utility/vector.h

@@ -267 +267 @@
     void mul(const vector& other);
 
+    ///
+    /// @breif resize vector
+    ///
+    /// All elements are set to @a init_value.
+    ///
+    void resize(size_t, double init_value=0);
+
     /**
        \brief Reverse the order of elements in the vector.