1.1 --- a/lemon/circulation.h	Mon Dec 01 14:11:31 2008 +0000
     1.2 +++ b/lemon/circulation.h	Mon Dec 01 14:07:58 2008 +0000
     1.3 @@ -169,7 +169,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 @@ -183,15 +183,15 @@
    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 +    struct SetFlowMap
    1.18        : public Circulation<Digraph, LCapMap, UCapMap, DeltaMap,
    1.19 -                           DefFlowMapTraits<_FlowMap> > {
    1.20 +                           SetFlowMapTraits<_FlowMap> > {
    1.21        typedef Circulation<Digraph, LCapMap, UCapMap, DeltaMap,
    1.22 -                          DefFlowMapTraits<_FlowMap> > Create;
    1.23 +                          SetFlowMapTraits<_FlowMap> > Create;
    1.24      };
    1.25  
    1.26      template <typename _Elevator>
    1.27 -    struct DefElevatorTraits : public Traits {
    1.28 +    struct SetElevatorTraits : public Traits {
    1.29        typedef _Elevator Elevator;
    1.30        static Elevator *createElevator(const Digraph&, int) {
    1.31          LEMON_ASSERT(false, "Elevator is not initialized");
    1.32 @@ -205,15 +205,15 @@
    1.33      /// \ref named-templ-param "Named parameter" for setting Elevator
    1.34      /// type
    1.35      template <typename _Elevator>
    1.36 -    struct DefElevator
    1.37 +    struct SetElevator
    1.38        : public Circulation<Digraph, LCapMap, UCapMap, DeltaMap,
    1.39 -                           DefElevatorTraits<_Elevator> > {
    1.40 +                           SetElevatorTraits<_Elevator> > {
    1.41        typedef Circulation<Digraph, LCapMap, UCapMap, DeltaMap,
    1.42 -                          DefElevatorTraits<_Elevator> > Create;
    1.43 +                          SetElevatorTraits<_Elevator> > Create;
    1.44      };
    1.45  
    1.46      template <typename _Elevator>
    1.47 -    struct DefStandardElevatorTraits : public Traits {
    1.48 +    struct SetStandardElevatorTraits : public Traits {
    1.49        typedef _Elevator Elevator;
    1.50        static Elevator *createElevator(const Digraph& digraph, int max_level) {
    1.51          return new Elevator(digraph, max_level);
    1.52 @@ -227,11 +227,11 @@
    1.53      /// type. The Elevator should be standard constructor interface, ie.
    1.54      /// the digraph and the maximum level should be passed to it.
    1.55      template <typename _Elevator>
    1.56 -    struct DefStandardElevator
    1.57 +    struct SetStandardElevator
    1.58        : public Circulation<Digraph, LCapMap, UCapMap, DeltaMap,
    1.59 -                       DefStandardElevatorTraits<_Elevator> > {
    1.60 +                       SetStandardElevatorTraits<_Elevator> > {
    1.61        typedef Circulation<Digraph, LCapMap, UCapMap, DeltaMap,
    1.62 -                      DefStandardElevatorTraits<_Elevator> > Create;
    1.63 +                      SetStandardElevatorTraits<_Elevator> > Create;
    1.64      };
    1.65  
    1.66      /// @}