Changeset 257

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.

Location:

trunk

Files:

• src/Makefile.am (modified) (2 diffs)
• src/gslapi_utility.cc (added)
• src/gslapi_utility.h (added)
• src/vector.cc (modified) (3 diffs)
• src/vector.h (modified) (2 diffs)
• test/test_vector.cc (modified) (2 diffs)

trunk/src/Makefile.am

@@ -10 +10 @@
   Alignment.cc Averager.cc AveragerPair.cc ConsensusInputRanker.cc  \
   CrossValidation.cc FileIO.cc Fisher.cc GaussianKernelFunction.cc  \
+  gslapi_utility.cc \
   Histogram.cc InputRanker.cc Kernel.cc kNNI.cc matrix.cc Merge.cc  \
   NNI.cc PCA.cc PolynomialKernelFunction.cc random_singleton.cc     \
@@ -22 +23 @@
   Alignment.h Averager.h AveragerPair.h ConsensusInputRanker.h        \
   CrossValidation.h FileIO.h Fisher.h GaussianKernelFunction.h        \
+  gslapi_utility.h \
   Histogram.h InputRanker.h Kernel.h KernelFunction.h kNNI.h matrix.h \
   Merge.h NNI.h PCA.h Pearson.h PolynomialKernelFunction.h            \

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

trunk/src/vector.h

@@ -68 +68 @@
 
     ///
+    /// The vector view constructor.
+    ///
+    /// Create a view of vector \a v, with starting index \a offset,
+    /// size \a n, and an optional \a stride.
+    ///
+    /// A vector view can be used as any vector with the difference
+    /// that changes made to the view will also change the object that
+    /// is viewed. Also, using the copy constructor will create a new
+    /// vector object that is a copy of whatever is viewed. If a copy
+    /// of the view is needed the you should use this consturctor to
+    /// get one.
+    ///
+    /// @note If the object viewed by the view goes out of scope or is
+    /// deleted, the view becomes invalid.
+    ///
+    vector(vector& v, size_t offset, size_t n, size_t stride=1);
+
+    ///
     /// Constructor that imports a GSL vector. The GSL object is owned
     /// by the created object.
@@ -178 +196 @@
     // Jari, doxygen group as Finding maximum and minimum elements
     std::pair<size_t,size_t> vector::minmax_index(void) const;
-
-    ///This function returns the indices of the minimum and maximum
-    ///values in the sub-vector (defined by \a subset), storing them
-    ///in imin and imax. When there are several equal minimum or
-    ///maximum elements then the lowest indices are returned. The
-    ///returned index is the index from the complete vector (not the
-    ///sub-vector)
-    ///
-    /// @return Index corresponding to the smallest and largest value.
-    ///
-    std::pair<size_t,size_t> 
-    vector::TEMP_minmax_index(const std::vector<size_t>& subset ) const;
 
     ///

trunk/test/test_vector.cc

@@ -1 +1 @@
 // $Id$
 
-// C++ tools include
-////////////////////
 #include "vector.h"
 
-using namespace std;
-
-int main()
-
+int main(const int argc,const char* argv[])
 {  
   bool ok = true;
-  theplu::gslapi::vector vec(10);
+
+  theplu::gslapi::vector vec(12);
   for (unsigned int i=0; i<vec.size(); i++) 
     vec(i)=i;
+
+  // checking that shuffle works
   double sum_before = vec.sum();
   vec.shuffle();
@@ -19 +17 @@
   if (sum_after != sum_before)
     ok = false;
-  
-  if (ok)
+
+  // checking that view works
+  sum_before=0;
+  for (unsigned int i=0; i<vec.size(); i+=2) 
+    sum_before+=vec[i];
+  theplu::gslapi::vector vec_view(vec,0,6,2);
+  sum_after=vec_view.sum();
+  if (sum_after != sum_before)
+    ok = false;
+  vec[0]=0;
+  vec_view[0]=24;
+  if (vec[0]!=vec_view[0])
+    ok=false;
+
+  // checking that copy contrutor creates an independent object
+  theplu::gslapi::vector vec2(vec);
+  if (vec.size()!=vec2.size())
+    ok=false;
+  if (&vec2 == &vec)
+    ok=false;
+  if (vec2.isview())
+    ok=false;
+
+  // checking that copy contrutor creates an independent object when
+  // copying a view
+  vec2=vec_view;
+  if (vec_view.size()!=vec2.size())
+    ok=false;
+  if ((&vec2 == &vec_view) || (&vec2 == &vec))
+    ok=false;
+  if (vec2.isview())
+    ok=false;
+  vec2[0]=0;
+  vec_view[0]=24;
+  if (vec2[0]==vec_view[0])
+    ok=false;
+
+  if (ok) {
+    std::cout << "test_vector: SUCCESS\n";
     return 0;
+  }
+  std::cerr << "test_vector: FAILED\n";
   return -1;
 }