Changeset 1130

Timestamp:

Feb 23, 2008, 7:49:29 PM (14 years ago)

Author:

Peter

Message:

some docs and fixed bug in VectorConstView?

Location:

trunk/yat/utility

Files:

• Vector.cc (modified) (1 diff)
• VectorConstView.cc (modified) (1 diff)
• VectorView.cc (modified) (1 diff)
• VectorView.h (modified) (4 diffs)

trunk/yat/utility/Vector.cc

@@ -162 +162 @@
       if (!vec_)
         throw utility::GSL_error("Vector failed to allocate memory");
-      gsl_vector_memcpy(vec_,other.gsl_vector_p());
+      if (gsl_vector_memcpy(vec_, other.gsl_vector_p()))
+        throw utility::GSL_error("Vector::assign memcpy failed.");
       const_vec_ = vec_;
     }

trunk/yat/utility/VectorConstView.cc

@@ -34 +34 @@
 
   VectorConstView::VectorConstView(const VectorConstView& other)
-    : VectorBase(other.gsl_vector_p()), const_view_(NULL)
+    : VectorBase(), const_view_(NULL)
   {
+    const_view_ = 
+      new gsl_vector_const_view(gsl_vector_const_subvector(other.gsl_vector_p(), 
+                                                           0, other.size()));
+    const_vec_ = &(const_view_->vector);
   }
 
 
   VectorConstView::VectorConstView(const VectorBase& other)
-    : VectorBase(other.gsl_vector_p()), const_view_(NULL)
+    : VectorBase(), const_view_(NULL)
   {
+    const_view_ = 
+      new gsl_vector_const_view(gsl_vector_const_subvector(other.gsl_vector_p(), 
+                                                           0, other.size()));
+    const_vec_ = &(const_view_->vector);
   }
 

trunk/yat/utility/VectorView.cc

@@ -103 +103 @@
   {
     if (size()!=other.size())
-      throw utility::GSL_error("VectorView::dimension mis-match");
+      throw utility::GSL_error("VectorView::assign dimension mis-match");
     if (!other.size())
       return *this;
-    gsl_vector_memcpy(vec_, other.gsl_vector_p());
+    if (gsl_vector_memcpy(vec_, other.gsl_vector_p()))
+      throw utility::GSL_error("VectorView::assign memcpy failed.");
     const_vec_ = vec_;
     return *this;

trunk/yat/utility/VectorView.h

@@ -90 +90 @@
        \brief Default constructor.
 
-       Creates a view into nothing and behaves like an empty vector.
+       Creates a view into nothing and behaves like an empty Vector.
     */
     VectorView(void);
@@ -122 +122 @@
        deleted, the view becomes invalid and the result of further use
        is undefined.
-
-       \throw GSL_error if a view cannot be set up.
     */
     VectorView(VectorMutable& v, size_t offset, size_t n, size_t stride=1);
@@ -168 +166 @@
        \note modifies underlying data.
 
-       \throw GSL_error if dimensions mis-match.
+       \throw GSL_error if dimensions mis-match or if assignment fails
     */
     const VectorView& operator=(const VectorView&);
@@ -179 +177 @@
        \note modifies underlying data.
 
-       \throw GSL_error if dimensions mis-match.
+       \throw GSL_error if dimensions mis-match or if assignment fails
     */
     const VectorView& operator=(const VectorBase&);