Changeset 364:b4a01426c0d9 in lemon-main

Timestamp:

11/05/08 21:36:28 (16 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Port hypercube digraph structure from SVN 3503 (#57)

Files:

• lemon/Makefile.am (modified) (1 diff)
• lemon/hypercube_graph.h (added)
• test/digraph_test.cc (modified) (4 diffs)

lemon/Makefile.am

@@ -32 +32 @@
         lemon/graph_to_eps.h \
         lemon/grid_graph.h \
+        lemon/hypercube_graph.h \
         lemon/kruskal.h \
         lemon/lgf_reader.h \

test/digraph_test.cc

@@ -21 +21 @@
 #include <lemon/smart_graph.h>
 #include <lemon/full_graph.h>
-//#include <lemon/hypercube_graph.h>
+#include <lemon/hypercube_graph.h>
 
 #include "test_tools.h"
@@ -113 +113 @@
 }
 
+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() {
@@ -146 +175 @@
     checkConcept<Digraph, FullDigraph>();
   }
-//  { // Checking HyperCubeDigraph
-//    checkConcept<Digraph, HyperCubeDigraph>();
-//  }
+  { // Checking HypercubeDigraph
+    checkConcept<Digraph, HypercubeDigraph>();
+  }
 }
 
@@ -213 +242 @@
     checkFullDigraph(8);
   }
+  { // Checking HypercubeDigraph
+    checkHypercubeDigraph(1);
+    checkHypercubeDigraph(2);
+    checkHypercubeDigraph(3);
+    checkHypercubeDigraph(4);
+  }
 }