[Lemon-commits] Alpar Juttner: Def -> Set renaming in Preflow

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/624e673efa76
changeset: 406:624e673efa76
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Fri Nov 21 14:26:58 2008 +0000
description:
	Def -> Set renaming in Preflow

diffstat:

2 files changed, 13 insertions(+), 13 deletions(-)
lemon/preflow.h      |   24 ++++++++++++------------
test/preflow_test.cc |    2 +-

diffs (77 lines):

diff -r 53c5277ba294 -r 624e673efa76 lemon/preflow.h
--- a/lemon/preflow.h	Fri Nov 21 14:26:58 2008 +0000
+++ b/lemon/preflow.h	Fri Nov 21 14:26:58 2008 +0000
@@ -193,7 +193,7 @@
     ///@{
 
     template <typename _FlowMap>
-    struct DefFlowMapTraits : public Traits {
+    struct SetFlowMapTraits : public Traits {
       typedef _FlowMap FlowMap;
       static FlowMap *createFlowMap(const Digraph&) {
         LEMON_ASSERT(false, "FlowMap is not initialized");
@@ -207,14 +207,14 @@
     /// \ref named-templ-param "Named parameter" for setting FlowMap
     /// 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) {
         LEMON_ASSERT(false, "Elevator is not initialized");
@@ -228,14 +228,14 @@
     /// \ref named-templ-param "Named parameter" for setting Elevator
     /// 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) {
         return new Elevator(digraph, max_level);
@@ -249,11 +249,11 @@
     /// type. The Elevator should be standard constructor interface, ie.
     /// 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;
     };
 
     /// @}
diff -r 53c5277ba294 -r 624e673efa76 test/preflow_test.cc
--- a/test/preflow_test.cc	Fri Nov 21 14:26:58 2008 +0000
+++ b/test/preflow_test.cc	Fri Nov 21 14:26:58 2008 +0000
@@ -46,7 +46,7 @@
   FlowMap flow;
   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);
   flow = preflow_test.flowMap();