Changeset 753 for trunk/yat

Timestamp:

Feb 17, 2007, 2:33:24 PM (16 years ago)

Author:

Jari Häkkinen

Message:

Addresses #2. Continued adding GSL_error exceptions.

Location:

trunk/yat/utility

Files:

• matrix.cc (modified) (8 diffs)
• vector.cc (modified) (6 diffs)

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
 
   This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -46 +47 @@
 
   matrix::matrix(const size_t& r, const size_t& c, double init_value)
-    : view_(NULL)
-  {
-    m_ = gsl_matrix_alloc(r,c);
+    : m_(gsl_matrix_alloc(r,c)), view_(NULL)
+  {
+    if (!m_)
+      throw utility::GSL_error("matrix::matrix failed to allocate memory");
     set_all(init_value);
   }
@@ -54 +56 @@
 
   matrix::matrix(const matrix& o)
-    : view_(NULL)
-  {
-    m_ = o.create_gsl_matrix_copy();
+    : m_(o.create_gsl_matrix_copy()), view_(NULL)
+  {
   }
 
@@ -69 +70 @@
                                                      offset_row,offset_column,
                                                      n_row,n_column));
+    if (!view_)
+      throw utility::GSL_error("matrix::matrix failed to setup view");
     m_ = &(view_->matrix);
   }
@@ -137 +140 @@
     // convert the data to a gsl matrix
     m_ = gsl_matrix_alloc ( nof_rows, nof_columns );
+    if (!m_)
+      throw utility::GSL_error("matrix::matrix failed to allocate memory");
     for(u_int i=0;i<nof_rows;i++)
       for(u_int j=0;j<nof_columns;j++)
@@ -176 +181 @@
   {
     gsl_matrix* m = gsl_matrix_alloc(rows(),columns());
+    if (!m)
+      throw utility::GSL_error("matrix::create_gsl_matrix_copy failed to allocate memory");
     gsl_matrix_memcpy(m,m_);  // Jari, a GSL return value is ignored here
     return m;
@@ -340 +347 @@
     else {
       gsl_matrix* transposed = gsl_matrix_alloc(columns(),rows());
+      if (!transposed)
+        throw utility::GSL_error("matrix::transpose failed to allocate memory");
       gsl_matrix_transpose_memcpy(transposed,m_);
       gsl_matrix_free(m_);
@@ -408 +417 @@
   {
     gsl_matrix* result = gsl_matrix_alloc(rows(),other.columns());
+    if (!result)
+      throw utility::GSL_error("matrix::operator*= failed to allocate memory");
     gsl_blas_dgemm(CblasNoTrans, CblasNoTrans, 1.0, m_, other.m_, 0.0, result);
     gsl_matrix_free(m_);

trunk/yat/utility/vector.cc

@@ -6 +6 @@
   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
 
   This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -49 +50 @@
       proxy_v_(v_)
   {
+    if (!v_)
+      throw utility::GSL_error("vector::vector failed to allocate memory");
+
     set_all(init_value);
   }
@@ -68 +72 @@
     view_ = new gsl_vector_view(gsl_vector_subvector_with_stride(v.v_,offset,
                                                                  stride,n));
+    if (!view_)
+      throw utility::GSL_error("vector::vector failed to setup view");
     proxy_v_ = v_ = &(view_->vector);
   }
@@ -80 +86 @@
     view_const_ = new gsl_vector_const_view(
                    gsl_vector_const_subvector_with_stride(v.v_,offset,stride,n));
+    if (!view_const_)
+      throw utility::GSL_error("vector::vector failed to setup view");
     proxy_v_ = v_const_ = &(view_const_->vector);
   }
@@ -170 +178 @@
     // convert the data to a gsl vector
     proxy_v_ = v_ = gsl_vector_alloc(nof_rows*nof_columns);
+    if (!v_)
+      throw utility::GSL_error("vector::vector failed to allocate memory");
     size_t n=0;
     for (size_t i=0; i<nof_rows; i++)
@@ -203 +213 @@
   {
     gsl_vector* vec = gsl_vector_alloc(size());
+    if (!vec)
+      throw utility::GSL_error("vector::create_gsl_vector_copy failed to allocate memory");
     gsl_vector_memcpy(vec, proxy_v_);
     return vec;