1.1 --- a/lemon/preflow.h	Fri Nov 21 14:26:58 2008 +0000
     1.2 +++ b/lemon/preflow.h	Fri Nov 21 14:26:58 2008 +0000
     1.3 @@ -193,7 +193,7 @@
     1.4      ///@{
     1.5  
     1.6      template <typename _FlowMap>
     1.7 -    struct DefFlowMapTraits : public Traits {
     1.8 +    struct SetFlowMapTraits : public Traits {
     1.9        typedef _FlowMap FlowMap;
    1.10        static FlowMap *createFlowMap(const Digraph&) {
    1.11          LEMON_ASSERT(false, "FlowMap is not initialized");
    1.12 @@ -207,14 +207,14 @@
    1.13      /// \ref named-templ-param "Named parameter" for setting FlowMap
    1.14      /// type
    1.15      template <typename _FlowMap>
    1.16 -    struct DefFlowMap
    1.17 -      : public Preflow<Digraph, CapacityMap, DefFlowMapTraits<_FlowMap> > {
    1.18 +    struct SetFlowMap
    1.19 +      : public Preflow<Digraph, CapacityMap, SetFlowMapTraits<_FlowMap> > {
    1.20        typedef Preflow<Digraph, CapacityMap,
    1.21 -                      DefFlowMapTraits<_FlowMap> > Create;
    1.22 +                      SetFlowMapTraits<_FlowMap> > Create;
    1.23      };
    1.24  
    1.25      template <typename _Elevator>
    1.26 -    struct DefElevatorTraits : public Traits {
    1.27 +    struct SetElevatorTraits : public Traits {
    1.28        typedef _Elevator Elevator;
    1.29        static Elevator *createElevator(const Digraph&, int) {
    1.30          LEMON_ASSERT(false, "Elevator is not initialized");
    1.31 @@ -228,14 +228,14 @@
    1.32      /// \ref named-templ-param "Named parameter" for setting Elevator
    1.33      /// type
    1.34      template <typename _Elevator>
    1.35 -    struct DefElevator
    1.36 -      : public Preflow<Digraph, CapacityMap, DefElevatorTraits<_Elevator> > {
    1.37 +    struct SetElevator
    1.38 +      : public Preflow<Digraph, CapacityMap, SetElevatorTraits<_Elevator> > {
    1.39        typedef Preflow<Digraph, CapacityMap,
    1.40 -                      DefElevatorTraits<_Elevator> > Create;
    1.41 +                      SetElevatorTraits<_Elevator> > Create;
    1.42      };
    1.43  
    1.44      template <typename _Elevator>
    1.45 -    struct DefStandardElevatorTraits : public Traits {
    1.46 +    struct SetStandardElevatorTraits : public Traits {
    1.47        typedef _Elevator Elevator;
    1.48        static Elevator *createElevator(const Digraph& digraph, int max_level) {
    1.49          return new Elevator(digraph, max_level);
    1.50 @@ -249,11 +249,11 @@
    1.51      /// type. The Elevator should be standard constructor interface, ie.
    1.52      /// the digraph and the maximum level should be passed to it.
    1.53      template <typename _Elevator>
    1.54 -    struct DefStandardElevator
    1.55 +    struct SetStandardElevator
    1.56        : public Preflow<Digraph, CapacityMap,
    1.57 -                       DefStandardElevatorTraits<_Elevator> > {
    1.58 +                       SetStandardElevatorTraits<_Elevator> > {
    1.59        typedef Preflow<Digraph, CapacityMap,
    1.60 -                      DefStandardElevatorTraits<_Elevator> > Create;
    1.61 +                      SetStandardElevatorTraits<_Elevator> > Create;
    1.62      };
    1.63  
    1.64      /// @}

     2.1 --- a/test/preflow_test.cc	Fri Nov 21 14:26:58 2008 +0000
     2.2 +++ b/test/preflow_test.cc	Fri Nov 21 14:26:58 2008 +0000
     2.3 @@ -46,7 +46,7 @@
     2.4    FlowMap flow;
     2.5    CutMap cut;
     2.6  
     2.7 -  Preflow<Digraph, CapMap>::DefFlowMap<FlowMap>::Create preflow_test(g,cap,n,n);
     2.8 +  Preflow<Digraph, CapMap>::SetFlowMap<FlowMap>::Create preflow_test(g,cap,n,n);
     2.9  
    2.10    preflow_test.capacityMap(cap);
    2.11    flow = preflow_test.flowMap();