Ticket #66: 926295286bdb.patch

lemon/gomory_hu_tree.h

@@ -19 +19 @@
 #ifndef LEMON_GOMORY_HU_TREE_H
 #define LEMON_GOMORY_HU_TREE_H
 
+#include <limits>
+
 #include <lemon/preflow.h>
 #include <lemon/concept_check.h>
 #include <lemon/concepts/maps.h>

test/Makefile.am

@@ -16 +16 @@
         test/dim_test \
         test/edge_set_test \
         test/error_test \
+        test/gomory_hu_test \
         test/graph_copy_test \
         test/graph_test \
         test/graph_utils_test \

test/gomory_hu_test.cc

@@ -24 +24 @@
   "3\n"
   "4\n"
   "@arcs\n"
-  "     label length\n"
+  "     label capacity\n"
   "0 1  0     1\n"
   "1 2  1     1\n"
   "2 3  2     1\n"
@@ -48 +48 @@
     Node s = graph.u(e);
     Node t = graph.v(e);
 
-    if (cut[s] && !cut[t]) {
+    if (cut[s] != cut[t]) {
       sum += capacity[e];
     }
   }
@@ -56 +56 @@
 }
 
 
-int main(int argc, const char *argv[]) {
+int main() {
   Graph graph;
   IntEdgeMap capacity(graph);
 
@@ -68 +68 @@
   ght.init();
   ght.run();
 
-
-  int cnt = 0;
-  std::cerr << countNodes(graph) << std::endl;
   for (NodeIt u(graph); u != INVALID; ++u) {
-    std::cerr << ++cnt << std::endl;
-    int bcnt = 0;
     for (NodeIt v(graph); v != u; ++v) {
       Preflow<Graph, IntEdgeMap> pf(graph, capacity, u, v);
       pf.runMinCut();