Changeset 754 for trunk/yat/utility/vector.cc

Timestamp:

Feb 17, 2007, 11:33:44 PM (15 years ago)

Author:

Jari Häkkinen

Message:

Addresses #2 and #65. Continued adding GSL_error exceptions, and added doxygen briefs.

File:

• trunk/yat/utility/vector.cc (modified) (10 diffs)

trunk/yat/utility/vector.cc

@@ -67 +67 @@
     : v_const_(NULL), view_const_(NULL)
   {
-    // Jari, exception handling needed here. Failure in setting up a
-    // proper gsl_vector_view is communicated by NULL pointer in the
-    // view structure (cf. GSL manual). How about GSL error state?
     view_ = new gsl_vector_view(gsl_vector_subvector_with_stride(v.v_,offset,
                                                                  stride,n));
@@ -81 +78 @@
     : v_(NULL), view_(NULL)
   {
-    // Jari, exception handling needed here. Failure in setting up a
-    // proper gsl_vector_view is communicated by NULL pointer in the
-    // view structure (cf. GSL manual). How about GSL error state?
     view_const_ = new gsl_vector_const_view(
                    gsl_vector_const_subvector_with_stride(v.v_,offset,stride,n));
@@ -181 +175 @@
       throw utility::GSL_error("vector::vector failed to allocate memory");
     size_t n=0;
+    // if gsl error handler disabled, out of bounds index will not
+    // abort the program.
     for (size_t i=0; i<nof_rows; i++)
       for (size_t j=0; j<nof_columns; j++) 
@@ -198 +194 @@
 
 
-  int vector::add(const vector& other)
-  {
-    return gsl_vector_add(v_,other.v_);
-  }
-
-
-  int vector::add(double term)
-  {
-    return gsl_vector_add_constant(v_,term);
+  void vector::add(const vector& other)
+  {
+    int status=gsl_vector_add(v_,other.v_);
+    if (status)
+      throw utility::GSL_error(std::string("vector::add",status));
+  }
+
+
+  void vector::add(double term)
+  {
+    gsl_vector_add_constant(v_,term);
   }
 
@@ -215 +213 @@
     if (!vec)
       throw utility::GSL_error("vector::create_gsl_vector_copy failed to allocate memory");
-    gsl_vector_memcpy(vec, proxy_v_);
+    if (gsl_vector_memcpy(vec, proxy_v_))
+      throw utility::GSL_error("vector::create_gsl_matrix_copy dimension mis-match");
     return vec;
   }
@@ -302 +301 @@
 
 
-  int vector::scale(double factor)
-  {
-    return gsl_vector_scale(v_,factor);
-  }
-
-
-  int vector::set(const vector& vec)
-  {
-    return gsl_vector_memcpy(v_,vec.v_);
+  void vector::scale(double factor)
+  {
+    gsl_vector_scale(v_,factor);
+  }
+
+
+  void vector::set(const vector& vec)
+  {
+    if (gsl_vector_memcpy(v_,vec.v_))
+      throw utility::GSL_error("vector::set dimension mis-match");
   }
 
@@ -346 +346 @@
 
 
-  int vector::sub(const vector& other)
-  {
-    return gsl_vector_sub(v_,other.v_);
+  void vector::sub(const vector& other)
+  {
+    int status=gsl_vector_sub(v_,other.v_);
+    if (status)
+      throw utility::GSL_error(std::string("vector::sub",status));
   }
 
@@ -435 +437 @@
   const vector& vector::operator+=(const vector& other)
   {
-    gsl_vector_add(v_,other.v_);
+    add(other);
     return *this;
   }
@@ -442 +444 @@
   const vector& vector::operator-=(const vector& other)
   {
-    gsl_vector_sub(v_,other.v_);
+    sub(other);
     return *this;
   }
@@ -449 +451 @@
   const vector& vector::operator*=(const double d)
   {
-    gsl_vector_scale(v_,d);
+    scale(d);
     return *this;
   }