Changeset 3169

Timestamp:

Jan 22, 2014, 8:41:42 AM (10 years ago)

Author:

Peter

Message:

use private function create_gsl_vector rather than calling gsl function and repeating code for error detection

File:

• trunk/yat/utility/Vector.cc (modified) (4 diffs)

trunk/yat/utility/Vector.cc

@@ -112 +112 @@
 
     // convert the data to a gsl vector
-    vec_ = gsl_vector_alloc(nof_rows*nof_columns);
-    if (!vec_)
-      throw utility::GSL_error("Vector::Vector failed to allocate memory");
+    vec_ = create_gsl_vector(nof_rows*nof_columns);
     size_t n=0;
     // if gsl error handler disabled, out of bounds index will not
@@ -166 +164 @@
     if (!other.size())
       return NULL;
-    gsl_vector* vec = gsl_vector_alloc(other.size());
-    if (!vec)
-      throw utility::GSL_error("Vector::create_gsl_vector_copy failed to allocate memory");
+    gsl_vector* vec = create_gsl_vector(other.size());
     if (gsl_vector_memcpy(vec, other.gsl_vector_p()))
       throw utility::GSL_error("Vector::create_gsl_vector_copy memcpy failed");
@@ -181 +177 @@
     gsl_vector* vec = gsl_vector_alloc(n);
     if (!vec)
-      throw utility::GSL_error("Vector::create_gsl_vector failed to allocate memory");
+      throw utility::GSL_error("Vector: failed to allocate memory");
     return vec;
   }
@@ -205 +201 @@
     if (!n)
       return;
-    const_vec_ = vec_ = gsl_vector_alloc(n);
-    if (!vec_)
-      throw utility::GSL_error("Vector::resize failed to allocate memory");
+    const_vec_ = vec_ = create_gsl_vector(n);
     all(init_value);
   }