diff -r a93f1a27d831 -r d3ea191c3412 lemon/cycle_canceling.h --- a/lemon/cycle_canceling.h Mon Mar 08 08:33:41 2010 +0100 +++ b/lemon/cycle_canceling.h Sat Mar 13 22:01:38 2010 +0100 @@ -34,7 +34,7 @@ #include #include #include -#include +#include namespace lemon { @@ -924,14 +924,14 @@ void startMinMeanCycleCanceling() { typedef SimplePath SPath; typedef typename SPath::ArcIt SPathArcIt; - typedef typename Howard + typedef typename HowardMmc ::template SetPath::Create MMC; SPath cycle; MMC mmc(_sgr, _cost_map); mmc.cycle(cycle); buildResidualNetwork(); - while (mmc.findMinMean() && mmc.cycleLength() < 0) { + while (mmc.findCycleMean() && mmc.cycleCost() < 0) { // Find the cycle mmc.findCycle(); @@ -1132,17 +1132,17 @@ } } } else { - typedef Howard MMC; + typedef HowardMmc MMC; typedef typename BellmanFord ::template SetDistMap::Create BF; // Set epsilon to the minimum cycle mean buildResidualNetwork(); MMC mmc(_sgr, _cost_map); - mmc.findMinMean(); + mmc.findCycleMean(); epsilon = -mmc.cycleMean(); - Cost cycle_cost = mmc.cycleLength(); - int cycle_size = mmc.cycleArcNum(); + Cost cycle_cost = mmc.cycleCost(); + int cycle_size = mmc.cycleSize(); // Compute feasible potentials for the current epsilon for (int i = 0; i != int(_cost_vec.size()); ++i) {