Changeset 391:624e673efa76 in lemon-main

Timestamp:

11/21/08 15:26:58 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Def -> Set renaming in Preflow

Files:

• lemon/preflow.h (modified) (4 diffs)
• test/preflow_test.cc (modified) (1 diff)

lemon/preflow.h

@@ -194 +194 @@
 
     template <typename _FlowMap>
-    struct DefFlowMapTraits : public Traits {
+    struct SetFlowMapTraits : public Traits {
       typedef _FlowMap FlowMap;
       static FlowMap *createFlowMap(const Digraph&) {
@@ -208 +208 @@
     /// type
     template <typename _FlowMap>
-    struct DefFlowMap
-      : public Preflow<Digraph, CapacityMap, DefFlowMapTraits<_FlowMap> > {
+    struct SetFlowMap
+      : public Preflow<Digraph, CapacityMap, SetFlowMapTraits<_FlowMap> > {
       typedef Preflow<Digraph, CapacityMap,
-                      DefFlowMapTraits<_FlowMap> > Create;
+                      SetFlowMapTraits<_FlowMap> > Create;
     };
 
     template <typename _Elevator>
-    struct DefElevatorTraits : public Traits {
+    struct SetElevatorTraits : public Traits {
       typedef _Elevator Elevator;
       static Elevator *createElevator(const Digraph&, int) {
@@ -229 +229 @@
     /// type
     template <typename _Elevator>
-    struct DefElevator
-      : public Preflow<Digraph, CapacityMap, DefElevatorTraits<_Elevator> > {
+    struct SetElevator
+      : public Preflow<Digraph, CapacityMap, SetElevatorTraits<_Elevator> > {
       typedef Preflow<Digraph, CapacityMap,
-                      DefElevatorTraits<_Elevator> > Create;
+                      SetElevatorTraits<_Elevator> > Create;
     };
 
     template <typename _Elevator>
-    struct DefStandardElevatorTraits : public Traits {
+    struct SetStandardElevatorTraits : public Traits {
       typedef _Elevator Elevator;
       static Elevator *createElevator(const Digraph& digraph, int max_level) {
@@ -250 +250 @@
     /// the digraph and the maximum level should be passed to it.
     template <typename _Elevator>
-    struct DefStandardElevator
+    struct SetStandardElevator
       : public Preflow<Digraph, CapacityMap,
-                       DefStandardElevatorTraits<_Elevator> > {
+                       SetStandardElevatorTraits<_Elevator> > {
       typedef Preflow<Digraph, CapacityMap,
-                      DefStandardElevatorTraits<_Elevator> > Create;
+                      SetStandardElevatorTraits<_Elevator> > Create;
     };
 

test/preflow_test.cc

@@ -47 +47 @@
   CutMap cut;
 
-  Preflow<Digraph, CapMap>::DefFlowMap<FlowMap>::Create preflow_test(g,cap,n,n);
+  Preflow<Digraph, CapMap>::SetFlowMap<FlowMap>::Create preflow_test(g,cap,n,n);
 
   preflow_test.capacityMap(cap);