Changeset 1492

Timestamp:

Sep 12, 2008, 3:15:53 AM (15 years ago)

Author:

Peter

Message:

fixes #439

Location:

trunk

Files:

• test/utility_test.cc (modified) (2 diffs)
• yat/utility/sort_index.cc (modified) (2 diffs)
• yat/utility/sort_index.h (modified) (2 diffs)

trunk/test/utility_test.cc

@@ -33 +33 @@
 #include <fstream>
 #include <iostream>
+#include <list>
 #include <map>
 #include <string>
@@ -258 +259 @@
     }
   }
-}
+
+  std::list<double> list;
+  for (size_t i=0; i<a.size(); ++i)
+    list.push_back(a(i));
+  std::vector<size_t> vec5;
+  utility::sort_index(list.begin(), list.end(), vec5);
+  if (vec.size()!=vec5.size()) {
+    suite.add(false);
+    suite.err() << "size mismatch: vec.size()=" << vec.size() 
+                << " vec5.size()=" << vec5.size() << "\n"; 
+  }
+  else {
+    if (!suite.equal_range(vec.begin(), vec.end(), vec5.begin())){
+      suite.add(false);
+    }
+  }
+
+}

trunk/yat/utility/sort_index.cc

@@ -40 +40 @@
   void sort_index(StrideIterator<double*> first, 
                   StrideIterator<double*> last, 
-                  std::vector<size_t>& sort_index)
+                  std::vector<size_t>& result)
   {
-    // wont compile without namespace specification
-    utility::sort_index(static_cast<StrideIterator<const double*> >(first),
-                        static_cast<StrideIterator<const double*> >(last), 
-                        sort_index);
+    sort_index(static_cast<StrideIterator<const double*> >(first),
+               static_cast<StrideIterator<const double*> >(last), 
+               result);
   }
   
@@ -51 +50 @@
   void sort_index(std::vector<double>::iterator first, 
                   std::vector<double>::iterator last, 
-                  std::vector<size_t>& sort_index)
+                  std::vector<size_t>& result)
   {
-    utility::sort_index(static_cast<std::vector<double>::const_iterator>(first),
-                        static_cast<std::vector<double>::const_iterator>(last),
-                        sort_index);
+    sort_index(static_cast<std::vector<double>::const_iterator>(first),
+               static_cast<std::vector<double>::const_iterator>(last),
+               result);
   }
 

trunk/yat/utility/sort_index.h

@@ -27 +27 @@
 #include <gsl/gsl_sort.h>
 
+#include <algorithm>
+#include <iterator>
 #include <vector>
 
@@ -77 +79 @@
 
 
+  //  template implementation
+
+  template<typename ForwardIterator>
+  void sort_index(ForwardIterator first, ForwardIterator last, 
+                  std::vector<size_t>& result)
+  {
+    std::vector<double> vec;
+    vec.reserve(std::distance(first, last));
+    std::copy(first, last, 
+              std::back_insert_iterator<std::vector<double> >(vec));
+    sort_index(vec.begin(), vec.end(), result);
+  }
 
 }}} // of namespace utility, yat, and theplu