Changeset 171:02f4d5d9bfd7 in lemon-main for test/counter_test.cc

Timestamp:

06/15/08 22:05:23 (16 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Children:

172:c94a80f38d7f, 173:b026e9779b28, 175:4eb8900a865c

Phase:

public

Message:

Improve and redesign test programs + unify their output (ticket #25)

• Move graph related utilities form test_tools.h to graph_test.h.
• Move the contents of graph_utils_test.h to graph_utils_test.cc.
• Rename map_test.h -> graph_maps_test.h.
• Rename digraph_test.h -> graph_test.h.
• Many improvements in the following files:
  • digraph_test.cc
  • graph_test.cc
  • graph_test.h
  • graph_maps_test.h
  • graph_utils_test.cc
  • bfs_test.cc
  • dfs_test.cc
  • counter_test.cc
• Test programs print messages only if it really seems necessary.
• Remove \file commands form .cc test files.

File:

• test/counter_test.cc (modified) (1 diff)

test/counter_test.cc

@@ -18 +18 @@
 
 #include <lemon/counter.h>
+#include <vector>
 
-///\file \brief Test cases for time_measure.h
-///
-///\todo To be extended
+using namespace lemon;
 
+template <typename T>
+void bubbleSort(std::vector<T>& v) {
+  Counter op("Bubble Sort - Operations: ");
+  Counter::NoSubCounter as(op, "Assignments: ");
+  Counter::NoSubCounter co(op, "Comparisons: ");
+  for (int i = v.size()-1; i > 0; --i) {
+    for (int j = 0; j < i; ++j) {
+      if (v[j] > v[j+1]) {
+        T tmp = v[j];
+        v[j] = v[j+1];
+        v[j+1] = tmp;
+        as += 3;
+      }
+      ++co;
+    }
+  }
+}
 
-int fibonacci(int f) 
-{
-  static lemon::Counter count("Fibonacci steps: ");
-  count++;
-  if(f<1) return 0;
-  else if(f==1) return 1;
-  else return fibonacci(f-1)+fibonacci(f-2);
+template <typename T>
+void insertionSort(std::vector<T>& v) {
+  Counter op("Insertion Sort - Operations: ");
+  Counter::NoSubCounter as(op, "Assignments: ");
+  Counter::NoSubCounter co(op, "Comparisons: ");
+  for (int i = 1; i < int(v.size()); ++i) {
+    T value = v[i];
+    ++as;
+    int j = i;
+    while (j > 0 && v[j-1] > value) {
+      v[j] = v[j-1];
+      --j;
+      ++co; ++as;
+    }
+    v[j] = value;
+    ++as;
+  }
+}
+
+template <typename MyCounter>
+void counterTest() {
+  MyCounter c("Main Counter: ");
+  c++;
+  typename MyCounter::SubCounter d(c, "SubCounter: ");
+  d++;
+  typename MyCounter::SubCounter::NoSubCounter e(d, "SubSubCounter: ");
+  e++;
+  d+=3;
+  c-=4;
+  e-=2;
+  c.reset(2);
+  c.reset();
+}
+
+void init(std::vector<int>& v) {
+  v[0] = 10; v[1] = 60; v[2] = 20; v[3] = 90; v[4] = 100;
+  v[5] = 80; v[6] = 40; v[7] = 30; v[8] = 50; v[9] = 70; 
 }
 
 int main()
 {
-  fibonacci(10);
+  counterTest<Counter>();
+  counterTest<NoCounter>();
   
-  {  
-    typedef lemon::Counter MyCounter;
-    MyCounter c("Main counter: ");
-    c++;
-    c++;
-    MyCounter::SubCounter d(c,"Subcounter: ");
-    d++;
-    d++;
-    MyCounter::SubCounter::SubCounter e(d,"SubSubCounter: ");
-    e++;
-    e++;
-  }
-  
-  {
-    typedef lemon::NoCounter MyCounter;
-    MyCounter c("Main counter: ");
-    c++;
-    c++;
-    MyCounter::SubCounter d(c,"Subcounter: ");
-    d++;
-    d++;
-    MyCounter::SubCounter::SubCounter e(d,"SubSubCounter: ");
-    e++;
-    e++;
-  }
+  std::vector<int> x(10);
+  init(x); bubbleSort(x);
+  init(x); insertionSort(x);
 
   return 0;