Changeset 877

Timestamp:

Sep 20, 2007, 9:01:57 PM (14 years ago)

Author:

Markus Ringnér

Message:

This revision breaks the vector_test. I know this is against the rules but it is intented for getting help from Jari to identify linking problem. A new function sort_index is added to vector, and tested in vector_test. Everything compiles but vector_test fails to link and I cannot see why

Location:

trunk

Files:

• test/vector_test.cc (modified) (1 diff)
• yat/utility/vector.cc (modified) (1 diff)
• yat/utility/vector.h (modified) (1 diff)

trunk/test/vector_test.cc

@@ -267 +267 @@
   ok &= this_ok;
 
+  std::string data3("data/vector3.data");
+  std::ifstream data_stream3(data3.c_str());
+  utility::vector vec3(data_stream3);
+  std::vector<size_t> dummy;
+  utility::sort_index(dummy,vec3);
+  for(size_t i=0;i<dummy.size();i++) {
+    *message << "dummy: " << dummy[i] << std::endl;
+  }
+
   if (!ok)
     *message << "vector test failed" << std::endl;

trunk/yat/utility/vector.cc

@@ -513 +513 @@
 
 
+  void sort_index(std::vector<size_t>& sort_index, const vector& invec)
+  {
+    assert(invec.gsl_vector_p());
+    gsl_permutation* p = gsl_permutation_alloc(invec.size());
+    int status=gsl_sort_vector_index(p,invec.gsl_vector_p());
+    if (status) {
+      gsl_permutation_free(p);
+      throw utility::GSL_error(std::string("sort_index(vector&,const vector&)",status));      
+    }
+    for(size_t i=0;i<p->size;i++) {
+      sort_index.resize(0);
+      sort_index.push_back(gsl_permutation_get(p,i));
+    }
+    gsl_permutation_free(p);
+  }
+
+
+
   double sum(const vector& v)
   {

trunk/yat/utility/vector.h

@@ -536 +536 @@
 
   /**
+     Create a vector \a sort_index containing the indeces of
+     elements in a another vector \a invec.  The elements of \a
+     sort_index give the index of the vector element which would
+     have been stored in that position if the vector had been sorted
+     in place. The first element of \a sort_index gives the index of the least
+     element in \a invec, and the last element of \a sort_index gives the index of the
+     greatest element in \a invec . The vector \a invec is not changed.
+
+  */
+  void sort_index(std::vector<size_t>& sort_index, vector& invec);
+
+
+  /**
      \brief Calculate the sum of all vector elements.