Changeset 879 for trunk

Timestamp:

Sep 21, 2007, 4:10:07 PM (16 years ago)

Author:

Markus Ringnér

Message:

Added support to utility::vector for gsl-functions that finds indices to the k largest/smallest elements in a vector

Location:

trunk

Files:

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

trunk/test/vector_test.cc

@@ -242 +242 @@
   } catch (utility::IO_error& err) {
     *message << err.what() << std::endl;
-    this_ok=true; // good, exceoption thrown, test passed
+    this_ok=true; // good, exception thrown, test passed
   }
   try {
@@ -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;
+
+  // Test sort algorithms
+  {
+    std::string data3("data/vector3.data");
+    std::ifstream data_stream3(data3.c_str());
+    utility::vector vec3(data_stream3);
+    std::vector<size_t> dummy;
+    dummy.push_back(100); // To make sure it works starting with a non-empty vector
+
+    utility::sort_index(dummy,vec3);
+    if(dummy.size()!=vec3.size()) {
+      ok=false;
+      *message << "Vector of sorted indices has incorrect size" << std::endl;
+    }
+    if(dummy[0]!=11 || dummy[dummy.size()-1]!=8) {
+      ok=false;
+      *message << "Vector of sorted indices incorrect" << std::endl;
+    }
+    size_t k=3;
+
+    utility::sort_smallest_index(dummy,k,vec3);
+    if(dummy.size()!=k) {
+      ok=false;
+      *message << "Vector of sorted smallest indices has incorrect size" << std::endl;
+    }
+    if(dummy[0]!=11 || dummy[dummy.size()-1]!=9) {
+      ok=false;
+      *message << "Vector of sorted smallest indices incorrect" << std::endl;
+    }
+
+    k=4;
+    utility::sort_largest_index(dummy,k,vec3);
+    if(dummy.size()!=k) {
+      ok=false;
+      *message << "Vector of sorted largest indices has incorrect size" << std::endl;
+    }
+    if(dummy[0]!=8 || dummy[dummy.size()-1]!=5) {
+      ok=false;
+      *message << "Vector of sorted largest indices incorrect" << std::endl;
+    }
   }
 

trunk/yat/utility/vector.cc

@@ -522 +522 @@
       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));
-    }
+    sort_index=std::vector<size_t>(p->data,p->data+p->size);
     gsl_permutation_free(p);
   }
 
+
+  void sort_smallest_index(std::vector<size_t>& sort_index, size_t k, 
+                            const vector& invec)
+  {
+    assert(invec.gsl_vector_p());
+    assert(k<=invec.size());
+    sort_index.resize(k);
+    gsl_sort_vector_smallest_index(&sort_index[0],k,invec.gsl_vector_p());
+  }
+  
+  void sort_largest_index(std::vector<size_t>& sort_index, size_t k, 
+                            const vector& invec)
+  {
+    assert(invec.gsl_vector_p());
+    assert(k<=invec.size());
+    sort_index.resize(k);
+    gsl_sort_vector_largest_index(&sort_index[0],k,invec.gsl_vector_p());
+  }
 
 

trunk/yat/utility/vector.h

@@ -547 +547 @@
   void sort_index(std::vector<size_t>& sort_index, const vector& invec);
 
+  /** Similar to sort_index but creates a vector with indices to the \a k
+  smallest elements in \a invec.  
+  */
+  void sort_smallest_index(std::vector<size_t>& sort_index, size_t k, const
+  vector& invec);
+
+  /** Similar to sort_index but creates a vector with indices to the \a k
+  largest elements in \a invec.  
+  */
+  void sort_largest_index(std::vector<size_t>& sort_index, size_t k, const
+  vector& invec);
+
+  
 
   /**