Changeset 1135

Timestamp:

Feb 24, 2008, 12:40:27 AM (16 years ago)

Author:

Peter

Message:

fixes self assignment in Vector - fixes #339

Location:

trunk

Files:

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

trunk/test/vector_test.cc

@@ -314 +314 @@
   }
 
-  /*
   {
     utility::Vector vec(10, 2.3);
@@ -338 +337 @@
     }
   }
-  */
 
   // test for ticket:285

trunk/yat/utility/Vector.cc

@@ -156 +156 @@
   const Vector& Vector::assign(const VectorBase& other)
   {
+    // avoid self assignment
+    if (this == &other)
+      return *this;
+    if (!other.size()){
+      delete_allocated_memory();
+      return *this;
+    }
+    // indirect self assignment if begin <= other.begin() < end 
+    if (begin() <= other.begin() && other.begin()<end()) {
+      if (size() != other.size()) {
+        gsl_vector* tmp = create_gsl_vector_copy(other);
+        delete_allocated_memory();
+        const_vec_ = vec_ = tmp;
+      }
+      return *this;
+    } 
     delete_allocated_memory();
-    if (other.size()) {
-      if (size()!=other.size())
-        vec_ = gsl_vector_alloc(other.size());
-      if (!vec_)
-        throw utility::GSL_error("Vector failed to allocate memory");
-      if (gsl_vector_memcpy(vec_, other.gsl_vector_p()))
-        throw utility::GSL_error("Vector::assign memcpy failed.");
-      const_vec_ = vec_;
-    }
+    vec_ = create_gsl_vector_copy(other);
+    const_vec_ = vec_;
     return *this;
   }