Changeset 1491

Timestamp:

Sep 12, 2008, 12:41:30 AM (15 years ago)

Author:

Peter

Message:

refs #439

Location:

trunk

Files:

• test/utility_test.cc (modified) (4 diffs)
• yat/utility/Makefile.am (modified) (2 diffs)
• yat/utility/sort_index.cc (added)
• yat/utility/sort_index.h (added)

trunk/test/utility_test.cc

@@ -26 +26 @@
 #include "yat/utility/Matrix.h"
 #include "yat/utility/utility.h"
+#include "yat/utility/Vector.h"
+#include "yat/utility/VectorConstView.h"
+#include "yat/utility/sort_index.h"
 #include "yat/utility/stl_utility.h"
 
@@ -45 +48 @@
                            const std::multimap<Key, size_t>& m,
                            test::Suite& suite);
+
+void test_sort_index(test::Suite& suite);
 
 int main(int argc, char* argv[])
@@ -149 +154 @@
 
   test_inverse(suite);
+  test_sort_index(suite);
 
   return suite.return_value();
@@ -214 +220 @@
   
 }
+
+void test_sort_index(test::Suite& suite)
+{
+  suite.err() << "testing sort_index" << std::endl;
+  utility::Vector a(10);
+  for (size_t i=0; i<a.size(); ++i)
+    a(i) = std::pow(i-4.2,2);
+  std::vector<size_t> vec;
+  utility::sort_index(vec, a);
+
+  std::vector<size_t> vec2;
+  utility::sort_index(a.begin(), a.end(), vec2);
+  if (vec.size()==vec2.size()) {
+    if (!suite.equal_range(vec.begin(), vec.end(), vec2.begin())) {
+      suite.add(false);
+    }
+  }
+  else {
+    suite.add(false);
+    suite.err() << "size mismatch: vec.size()=" << vec.size() 
+                << "vec2.size()=" << vec2.size() << "\n"; 
+  }
+  const utility::VectorConstView b(a, 0, 5, 2);
+
+  std::vector<size_t> vec3;
+  utility::sort_index(vec3, b);
+  std::vector<size_t> vec4;
+  utility::sort_index(b.begin(), b.end(), vec4);
+  if (vec3.size()!=vec4.size()) {
+    suite.add(false);
+    suite.err() << "size mismatch: vec3.size()=" << vec3.size() 
+                << " vec4.size()=" << vec4.size() << "\n"; 
+  }
+  else {
+    if (!suite.equal_range(vec3.begin(), vec3.end(), vec4.begin())){
+      suite.add(false);
+    }
+  }
+}

trunk/yat/utility/Makefile.am

@@ -30 +30 @@
   OptionFile.cc OptionInFile.cc OptionOutFile.cc \
   OptionHelp.cc OptionSwitch.cc \
-  PCA.cc stl_utility.cc SVD.cc TypeInfo.cc utility.cc Vector.cc \
+  PCA.cc sort_index.cc stl_utility.cc SVD.cc TypeInfo.cc utility.cc Vector.cc \
   VectorBase.cc VectorConstView.cc VectorMutable.cc VectorView.cc \
   version.cc WeNNI.cc
@@ -44 +44 @@
   Option.h OptionArg.h OptionFile.h OptionInFile.h OptionOutFile.h \
   OptionHelp.h OptionSwitch.h \
-  PCA.h SmartPtr.h Range.h stl_utility.h StrideIterator.h \
+  PCA.h SmartPtr.h sort_index.h Range.h stl_utility.h StrideIterator.h \
   SVD.h TypeInfo.h utility.h Vector.h \
   VectorBase.h VectorConstView.h VectorMutable.h VectorView.h \