Changeset 365:a12eef1f82b2 in lemon-main for test

Timestamp:

11/06/08 15:16:37 (16 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Rework hypercube graph implementation to be undirected (#57)

Location:

test

Files:

• digraph_test.cc (modified) (4 diffs)
• graph_test.cc (modified) (7 diffs)

test/digraph_test.cc

@@ -21 +21 @@
 #include <lemon/smart_graph.h>
 #include <lemon/full_graph.h>
-#include <lemon/hypercube_graph.h>
 
 #include "test_tools.h"
@@ -113 +112 @@
 }
 
-void checkHypercubeDigraph(int dim) {
-  DIGRAPH_TYPEDEFS(HypercubeDigraph);
-
-  HypercubeDigraph G(dim);
-  checkGraphNodeList(G, 1 << dim);
-  checkGraphArcList(G, (1 << dim) * dim);
-
-  Node n = G.nodeFromId(dim);
-
-  checkGraphOutArcList(G, n, dim);
-  for (OutArcIt a(G, n); a != INVALID; ++a)
-    check(G.source(a) == n &&
-          G.id(G.target(a)) == G.id(n) ^ (1 << G.dimension(a)),
-          "Wrong arc");
-
-  checkGraphInArcList(G, n, dim);
-  for (InArcIt a(G, n); a != INVALID; ++a)
-    check(G.target(a) == n &&
-          G.id(G.source(a)) == G.id(n) ^ (1 << G.dimension(a)),
-          "Wrong arc");
-
-  checkGraphConArcList(G, (1 << dim) * dim);
-
-  checkNodeIds(G);
-  checkArcIds(G);
-  checkGraphNodeMap(G);
-  checkGraphArcMap(G);
-}
-
-
 void checkConcepts() {
   { // Checking digraph components
@@ -175 +144 @@
     checkConcept<Digraph, FullDigraph>();
   }
-  { // Checking HypercubeDigraph
-    checkConcept<Digraph, HypercubeDigraph>();
-  }
 }
 
@@ -242 +208 @@
     checkFullDigraph(8);
   }
-  { // Checking HypercubeDigraph
-    checkHypercubeDigraph(1);
-    checkHypercubeDigraph(2);
-    checkHypercubeDigraph(3);
-    checkHypercubeDigraph(4);
-  }
 }
 

test/graph_test.cc

@@ -22 +22 @@
 #include <lemon/full_graph.h>
 #include <lemon/grid_graph.h>
+#include <lemon/hypercube_graph.h>
 
 #include "test_tools.h"
@@ -105 +106 @@
 
   for (NodeIt n(G); n != INVALID; ++n) {
-    checkGraphOutArcList(G, n, num - 1);    
-    checkGraphInArcList(G, n, num - 1);    
-    checkGraphIncEdgeList(G, n, num - 1);    
+    checkGraphOutArcList(G, n, num - 1);
+    checkGraphInArcList(G, n, num - 1);
+    checkGraphIncEdgeList(G, n, num - 1);
   }
 
@@ -122 +123 @@
   checkGraphEdgeMap(G);
 
-  
+
   for (int i = 0; i < G.nodeNum(); ++i) {
     check(G.index(G(i)) == i, "Wrong index");
@@ -178 +179 @@
     checkConcept<Graph, GridGraph>();
   }
+  { // Checking HypercubeGraph
+    checkConcept<Graph, HypercubeGraph>();
+  }
 }
 
@@ -313 +317 @@
 }
 
+void checkHypercubeGraph(int dim) {
+  GRAPH_TYPEDEFS(HypercubeGraph);
+
+  HypercubeGraph G(dim);
+  checkGraphNodeList(G, 1 << dim);
+  checkGraphEdgeList(G, dim * (1 << dim-1));
+  checkGraphArcList(G, dim * (1 << dim));
+
+  Node n = G.nodeFromId(dim);
+
+  for (NodeIt n(G); n != INVALID; ++n) {
+    checkGraphIncEdgeList(G, n, dim);
+    for (IncEdgeIt e(G, n); e != INVALID; ++e) {
+      check( (G.u(e) == n &&
+              G.id(G.v(e)) == G.id(n) ^ (1 << G.dimension(e))) ||
+             (G.v(e) == n &&
+              G.id(G.u(e)) == G.id(n) ^ (1 << G.dimension(e))),
+             "Wrong edge or wrong dimension");
+    }
+
+    checkGraphOutArcList(G, n, dim);
+    for (OutArcIt a(G, n); a != INVALID; ++a) {
+      check(G.source(a) == n &&
+            G.id(G.target(a)) == G.id(n) ^ (1 << G.dimension(a)),
+            "Wrong arc or wrong dimension");
+    }
+
+    checkGraphInArcList(G, n, dim);
+    for (InArcIt a(G, n); a != INVALID; ++a) {
+      check(G.target(a) == n &&
+            G.id(G.source(a)) == G.id(n) ^ (1 << G.dimension(a)),
+            "Wrong arc or wrong dimension");
+    }
+  }
+
+  checkGraphConArcList(G, (1 << dim) * dim);
+  checkGraphConEdgeList(G, dim * (1 << dim-1));
+
+  checkArcDirections(G);
+
+  checkNodeIds(G);
+  checkArcIds(G);
+  checkEdgeIds(G);
+  checkGraphNodeMap(G);
+  checkGraphArcMap(G);
+  checkGraphEdgeMap(G);
+}
+
 void checkGraphs() {
   { // Checking ListGraph
@@ -322 +374 @@
     checkGraphValidity<SmartGraph>();
   }
-  { // Checking FullGraph   
+  { // Checking FullGraph
     checkFullGraph(7);
     checkFullGraph(8);
@@ -333 +385 @@
     checkGridGraph(1, 1);
   }
+  { // Checking HypercubeGraph
+    checkHypercubeGraph(1);
+    checkHypercubeGraph(2);
+    checkHypercubeGraph(3);
+    checkHypercubeGraph(4);
+  }
 }