1.1 --- a/lemon/cycle_canceling.h	Mon Mar 08 08:33:41 2010 +0100
     1.2 +++ b/lemon/cycle_canceling.h	Sat Mar 13 22:01:38 2010 +0100
     1.3 @@ -34,7 +34,7 @@
     1.4  #include <lemon/adaptors.h>
     1.5  #include <lemon/circulation.h>
     1.6  #include <lemon/bellman_ford.h>
     1.7 -#include <lemon/howard.h>
     1.8 +#include <lemon/howard_mmc.h>
     1.9  
    1.10  namespace lemon {
    1.11  
    1.12 @@ -924,14 +924,14 @@
    1.13      void startMinMeanCycleCanceling() {
    1.14        typedef SimplePath<StaticDigraph> SPath;
    1.15        typedef typename SPath::ArcIt SPathArcIt;
    1.16 -      typedef typename Howard<StaticDigraph, CostArcMap>
    1.17 +      typedef typename HowardMmc<StaticDigraph, CostArcMap>
    1.18          ::template SetPath<SPath>::Create MMC;
    1.19        
    1.20        SPath cycle;
    1.21        MMC mmc(_sgr, _cost_map);
    1.22        mmc.cycle(cycle);
    1.23        buildResidualNetwork();
    1.24 -      while (mmc.findMinMean() && mmc.cycleLength() < 0) {
    1.25 +      while (mmc.findCycleMean() && mmc.cycleCost() < 0) {
    1.26          // Find the cycle
    1.27          mmc.findCycle();
    1.28  
    1.29 @@ -1132,17 +1132,17 @@
    1.30              }
    1.31            }
    1.32          } else {
    1.33 -          typedef Howard<StaticDigraph, CostArcMap> MMC;
    1.34 +          typedef HowardMmc<StaticDigraph, CostArcMap> MMC;
    1.35            typedef typename BellmanFord<StaticDigraph, CostArcMap>
    1.36              ::template SetDistMap<CostNodeMap>::Create BF;
    1.37  
    1.38            // Set epsilon to the minimum cycle mean
    1.39            buildResidualNetwork();
    1.40            MMC mmc(_sgr, _cost_map);
    1.41 -          mmc.findMinMean();
    1.42 +          mmc.findCycleMean();
    1.43            epsilon = -mmc.cycleMean();
    1.44 -          Cost cycle_cost = mmc.cycleLength();
    1.45 -          int cycle_size = mmc.cycleArcNum();
    1.46 +          Cost cycle_cost = mmc.cycleCost();
    1.47 +          int cycle_size = mmc.cycleSize();
    1.48            
    1.49            // Compute feasible potentials for the current epsilon
    1.50            for (int i = 0; i != int(_cost_vec.size()); ++i) {