Changeset 864:d3ea191c3412 in lemon-main for lemon/cycle_canceling.h

Timestamp:

03/13/10 22:01:38 (14 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:

• Karp --> KarpMmc?
• HartmannOrlin? --> HartmannOrlinMmc?
• Howard --> HowardMmc?

The renamed members:

• cycleLength() --> cycleCost()
• cycleArcNum() --> cycleSize()
• findMinMean() --> findCycleMean()
• Value --> Cost
• LargeValue? --> LargeCost?
• SetLargeValue? --> SetLargeCost?

File:

• lemon/cycle_canceling.h (modified) (5 diffs)

lemon/cycle_canceling.h

@@ -35 +35 @@
 #include <lemon/circulation.h>
 #include <lemon/bellman_ford.h>
-#include <lemon/howard.h>
+#include <lemon/howard_mmc.h>
 
 namespace lemon {
@@ -925 +925 @@
       typedef SimplePath<StaticDigraph> SPath;
       typedef typename SPath::ArcIt SPathArcIt;
-      typedef typename Howard<StaticDigraph, CostArcMap>
+      typedef typename HowardMmc<StaticDigraph, CostArcMap>
         ::template SetPath<SPath>::Create MMC;
       
@@ -932 +932 @@
       mmc.cycle(cycle);
       buildResidualNetwork();
-      while (mmc.findMinMean() && mmc.cycleLength() < 0) {
+      while (mmc.findCycleMean() && mmc.cycleCost() < 0) {
         // Find the cycle
         mmc.findCycle();
@@ -1133 +1133 @@
           }
         } else {
-          typedef Howard<StaticDigraph, CostArcMap> MMC;
+          typedef HowardMmc<StaticDigraph, CostArcMap> MMC;
           typedef typename BellmanFord<StaticDigraph, CostArcMap>
             ::template SetDistMap<CostNodeMap>::Create BF;
@@ -1140 +1140 @@
           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