Changeset 567:efaa79ee8d14 in lemon-0.x for src/test

Timestamp:

05/07/04 08:57:50 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@742

Message:

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

Location:

src/test

Files:

• Makefile.am (modified) (1 diff)
• graph_test.cc (modified) (3 diffs)
• time_measure_test.cc (moved) (moved from src/test/time_measure.cc) (1 diff)

src/test/Makefile.am

@@ -1 +1 @@
 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
+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

src/test/graph_test.cc

@@ -2 +2 @@
 #include<hugo/smart_graph.h>
 #include<hugo/skeletons/graph.h>
+#include"test_tools.h"
+
 //#include<../work/alpar/list_graph.h>
 
@@ -12 +14 @@
 
 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) 
@@ -173 +161 @@
 }
 
-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)
 {

src/test/time_measure_test.cc

@@ -12 +12 @@
   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;
 }