Changeset 1598 for trunk

Timestamp:

Oct 24, 2008, 11:12:37 PM (14 years ago)

Author:

Peter

Message:

Fixed some issues related to empty (zero sized) Matrix.

• Matrix(size_t, size_t) now accepts 0 as argument
• Matrix(const& Matrix) now works when passed Matrix is empty
• assignment now works when rhs is empty

related to ticket:343

Location:

trunk

Files:

• test/matrix_test.cc (modified) (1 diff)
• yat/utility/Matrix.cc (modified) (3 diffs)

trunk/test/matrix_test.cc

@@ -231 +231 @@
   m6*= unit3x3;
 
+  utility::Matrix m7(0,0);
+  m7.resize(1,1);
+  m7 = utility::Matrix(0,0);
+  m7.resize(0,0);
+  m7 = utility::Matrix(0,0);
+
   suite.return_value();
 }

trunk/yat/utility/Matrix.cc

@@ -49 +49 @@
 
   Matrix::Matrix(const size_t& r, const size_t& c, double init_value)
-    : blas_result_(NULL), m_(gsl_matrix_alloc(r,c))
-  {
-    if (!m_)
-      throw utility::GSL_error("Matrix::Matrix failed to allocate memory");
-    all(init_value);
+    : blas_result_(NULL), m_(NULL)
+  {
+    resize(r,c,init_value);
   }
 
@@ -217 +215 @@
   gsl_matrix* Matrix::create_gsl_matrix_copy(void) const
   {
+    if (!m_)
+      return NULL;
     gsl_matrix* m = gsl_matrix_alloc(rows(),columns());
     if (!m)
@@ -441 +441 @@
   const Matrix& Matrix::operator=( const Matrix& other )
   {
-    assert(other.m_);
     if (this!=&other) {
-      if ( !m_ || (other.m_->size1!=m_->size1) || (other.m_->size2!=m_->size2) )
-        resize(other.m_->size1,other.m_->size2);
-      if (gsl_matrix_memcpy(m_, other.gsl_matrix_p()))
-        throw utility::GSL_error("Matrix::create_gsl_matrix_copy dimension mis-match");
+      if (rows()!=other.rows() || columns()!=other.columns())
+        resize(other.rows(), other.columns());
+        
+      if (m_)
+        if (gsl_matrix_memcpy(m_, other.gsl_matrix_p())) {
+          std::string s="Matrix::create_gsl_matrix_copy dimension mis-match";
+          throw utility::GSL_error(s);
+        }
     }
     return *this;