Changeset 1506

Timestamp:

Sep 17, 2008, 12:53:55 AM (15 years ago)

Author:

Peter

Message:

fixes #434

Location:

trunk

Files:

• test/vector_test.cc (modified) (1 diff)
• yat/utility/Vector.cc (modified) (2 diffs)
• yat/utility/Vector.h (modified) (1 diff)

trunk/test/vector_test.cc

@@ -341 +341 @@
   }
 
+  // test for zero size constructor
+  {
+    theplu::yat::utility::Vector vec(0, 1.2);
+    theplu::yat::utility::Vector vec2(vec);
+  }
   return suite.return_value();
 }

trunk/yat/utility/Vector.cc

@@ -46 +46 @@
 
   Vector::Vector(size_t n, double init_value)
-    : VectorMutable(gsl_vector_alloc(n))
-  {
-    if (!vec_)
-      throw utility::GSL_error("Vector::Vector failed to allocate memory");
-    assert(const_vec_);
-    all(init_value);
+    : VectorMutable(create_gsl_vector(n))
+  {
+    if (n)
+      all(init_value);
+    assert(n==0 || vec_);
+    assert(n==0 || const_vec_);
   }
 
@@ -204 +204 @@
 
 
+  gsl_vector* Vector::create_gsl_vector(size_t n) const
+  {
+    if (!n)
+      return NULL;
+    gsl_vector* vec = gsl_vector_alloc(n);
+    if (!vec)
+      throw utility::GSL_error("Vector::create_gsl_vector failed to allocate memory");
+    return vec;
+  }
+
+
   void Vector::delete_allocated_memory(void) 
   {

trunk/yat/utility/Vector.h

@@ -164 +164 @@
     gsl_vector* create_gsl_vector_copy(const VectorBase&) const;
 
+    /**
+       \brief Create a new gsl vector
+
+       Necessary memory for the new GSL vector is allocated and the
+       caller is responsible for freeing the allocated memory.
+
+       \return A pointer to created GSL vector.
+
+       \throw GSL_error if memory cannot be allocated for the new
+       GSL vector.
+    */
+    gsl_vector* create_gsl_vector(size_t n) const;
+
     void delete_allocated_memory(void);
   };