Changeset 810 for trunk/yat/utility

Timestamp:

Mar 16, 2007, 12:31:22 AM (16 years ago)

Author:

Jari Häkkinen

Message:

Changed to obey the general wisdom: If you write the same code snipet more than 2 times, make it a function.

Location:

trunk/yat/utility

Files:

• matrix.cc (modified) (3 diffs)
• matrix.h (modified) (1 diff)
• vector.cc (modified) (4 diffs)
• vector.h (modified) (1 diff)

trunk/yat/utility/matrix.cc

@@ -151 +151 @@
   matrix::~matrix(void)
   {
+    delete_allocated_memory();
+    if (blas_result_)
+      gsl_matrix_free(blas_result_);
+  }
+
+
+  const matrix& matrix::clone(const matrix& other)
+  {
+    if (this!=&other) {
+
+      delete_allocated_memory();
+
+      if (other.view_) {
+        view_ = new gsl_matrix_view(*other.view_);
+        proxy_m_ = m_ = &(view_->matrix);
+      }
+      else if (other.view_const_) {
+        view_const_ = new gsl_matrix_const_view(*other.view_const_);
+        proxy_m_ = &(view_const_->matrix);
+      }
+      else if (other.m_)
+        proxy_m_ = m_ = other.create_gsl_matrix_copy();
+
+      // 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;
+      }
+    }
+    return *this;
+  } 
+
+
+  size_t matrix::columns(void) const
+  {
+    if (!proxy_m_)
+      return 0;
+    return proxy_m_->size2;
+  }
+
+
+  gsl_matrix* matrix::create_gsl_matrix_copy(void) const
+  {
+    gsl_matrix* m = gsl_matrix_alloc(rows(),columns());
+    if (!m)
+      throw utility::GSL_error("matrix::create_gsl_matrix_copy failed to allocate memory");
+    if (gsl_matrix_memcpy(m,proxy_m_))
+      throw utility::GSL_error("matrix::create_gsl_matrix_copy dimension mis-match");
+    return m;
+  }
+
+
+  void matrix::delete_allocated_memory(void)
+  {
     if (view_)
       delete view_;
@@ -157 +212 @@
     else if (m_)
       gsl_matrix_free(m_);
-    if (blas_result_)
-      gsl_matrix_free(blas_result_);
     blas_result_=NULL;
-    m_=NULL;
-  }
-
-
-  const matrix& matrix::clone(const matrix& other)
-  {
-    if (this!=&other) {
-
-      if (view_)
-        delete view_;
-      else if (view_const_)
-        delete view_const_;
-      else if (m_)
-        gsl_matrix_free(m_);
-      proxy_m_=m_=NULL;
-
-      if (other.view_) {
-        view_ = new gsl_matrix_view(*other.view_);
-        proxy_m_ = m_ = &(view_->matrix);
-      }
-      else if (other.view_const_) {
-        view_const_ = new gsl_matrix_const_view(*other.view_const_);
-        proxy_m_ = &(view_const_->matrix);
-      }
-      else if (other.m_)
-        proxy_m_ = m_ = other.create_gsl_matrix_copy();
-
-      // 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;
-      }
-    }
-    return *this;
-  } 
-
-
-  size_t matrix::columns(void) const
-  {
-    if (!proxy_m_)
-      return 0;
-    return proxy_m_->size2;
-  }
-
-
-  gsl_matrix* matrix::create_gsl_matrix_copy(void) const
-  {
-    gsl_matrix* m = gsl_matrix_alloc(rows(),columns());
-    if (!m)
-      throw utility::GSL_error("matrix::create_gsl_matrix_copy failed to allocate memory");
-    if (gsl_matrix_memcpy(m,proxy_m_))
-      throw utility::GSL_error("matrix::create_gsl_matrix_copy dimension mis-match");
-    return m;
+    proxy_m_=m_=NULL;
   }
 
@@ -271 +271 @@
   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;
-      }
-  } 
+    delete_allocated_memory();
+
+    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;
+    }
+  }
 
 

trunk/yat/utility/matrix.h

@@ -421 +421 @@
     gsl_matrix* create_gsl_matrix_copy(void) const;
 
+    /**
+       \brief Clear all dynamically allocated memory.
+
+       Internal utility function.
+    */
+    void delete_allocated_memory(void);
+
     // blas_result_ is used to temporarily store result in BLAS calls
     // and when not NULL it should always have the same size as

trunk/yat/utility/vector.cc

@@ -190 +190 @@
   vector::~vector(void)
   {
-    if (view_)
-      delete view_;
-    else if (view_const_)
-      delete view_const_;
-    else if (v_)
-      gsl_vector_free(v_);
+    delete_allocated_memory();
   }
 
@@ -203 +198 @@
     if (this!=&other) {
 
-      if (view_)
-        delete view_;
-      else if (view_const_)
-        delete view_const_;
-      else if (v_)
-        gsl_vector_free(v_);
+      delete_allocated_memory();
 
       if (other.view_) {
@@ -235 +225 @@
       throw utility::GSL_error("vector::create_gsl_matrix_copy dimension mis-match");
     return vec;
+  }
+
+
+  void vector::delete_allocated_memory(void)
+  {
+    if (view_)
+      delete view_;
+    else if (view_const_)
+      delete view_const_;
+    else if (v_)
+      gsl_vector_free(v_);
+    proxy_v_=v_=NULL;
   }
 
@@ -293 +295 @@
   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_);
+    delete_allocated_memory();
     proxy_v_ = v_ = gsl_vector_alloc(n);
-
     if (!v_)
       throw utility::GSL_error("vector::vector failed to allocate memory");

trunk/yat/utility/vector.h

@@ -448 +448 @@
     gsl_vector* create_gsl_vector_copy(void) const;
 
+    /**
+       \brief Clear all dynamically allocated memory.
+
+       Internal utility function.
+    */
+    void delete_allocated_memory(void);
+
     gsl_vector* v_;
     gsl_vector_view* view_;