1.1 --- a/lemon/preflow.h	Thu Jan 01 00:00:00 2009 +0100
     1.2 +++ b/lemon/preflow.h	Mon Feb 23 12:10:26 2009 +0100
     1.3 @@ -31,19 +31,19 @@
     1.4    /// \brief Default traits class of Preflow class.
     1.5    ///
     1.6    /// Default traits class of Preflow class.
     1.7 -  /// \tparam _Digraph Digraph type.
     1.8 -  /// \tparam _CapacityMap Capacity map type.
     1.9 -  template <typename _Digraph, typename _CapacityMap>
    1.10 +  /// \tparam GR Digraph type.
    1.11 +  /// \tparam CM Capacity map type.
    1.12 +  template <typename GR, typename CM>
    1.13    struct PreflowDefaultTraits {
    1.14  
    1.15      /// \brief The type of the digraph the algorithm runs on.
    1.16 -    typedef _Digraph Digraph;
    1.17 +    typedef GR Digraph;
    1.18  
    1.19      /// \brief The type of the map that stores the arc capacities.
    1.20      ///
    1.21      /// The type of the map that stores the arc capacities.
    1.22      /// It must meet the \ref concepts::ReadMap "ReadMap" concept.
    1.23 -    typedef _CapacityMap CapacityMap;
    1.24 +    typedef CM CapacityMap;
    1.25  
    1.26      /// \brief The type of the flow values.
    1.27      typedef typename CapacityMap::Value Value;
    1.28 @@ -104,21 +104,21 @@
    1.29    /// the maximum flow value and the minimum cut is obtained. The
    1.30    /// second phase constructs a feasible maximum flow on each arc.
    1.31    ///
    1.32 -  /// \tparam _Digraph The type of the digraph the algorithm runs on.
    1.33 -  /// \tparam _CapacityMap The type of the capacity map. The default map
    1.34 -  /// type is \ref concepts::Digraph::ArcMap "_Digraph::ArcMap<int>".
    1.35 +  /// \tparam GR The type of the digraph the algorithm runs on.
    1.36 +  /// \tparam CM The type of the capacity map. The default map
    1.37 +  /// type is \ref concepts::Digraph::ArcMap "GR::ArcMap<int>".
    1.38  #ifdef DOXYGEN
    1.39 -  template <typename _Digraph, typename _CapacityMap, typename _Traits>
    1.40 +  template <typename GR, typename CM, typename TR>
    1.41  #else
    1.42 -  template <typename _Digraph,
    1.43 -            typename _CapacityMap = typename _Digraph::template ArcMap<int>,
    1.44 -            typename _Traits = PreflowDefaultTraits<_Digraph, _CapacityMap> >
    1.45 +  template <typename GR,
    1.46 +            typename CM = typename GR::template ArcMap<int>,
    1.47 +            typename TR = PreflowDefaultTraits<GR, CM> >
    1.48  #endif
    1.49    class Preflow {
    1.50    public:
    1.51  
    1.52      ///The \ref PreflowDefaultTraits "traits class" of the algorithm.
    1.53 -    typedef _Traits Traits;
    1.54 +    typedef TR Traits;
    1.55      ///The type of the digraph the algorithm runs on.
    1.56      typedef typename Traits::Digraph Digraph;
    1.57      ///The type of the capacity map.