Changeset 942:d3ea191c3412 in lemon for lemon/cycle_canceling.h
 Timestamp:
 03/13/10 22:01:38 (10 years ago)
 Branch:
 default
 Phase:
 public
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

lemon/cycle_canceling.h
r911 r942 35 35 #include <lemon/circulation.h> 36 36 #include <lemon/bellman_ford.h> 37 #include <lemon/howard .h>37 #include <lemon/howard_mmc.h> 38 38 39 39 namespace lemon { … … 925 925 typedef SimplePath<StaticDigraph> SPath; 926 926 typedef typename SPath::ArcIt SPathArcIt; 927 typedef typename Howard <StaticDigraph, CostArcMap>927 typedef typename HowardMmc<StaticDigraph, CostArcMap> 928 928 ::template SetPath<SPath>::Create MMC; 929 929 … … 932 932 mmc.cycle(cycle); 933 933 buildResidualNetwork(); 934 while (mmc.find MinMean() && mmc.cycleLength() < 0) {934 while (mmc.findCycleMean() && mmc.cycleCost() < 0) { 935 935 // Find the cycle 936 936 mmc.findCycle(); … … 1133 1133 } 1134 1134 } else { 1135 typedef Howard <StaticDigraph, CostArcMap> MMC;1135 typedef HowardMmc<StaticDigraph, CostArcMap> MMC; 1136 1136 typedef typename BellmanFord<StaticDigraph, CostArcMap> 1137 1137 ::template SetDistMap<CostNodeMap>::Create BF; … … 1140 1140 buildResidualNetwork(); 1141 1141 MMC mmc(_sgr, _cost_map); 1142 mmc.find MinMean();1142 mmc.findCycleMean(); 1143 1143 epsilon = mmc.cycleMean(); 1144 Cost cycle_cost = mmc.cycle Length();1145 int cycle_size = mmc.cycle ArcNum();1144 Cost cycle_cost = mmc.cycleCost(); 1145 int cycle_size = mmc.cycleSize(); 1146 1146 1147 1147 // Compute feasible potentials for the current epsilon
Note: See TracChangeset
for help on using the changeset viewer.