Changeset 2533:aea952a1af99 in lemon-0.x

Timestamp:

12/05/07 02:43:02 (17 years ago)

Author:

Peter Kovacs

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3410

Message:

Bug fixes.

Location:

lemon

Files:

• capacity_scaling.h (modified) (2 diffs)
• circulation.h (modified) (1 diff)
• cycle_canceling.h (modified) (2 diffs)
• min_cost_flow.h (modified) (1 diff)
• min_cost_max_flow.h (modified) (1 diff)
• network_simplex.h (modified) (1 diff)

lemon/capacity_scaling.h

@@ -67 +67 @@
   /// \author Peter Kovacs
 
-template < typename Graph,
-           typename LowerMap = typename Graph::template EdgeMap<int>,
-           typename CapacityMap = LowerMap,
-           typename CostMap = typename Graph::template EdgeMap<int>,
-           typename SupplyMap = typename Graph::template NodeMap
-                                <typename CapacityMap::Value> >
+  template < typename Graph,
+             typename LowerMap = typename Graph::template EdgeMap<int>,
+             typename CapacityMap = LowerMap,
+             typename CostMap = typename Graph::template EdgeMap<int>,
+             typename SupplyMap = typename Graph::template NodeMap
+                                  <typename CapacityMap::Value> >
   class CapacityScaling
   {
@@ -639 +639 @@
       }
 #ifdef _DEBUG_ITER_
-      std::cout << "Cost Scaling algorithm finished with running Dijkstra algorithm "
+      std::cout << "Capacity Scaling algorithm finished with running Dijkstra algorithm "
         << dijk_num << " times." << std::endl;
 #endif

lemon/circulation.h

@@ -374 +374 @@
     } 
     
-    /// \name Execution control The simplest way to execute the
-    /// algorithm is to use one of the member functions called \c
-    /// run().  
+    /// \name Execution control
+    /// The simplest way to execute the algorithm is to use one of the
+    /// member functions called \c run().
     /// \n 
     /// If you need more control on initial solution or execution then

lemon/cycle_canceling.h

@@ -87 +87 @@
   /// \author Peter Kovacs
 
-template < typename Graph,
-           typename LowerMap = typename Graph::template EdgeMap<int>,
-           typename CapacityMap = LowerMap,
-           typename CostMap = typename Graph::template EdgeMap<int>,
-           typename SupplyMap = typename Graph::template NodeMap
-                                <typename CapacityMap::Value> >
+  template < typename Graph,
+             typename LowerMap = typename Graph::template EdgeMap<int>,
+             typename CapacityMap = LowerMap,
+             typename CostMap = typename Graph::template EdgeMap<int>,
+             typename SupplyMap = typename Graph::template NodeMap
+                                  <typename CapacityMap::Value> >
   class CycleCanceling
   {
@@ -324 +324 @@
 
       // Finding a feasible flow
-      Circulation< Graph, Capacity, ConstMap<Edge, Capacity>,
-        CapacityRefMap, SupplyMap >::DefFlowMap<FlowMap>::Create
-        circulation( graph, constMap<Edge>((Capacity)0),
-                     capacity, supply);
-      circulation.flowMap(flowMap);
-      return circulation.run();
+      Circulation< Graph, ConstMap<Edge, Capacity>, CapacityRefMap,
+                   SupplyMap >
+        circulation( graph, constMap<Edge>((Capacity)0), capacity, 
+                     supply );
+      circulation.flowMap(flow);
+      return circulation.run() == -1;
     }
 

lemon/min_cost_flow.h

@@ -64 +64 @@
   /// \author Peter Kovacs
 
-template < typename Graph,
-           typename LowerMap = typename Graph::template EdgeMap<int>,
-           typename CapacityMap = LowerMap,
-           typename CostMap = typename Graph::template EdgeMap<int>,
-           typename SupplyMap = typename Graph::template NodeMap
-                                <typename CapacityMap::Value> >
+  template < typename Graph,
+             typename LowerMap = typename Graph::template EdgeMap<int>,
+             typename CapacityMap = LowerMap,
+             typename CostMap = typename Graph::template EdgeMap<int>,
+             typename SupplyMap = typename Graph::template NodeMap
+                                  <typename CapacityMap::Value> >
   class MinCostFlow :
     public NetworkSimplex< Graph,

lemon/min_cost_max_flow.h

@@ -58 +58 @@
   /// \author Peter Kovacs
 
-template < typename Graph,
-           typename CapacityMap = typename Graph::template EdgeMap<int>,
-           typename CostMap = typename Graph::template EdgeMap<int> >
+  template < typename Graph,
+             typename CapacityMap = typename Graph::template EdgeMap<int>,
+             typename CostMap = typename Graph::template EdgeMap<int> >
   class MinCostMaxFlow
   {

lemon/network_simplex.h

@@ -94 +94 @@
   /// \author Peter Kovacs
 
-template < typename Graph,
-           typename LowerMap = typename Graph::template EdgeMap<int>,
-           typename CapacityMap = LowerMap,
-           typename CostMap = typename Graph::template EdgeMap<int>,
-           typename SupplyMap = typename Graph::template NodeMap
-                                <typename CapacityMap::Value> >
+  template < typename Graph,
+             typename LowerMap = typename Graph::template EdgeMap<int>,
+             typename CapacityMap = LowerMap,
+             typename CostMap = typename Graph::template EdgeMap<int>,
+             typename SupplyMap = typename Graph::template NodeMap
+                                  <typename CapacityMap::Value> >
   class NetworkSimplex
   {