Changeset 796 for trunk/yat/utility

Timestamp:

Mar 12, 2007, 11:18:55 PM (16 years ago)

Author:

Jari Häkkinen

Message:

Fixes #201.

File:

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

trunk/yat/utility/matrix.cc

@@ -174 +174 @@
       else if (m_)
         gsl_matrix_free(m_);
-      if (blas_result_) {
-        gsl_matrix_free(blas_result_);
-        blas_result_=NULL;
-      }
       proxy_m_=m_=NULL;
 
@@ -191 +187 @@
         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;
@@ -433 +435 @@
   {
     assert(m_);
+    if ( blas_result_ && ((blas_result_->size1!=rows()) ||
+                          (blas_result_->size2!=other.columns())) ) {
+      gsl_matrix_free(blas_result_);
+      blas_result_=NULL;
+    }
     if (!blas_result_) {
       blas_result_ = gsl_matrix_alloc(rows(),other.columns());