1.1 --- a/test/hao_orlin_test.cc Wed Apr 15 09:37:51 2009 +0200
1.2 +++ b/test/hao_orlin_test.cc Sat Apr 18 21:01:12 2009 +0200
1.3 @@ -111,30 +111,24 @@
1.4 ho.run();
1.5 ho.minCutMap(cut);
1.6
1.7 - // BUG: The cut value should be positive
1.8 - check(ho.minCutValue() == 0, "Wrong cut value");
1.9 - // BUG: It should work
1.10 - //check(ho.minCutValue() == cutValue(graph, cap1, cut), "Wrong cut value");
1.11 + check(ho.minCutValue() == 1, "Wrong cut value");
1.12 + check(ho.minCutValue() == cutValue(graph, cap1, cut), "Wrong cut value");
1.13 }
1.14 {
1.15 HaoOrlin<SmartDigraph> ho(graph, cap2);
1.16 ho.run();
1.17 ho.minCutMap(cut);
1.18 -
1.19 - // BUG: The cut value should be positive
1.20 - check(ho.minCutValue() == 0, "Wrong cut value");
1.21 - // BUG: It should work
1.22 - //check(ho.minCutValue() == cutValue(graph, cap2, cut), "Wrong cut value");
1.23 +
1.24 + check(ho.minCutValue() == 1, "Wrong cut value");
1.25 + check(ho.minCutValue() == cutValue(graph, cap2, cut), "Wrong cut value");
1.26 }
1.27 {
1.28 HaoOrlin<SmartDigraph> ho(graph, cap3);
1.29 ho.run();
1.30 ho.minCutMap(cut);
1.31
1.32 - // BUG: The cut value should be positive
1.33 - check(ho.minCutValue() == 0, "Wrong cut value");
1.34 - // BUG: It should work
1.35 - //check(ho.minCutValue() == cutValue(graph, cap3, cut), "Wrong cut value");
1.36 + check(ho.minCutValue() == 1, "Wrong cut value");
1.37 + check(ho.minCutValue() == cutValue(graph, cap3, cut), "Wrong cut value");
1.38 }
1.39
1.40 typedef Undirector<SmartDigraph> UGraph;
1.41 @@ -145,30 +139,24 @@
1.42 ho.run();
1.43 ho.minCutMap(cut);
1.44
1.45 - // BUG: The cut value should be 2
1.46 - check(ho.minCutValue() == 1, "Wrong cut value");
1.47 - // BUG: It should work
1.48 - //check(ho.minCutValue() == cutValue(ugraph, cap1, cut), "Wrong cut value");
1.49 + check(ho.minCutValue() == 2, "Wrong cut value");
1.50 + check(ho.minCutValue() == cutValue(ugraph, cap1, cut), "Wrong cut value");
1.51 }
1.52 {
1.53 HaoOrlin<UGraph, SmartDigraph::ArcMap<int> > ho(ugraph, cap2);
1.54 ho.run();
1.55 ho.minCutMap(cut);
1.56
1.57 - // TODO: Check this cut value
1.58 - check(ho.minCutValue() == 4, "Wrong cut value");
1.59 - // BUG: It should work
1.60 - //check(ho.minCutValue() == cutValue(ugraph, cap2, cut), "Wrong cut value");
1.61 + check(ho.minCutValue() == 5, "Wrong cut value");
1.62 + check(ho.minCutValue() == cutValue(ugraph, cap2, cut), "Wrong cut value");
1.63 }
1.64 {
1.65 HaoOrlin<UGraph, SmartDigraph::ArcMap<int> > ho(ugraph, cap3);
1.66 ho.run();
1.67 ho.minCutMap(cut);
1.68
1.69 - // TODO: Check this cut value
1.70 check(ho.minCutValue() == 5, "Wrong cut value");
1.71 - // BUG: It should work
1.72 - //check(ho.minCutValue() == cutValue(ugraph, cap3, cut), "Wrong cut value");
1.73 + check(ho.minCutValue() == cutValue(ugraph, cap3, cut), "Wrong cut value");
1.74 }
1.75
1.76 return 0;