Changes in test/graph_test.cc [149:2f7ae34e1333:109:abddaa08b507] in lemon-main

File:

• test/graph_test.cc (modified) (4 diffs)

test/graph_test.cc

@@ -23 +23 @@
 // #include <lemon/grid_graph.h>
 
-#include <lemon/graph_utils.h>
+//#include <lemon/graph_utils.h>
 
 #include "test_tools.h"
@@ -83 +83 @@
 
 template <typename Graph>
-void check_graph_counts() {
-
-  TEMPLATE_GRAPH_TYPEDEFS(Graph);
+void print_items(Graph &g) {
+
+  typedef typename Graph::NodeIt NodeIt;
+  typedef typename Graph::EdgeIt EdgeIt;
+  typedef typename Graph::ArcIt ArcIt;
+
+  std::cout << "Nodes" << std::endl;
+  int i=0;
+  for(NodeIt it(g); it!=INVALID; ++it, ++i) {
+    std::cout << "  " << i << ": " << g.id(it) << std::endl;
+  }
+
+  std::cout << "Edge" << std::endl;
+  i=0;
+  for(EdgeIt it(g); it!=INVALID; ++it, ++i) {
+    std::cout << "  " << i << ": " << g.id(it) 
+         << " (" << g.id(g.source(it)) << ", " << g.id(g.target(it)) 
+         << ")" << std::endl;
+  }
+
+  std::cout << "Arc" << std::endl;
+  i=0;
+  for(ArcIt it(g); it!=INVALID; ++it, ++i) {
+    std::cout << "  " << i << ": " << g.id(it)
+         << " (" << g.id(g.source(it)) << ", " << g.id(g.target(it)) 
+         << ")" << std::endl;
+  }
+
+}
+
+template <typename Graph>
+void check_graph() {
+
+  typedef typename Graph::Node Node;
+  typedef typename Graph::Edge Edge;
+  typedef typename Graph::Arc Arc;
+  typedef typename Graph::NodeIt NodeIt;
+  typedef typename Graph::EdgeIt EdgeIt;
+  typedef typename Graph::ArcIt ArcIt;
+
   Graph g;
 
@@ -99 +136 @@
     e2 = g.addEdge(n2, n3);
 
+  // print_items(g);
+
   check_item_counts(g,3,2);
 }
-
-template <typename Graph>
-void check_graph_validity() {
-
-  TEMPLATE_GRAPH_TYPEDEFS(Graph);
-  Graph g;
-
-  check_item_counts(g,0,0);
-
-  Node
-    n1 = g.addNode(),
-    n2 = g.addNode(),
-    n3 = g.addNode();
-
-  Edge
-    e1 = g.addEdge(n1, n2),
-    e2 = g.addEdge(n2, n3);
-
-  check(g.valid(n1), "Validity check");
-  check(g.valid(e1), "Validity check");
-  check(g.valid(g.direct(e1, true)), "Validity check");
-
-  check(!g.valid(g.nodeFromId(-1)), "Validity check");
-  check(!g.valid(g.edgeFromId(-1)), "Validity check");
-  check(!g.valid(g.arcFromId(-1)), "Validity check");
-    
-}
-
-template <typename Graph>
-void check_graph_validity_erase() {
-
-  TEMPLATE_GRAPH_TYPEDEFS(Graph);
-  Graph g;
-
-  check_item_counts(g,0,0);
-
-  Node
-    n1 = g.addNode(),
-    n2 = g.addNode(),
-    n3 = g.addNode();
-
-  Edge
-    e1 = g.addEdge(n1, n2),
-    e2 = g.addEdge(n2, n3);
-
-  check(g.valid(n1), "Validity check");
-  check(g.valid(e1), "Validity check");
-  check(g.valid(g.direct(e1, true)), "Validity check");
-
-  g.erase(n1);
-
-  check(!g.valid(n1), "Validity check");
-  check(g.valid(n2), "Validity check");
-  check(g.valid(n3), "Validity check");
-  check(!g.valid(e1), "Validity check");
-  check(g.valid(e2), "Validity check");
-
-  check(!g.valid(g.nodeFromId(-1)), "Validity check");
-  check(!g.valid(g.edgeFromId(-1)), "Validity check");
-  check(!g.valid(g.arcFromId(-1)), "Validity check");
-    
-}
-
-
 
 // void checkGridGraph(const GridGraph& g, int w, int h) {
@@ -213 +188 @@
   check_concepts();
 
-  check_graph_counts<ListGraph>();
-  check_graph_counts<SmartGraph>();
-
-  check_graph_validity_erase<ListGraph>();
-  check_graph_validity<SmartGraph>();
+  check_graph<ListGraph>();
+  check_graph<SmartGraph>();
 
 //   {