Changeset 257 for trunk/src/vector.cc

Timestamp:

Mar 4, 2005, 1:53:34 AM (18 years ago)

Author:

Jari Häkkinen

Message:

Added vector views and made vector member functions to be non-member functions.

File:

• trunk/src/vector.cc (modified) (3 diffs)

trunk/src/vector.cc

@@ -39 +39 @@
   {
     v_ = other.TEMP_gsl_vector_copy();
+  }
+
+
+
+  vector::vector(vector& v, size_t offset, size_t n, size_t stride)
+  {
+    view_ = new gsl_vector_view(gsl_vector_subvector_with_stride(v.v_,offset,
+                                                                 stride,n));
+    v_ = &(view_->vector);
   }
 
@@ -125 +134 @@
   vector::~vector(void)
   {
-    if (v_) {
+    if (view_)
+      delete view_;
+    else if (v_)
       gsl_vector_free(v_);
-      v_=NULL;
-    }
-    delete view_;
+    v_=NULL;
   }
 
@@ -160 +169 @@
 
 
-
-/* Jari, remove this section
-  std::pair<size_t,size_t> vector::minmax_index(const std::vector<size_t>& subset ) const
-  {
-    size_t min_index = subset[0];
-    size_t max_index = subset[0];
-    for (unsigned int i=1; i<subset.size(); i++) {
-      if (gsl_vector_get( v_, subset[i]) < gsl_vector_get( v_, min_index))
-        min_index = subset[i];
-      else if (gsl_vector_get( v_, subset[i]) > gsl_vector_get( v_, max_index))
-        max_index = subset[i];
-    }
-    return std::pair<size_t,size_t>(min_index, max_index);
-  }
-*/
 
   void vector::shuffle(void) const