Changes in / [366:efbd0ab50a77:363:a637fb9d457b] in lemon-main

Files:

• lemon/Makefile.am (modified) (1 diff)
• lemon/hypercube_graph.h (deleted)
• test/digraph_test.cc (modified) (3 diffs)
• test/graph_test.cc (modified) (7 diffs)
• tools/lemon-0.x-to-1.x.sh (modified) (1 diff)

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 "test_tools.h"
@@ -112 +113 @@
 }
 
+
 void checkConcepts() {
   { // Checking digraph components
@@ -144 +146 @@
     checkConcept<Digraph, FullDigraph>();
   }
+//  { // Checking HyperCubeDigraph
+//    checkConcept<Digraph, HyperCubeDigraph>();
+//  }
 }
 

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"
@@ -106 +105 @@
 
   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);    
   }
 
@@ -123 +122 @@
   checkGraphEdgeMap(G);
 
-
+  
   for (int i = 0; i < G.nodeNum(); ++i) {
     check(G.index(G(i)) == i, "Wrong index");
@@ -179 +178 @@
     checkConcept<Graph, GridGraph>();
   }
-  { // Checking HypercubeGraph
-    checkConcept<Graph, HypercubeGraph>();
-  }
 }
 
@@ -317 +313 @@
 }
 
-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
@@ -374 +322 @@
     checkGraphValidity<SmartGraph>();
   }
-  { // Checking FullGraph
+  { // Checking FullGraph   
     checkFullGraph(7);
     checkFullGraph(8);
@@ -385 +333 @@
     checkGridGraph(1, 1);
   }
-  { // Checking HypercubeGraph
-    checkHypercubeGraph(1);
-    checkHypercubeGraph(2);
-    checkHypercubeGraph(3);
-    checkHypercubeGraph(4);
-  }
 }
 

tools/lemon-0.x-to-1.x.sh

@@ -82 +82 @@
         -e "s/\<copyGraph\>/graphCopy/g"\
         -e "s/\<copyDigraph\>/digraphCopy/g"\
-        -e "s/\<HyperCubeDigraph\>/HypercubeGraph/g"\
         -e "s/\<IntegerMap\>/RangeMap/g"\
         -e "s/\<integerMap\>/rangeMap/g"\