[Lemon-commits] [lemon_svn] alpar: r742 - in hugo/trunk: doc src/test

[Lemon SVN]

Author: alpar
Date: Fri May  7 08:57:50 2004
New Revision: 742

Added:
   hugo/trunk/src/test/time_measure_test.cc
      - copied, changed from r741, /hugo/trunk/src/test/time_measure.cc
Removed:
   hugo/trunk/src/test/time_measure.cc
Modified:
   hugo/trunk/doc/Doxyfile
   hugo/trunk/src/test/Makefile.am
   hugo/trunk/src/test/graph_test.cc

Log:
time_measure.cc was renamed to time_measure_test.cc
Add an alternative dijsktra_test.cc


Modified: hugo/trunk/doc/Doxyfile
==============================================================================
--- hugo/trunk/doc/Doxyfile	(original)
+++ hugo/trunk/doc/Doxyfile	Fri May  7 08:57:50 2004
@@ -399,7 +399,8 @@
                          ../src/work/alpar/list_graph.h \
                          ../src/work/athos/minlengthpaths.h \
                          ../src/work/klao/path.h \
-                         ../src/work/jacint/max_flow.h
+                         ../src/work/jacint/max_flow.h \
+                         ../src/test/test_tools.h 
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

Modified: hugo/trunk/src/test/Makefile.am
==============================================================================
--- hugo/trunk/src/test/Makefile.am	(original)
+++ hugo/trunk/src/test/Makefile.am	Fri May  7 08:57:50 2004
@@ -1,9 +1,10 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
-check_PROGRAMS = graph_test time_measure
+check_PROGRAMS = graph_test dijkstra_test time_measure_test 
 
 TESTS = $(check_PROGRAMS)
 XFAIL_TESTS =
 
-graph_test_SOURCES = graph_test.cc
-time_measure_SOURCES = time_measure.cc
\ No newline at end of file
+graph_test_SOURCES = graph_test.cc test_tools.h
+dijkstra_test_SOURCES = dijkstra_test.cc test_tools.h
+time_measure_test_SOURCES = time_measure_test.cc
\ No newline at end of file

Modified: hugo/trunk/src/test/graph_test.cc
==============================================================================
--- hugo/trunk/src/test/graph_test.cc	(original)
+++ hugo/trunk/src/test/graph_test.cc	Fri May  7 08:57:50 2004
@@ -1,6 +1,8 @@
 #include<iostream>
 #include<hugo/smart_graph.h>
 #include<hugo/skeletons/graph.h>
+#include"test_tools.h"
+
 //#include<../work/alpar/list_graph.h>
 
 /*
@@ -12,20 +14,6 @@
 
 using namespace hugo;
 
-// void check(bool rc, const char *msg) {
-//   if(!rc) {
-//     std::cerr << msg << std::endl;
-//     exit(1);
-//   }
-// }
-
-#define check(rc, msg) \
-  if(!rc) { \
-    std::cerr << __FILE__ ":" << __LINE__ << ": error: " << msg << std::endl; \
-    exit(1); \
-  } else { } \
-
-
 template<class Graph> void checkCompile(Graph &G) 
 {
   typedef typename Graph::Node Node;
@@ -172,31 +160,6 @@
   
 }
 
-template<class Graph> struct PetNodes
-{
-  std::vector<typename Graph::Node> outer, inner;
-  std::vector<typename Graph::Edge> outcir, incir, cons;
-};
-
-template<class Graph> PetNodes<Graph> addPetersen(Graph &G,int num=5)
-{
-  //std::vector<typename Graph::Node> outer, inner;
-  
-  PetNodes<Graph> n;
-
-  for(int i=0;i<num;i++) {
-    n.outer.push_back(G.addNode());
-    n.inner.push_back(G.addNode());
-  }
-
- for(int i=0;i<num;i++) {
-   n.cons.push_back(G.addEdge(n.outer[i],n.inner[i]));
-   n.outcir.push_back(G.addEdge(n.outer[i],n.outer[(i+1)%5]));
-   n.incir.push_back(G.addEdge(n.inner[i],n.inner[(i+2)%5]));
-  }
- return n;
-}
-
 template<class Graph> void checkNodeList(Graph &G, int nn)
 {
   typename Graph::NodeIt n(G);

Copied: hugo/trunk/src/test/time_measure_test.cc (from r741, /hugo/trunk/src/test/time_measure.cc)
==============================================================================
--- /hugo/trunk/src/test/time_measure.cc	(original)
+++ hugo/trunk/src/test/time_measure_test.cc	Fri May  7 08:57:50 2004
@@ -11,11 +11,11 @@
 {
   int j=0;
   Timer T;
-  for(int i=0;i++;i<100) j+=2;
+  for(int i=0;i<100;i++) j+=2;
   std::cout << T << '\n';
   T.reset();
-  for(int i=0;i++;i<100) j+=2;
+  for(int i=0;i<100;i++) j+=2;
   std::cout << T << '\n';
-
+  
   return 0;
 }