lemon/concepts/graph.h
changeset 78 c46b3453455f
parent 61 d718974f1290
child 107 31a2e6d28f61
     1.1 --- a/lemon/concepts/graph.h	Thu Feb 28 16:41:56 2008 +0100
     1.2 +++ b/lemon/concepts/graph.h	Thu Feb 28 17:06:02 2008 +0100
     1.3 @@ -63,7 +63,7 @@
     1.4      /// The EdgeIt is an iterator for the edges. We can use
     1.5      /// the EdgeMap to map values for the edges. The InArcIt and
     1.6      /// OutArcIt iterates on the same edges but with opposite
     1.7 -    /// direction. The IncArcIt iterates also on the same edges
     1.8 +    /// direction. The IncEdgeIt iterates also on the same edges
     1.9      /// as the OutArcIt and InArcIt but it is not convertible to Arc just
    1.10      /// to Edge.  
    1.11      class Graph {
    1.12 @@ -270,41 +270,41 @@
    1.13        ///
    1.14        ///\code
    1.15        /// int count=0;
    1.16 -      /// for(Graph::IncArcIt e(g, n); e!=INVALID; ++e) ++count;
    1.17 +      /// for(Graph::IncEdgeIt e(g, n); e!=INVALID; ++e) ++count;
    1.18        ///\endcode
    1.19 -      class IncArcIt : public Edge {
    1.20 +      class IncEdgeIt : public Edge {
    1.21        public:
    1.22          /// Default constructor
    1.23  
    1.24          /// @warning The default constructor sets the iterator
    1.25          /// to an undefined value.
    1.26 -        IncArcIt() { }
    1.27 +        IncEdgeIt() { }
    1.28          /// Copy constructor.
    1.29  
    1.30          /// Copy constructor.
    1.31          ///
    1.32 -        IncArcIt(const IncArcIt& e) : Edge(e) { }
    1.33 +        IncEdgeIt(const IncEdgeIt& e) : Edge(e) { }
    1.34          /// Initialize the iterator to be invalid.
    1.35  
    1.36          /// Initialize the iterator to be invalid.
    1.37          ///
    1.38 -        IncArcIt(Invalid) { }
    1.39 +        IncEdgeIt(Invalid) { }
    1.40          /// This constructor sets the iterator to first incident arc.
    1.41      
    1.42          /// This constructor set the iterator to the first incident arc of
    1.43          /// the node.
    1.44 -        IncArcIt(const Graph&, const Node&) { }
    1.45 -        /// Edge -> IncArcIt conversion
    1.46 +        IncEdgeIt(const Graph&, const Node&) { }
    1.47 +        /// Edge -> IncEdgeIt conversion
    1.48  
    1.49          /// Sets the iterator to the value of the trivial iterator \c e.
    1.50          /// This feature necessitates that each time we 
    1.51          /// iterate the arc-set, the iteration order is the same.
    1.52 -        IncArcIt(const Graph&, const Edge&) { }
    1.53 +        IncEdgeIt(const Graph&, const Edge&) { }
    1.54          /// Next incident arc
    1.55  
    1.56          /// Assign the iterator to the next incident arc
    1.57  	/// of the corresponding node.
    1.58 -        IncArcIt& operator++() { return *this; }
    1.59 +        IncEdgeIt& operator++() { return *this; }
    1.60        };
    1.61  
    1.62        /// The directed arc type.
    1.63 @@ -720,14 +720,14 @@
    1.64        /// \brief Base node of the iterator
    1.65        ///
    1.66        /// Returns the base node of the iterator
    1.67 -      Node baseNode(IncArcIt) const {
    1.68 +      Node baseNode(IncEdgeIt) const {
    1.69  	return INVALID;
    1.70        }
    1.71        
    1.72        /// \brief Running node of the iterator
    1.73        ///
    1.74        /// Returns the running node of the iterator
    1.75 -      Node runningNode(IncArcIt) const {
    1.76 +      Node runningNode(IncEdgeIt) const {
    1.77  	return INVALID;
    1.78        }
    1.79