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

Timestamp:

Mar 9, 2007, 10:40:34 AM (15 years ago)

Author:

Peter

Message:

removed v_const in vector since it never used for anything but only assigned here and there

File:

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

trunk/yat/utility/vector.cc

@@ -5 +5 @@
   Copyright (C) 2004 Jari Häkkinen, Peter Johansson
   Copyright (C) 2005 Jari Häkkinen, Peter Johansson, Markus Ringnér
-  Copyright (C) 2006 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2007 Jari Häkkinen
+  Copyright (C) 2006, 2007 Jari Häkkinen, Peter Johansson
 
   This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -42 +41 @@
 
   vector::vector(void)
-    : v_(NULL), v_const_(NULL), view_(NULL), view_const_(NULL), proxy_v_(NULL)
+    : v_(NULL), view_(NULL), view_const_(NULL), proxy_v_(NULL)
   {
   }
@@ -48 +47 @@
 
   vector::vector(size_t n, double init_value)
-    : v_(gsl_vector_alloc(n)), v_const_(NULL), view_(NULL), view_const_(NULL),
+    : v_(gsl_vector_alloc(n)), view_(NULL), view_const_(NULL),
       proxy_v_(v_)
   {
@@ -59 +58 @@
 
   vector::vector(const vector& other)
-    : v_(other.create_gsl_vector_copy()), v_const_(NULL), view_(NULL),
+    : v_(other.create_gsl_vector_copy()), view_(NULL),
       view_const_(NULL), proxy_v_(v_)
   {
@@ -66 +65 @@
 
   vector::vector(vector& v, size_t offset, size_t n, size_t stride)
-    : v_const_(NULL), view_const_(NULL)
+    : view_const_(NULL)
   {
     view_ = new gsl_vector_view(gsl_vector_subvector_with_stride(v.v_,offset,
@@ -83 +82 @@
     if (!view_const_)
       throw utility::GSL_error("vector::vector failed to setup view");
-    proxy_v_ = v_const_ = &(view_const_->vector);
+    proxy_v_ = &(view_const_->vector);
+    const_cast<const gsl_vector*>(proxy_v_);
   }
 
 
   vector::vector(matrix& m, size_t i, bool row)
-    : v_const_(NULL), view_const_(NULL)
+    : view_const_(NULL)
   {
     view_=new gsl_vector_view(row ?
@@ -107 +107 @@
     if (!view_const_)
       throw utility::GSL_error("vector::vector failed to setup view");
-    proxy_v_ = v_const_ = &(view_const_->vector);
+    proxy_v_ = &(view_const_->vector);
   }
 
@@ -113 +113 @@
   vector::vector(std::istream& is, char sep)
     throw (utility::IO_error, std::exception)
-    : v_const_(NULL), view_(NULL), view_const_(NULL)
+    : view_(NULL), view_const_(NULL)
   {
     // read the data file and store in stl vectors (dynamically
@@ -347 +347 @@
       else if ( v_ )
         gsl_vector_free( v_ );
-      v_const_=NULL;
       proxy_v_ = v_ = other.create_gsl_vector_copy();
     }