Changeset 1710

Timestamp:

Jan 13, 2009, 5:35:23 PM (12 years ago)

Author:

Peter

Message:

avoid repeating code

Location:

trunk/yat/utility

Files:

• VectorConstView.cc (modified) (6 diffs)
• VectorConstView.h (modified) (3 diffs)

trunk/yat/utility/VectorConstView.cc

@@ -5 +5 @@
   Copyright (C) 2004 Jari Häkkinen, Peter Johansson
   Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson, Markus Ringnér
-  Copyright (C) 2008 Peter Johansson
+  Copyright (C) 2008, 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/trac/yat
@@ -24 +24 @@
 
 #include "VectorConstView.h"
+#include "VectorView.h"
 #include "Matrix.h"
 
@@ -34 +35 @@
     : 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);
+    copy(other);
   }
 
@@ -44 +42 @@
     : 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);
+    copy(other);
   }
 
@@ -79 +74 @@
 
 
+  void VectorConstView::copy(const VectorBase& other)
+  {
+    const_view_ = 
+      new gsl_vector_const_view(gsl_vector_const_subvector(other.gsl_vector_p(), 
+                                                           0, other.size()));
+    const_vec_ = &(const_view_->vector);
+  }
+
+
+  void VectorConstView::delete_allocated_memory(void)
+  {
+    delete const_view_;
+    const_view_=NULL;
+    const_vec_ = NULL;
+  }
+
+
   bool VectorConstView::isview(void) const
   {
@@ -84 +96 @@
   }
 
-
-
-  void VectorConstView::delete_allocated_memory(void)
-  {
-    if (const_view_){
-      delete const_view_;
-      const_view_=NULL;
-    }
-    const_vec_ = NULL;
-  }
-
-
 }}} // of namespace utility, yat, and thep

trunk/yat/utility/VectorConstView.h

@@ -10 +10 @@
   Copyright (C) 2006 Jari Häkkinen, Markus Ringnér
   Copyright (C) 2007 Jari Häkkinen, Peter Johansson, Markus Ringnér
-  Copyright (C) 2008 Peter Johansson
+  Copyright (C) 2008, 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/trac/yat
@@ -37 +37 @@
 
   class Matrix;
+  class VectorView;
 
   /**
@@ -111 +112 @@
 
   private:
+    void copy(const VectorBase& other);
     void delete_allocated_memory(void);