COIN-OR::LEMON - Graph Library

Changeset 942:d3ea191c3412 in lemon for lemon/cycle_canceling.h


Ignore:
Timestamp:
03/13/10 22:01:38 (10 years ago)
Author:
Peter Kovacs <kpeter@…>
Branch:
default
Phase:
public
Message:

Rename min mean cycle classes and their members (#179)
with respect to the possible introduction of min ratio
cycle algorithms in the future.

The renamed classes:

The renamed members:

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/cycle_canceling.h

    r911 r942  
    3535#include <lemon/circulation.h>
    3636#include <lemon/bellman_ford.h>
    37 #include <lemon/howard.h>
     37#include <lemon/howard_mmc.h>
    3838
    3939namespace lemon {
     
    925925      typedef SimplePath<StaticDigraph> SPath;
    926926      typedef typename SPath::ArcIt SPathArcIt;
    927       typedef typename Howard<StaticDigraph, CostArcMap>
     927      typedef typename HowardMmc<StaticDigraph, CostArcMap>
    928928        ::template SetPath<SPath>::Create MMC;
    929929     
     
    932932      mmc.cycle(cycle);
    933933      buildResidualNetwork();
    934       while (mmc.findMinMean() && mmc.cycleLength() < 0) {
     934      while (mmc.findCycleMean() && mmc.cycleCost() < 0) {
    935935        // Find the cycle
    936936        mmc.findCycle();
     
    11331133          }
    11341134        } else {
    1135           typedef Howard<StaticDigraph, CostArcMap> MMC;
     1135          typedef HowardMmc<StaticDigraph, CostArcMap> MMC;
    11361136          typedef typename BellmanFord<StaticDigraph, CostArcMap>
    11371137            ::template SetDistMap<CostNodeMap>::Create BF;
     
    11401140          buildResidualNetwork();
    11411141          MMC mmc(_sgr, _cost_map);
    1142           mmc.findMinMean();
     1142          mmc.findCycleMean();
    11431143          epsilon = -mmc.cycleMean();
    1144           Cost cycle_cost = mmc.cycleLength();
    1145           int cycle_size = mmc.cycleArcNum();
     1144          Cost cycle_cost = mmc.cycleCost();
     1145          int cycle_size = mmc.cycleSize();
    11461146         
    11471147          // Compute feasible potentials for the current epsilon
Note: See TracChangeset for help on using the changeset viewer.