Changes in lemon/concepts/graph.h [78:c46b3453455f:57:c1acf0018c0a] in lemon-1.0

File:

• lemon/concepts/graph.h (modified) (7 diffs)

lemon/concepts/graph.h

@@ -64 +64 @@
     /// the EdgeMap to map values for the edges. The InArcIt and
     /// OutArcIt iterates on the same edges but with opposite
-    /// direction. The IncEdgeIt iterates also on the same edges
+    /// direction. The IncArcIt iterates also on the same edges
     /// as the OutArcIt and InArcIt but it is not convertible to Arc just
     /// to Edge.  
@@ -271 +271 @@
       ///\code
       /// int count=0;
-      /// for(Graph::IncEdgeIt e(g, n); e!=INVALID; ++e) ++count;
+      /// for(Graph::IncArcIt e(g, n); e!=INVALID; ++e) ++count;
       ///\endcode
-      class IncEdgeIt : public Edge {
-      public:
-        /// Default constructor
-
-        /// @warning The default constructor sets the iterator
-        /// to an undefined value.
-        IncEdgeIt() { }
-        /// Copy constructor.
-
-        /// Copy constructor.
-        ///
-        IncEdgeIt(const IncEdgeIt& e) : Edge(e) { }
-        /// Initialize the iterator to be invalid.
-
-        /// Initialize the iterator to be invalid.
-        ///
-        IncEdgeIt(Invalid) { }
+      class IncArcIt : public Edge {
+      public:
+        /// Default constructor
+
+        /// @warning The default constructor sets the iterator
+        /// to an undefined value.
+        IncArcIt() { }
+        /// Copy constructor.
+
+        /// Copy constructor.
+        ///
+        IncArcIt(const IncArcIt& e) : Edge(e) { }
+        /// Initialize the iterator to be invalid.
+
+        /// Initialize the iterator to be invalid.
+        ///
+        IncArcIt(Invalid) { }
         /// This constructor sets the iterator to first incident arc.
     
         /// This constructor set the iterator to the first incident arc of
         /// the node.
-        IncEdgeIt(const Graph&, const Node&) { }
-        /// Edge -> IncEdgeIt conversion
+        IncArcIt(const Graph&, const Node&) { }
+        /// Edge -> IncArcIt conversion
 
         /// Sets the iterator to the value of the trivial iterator \c e.
         /// This feature necessitates that each time we 
         /// iterate the arc-set, the iteration order is the same.
-        IncEdgeIt(const Graph&, const Edge&) { }
+        IncArcIt(const Graph&, const Edge&) { }
         /// Next incident arc
 
         /// Assign the iterator to the next incident arc
         /// of the corresponding node.
-        IncEdgeIt& operator++() { return *this; }
+        IncArcIt& operator++() { return *this; }
       };
 
@@ -625 +625 @@
       Node target(Arc) const { return INVALID; }
 
-      /// \brief Returns the id of the node.
-      int id(Node) const { return -1; } 
-
-      /// \brief Returns the id of the edge.
-      int id(Edge) const { return -1; } 
-
-      /// \brief Returns the id of the arc.
-      int id(Arc) const { return -1; } 
-
-      /// \brief Returns the node with the given id.
-      ///
-      /// \pre The argument should be a valid node id in the graph.
-      Node nodeFromId(int) const { return INVALID; } 
-
-      /// \brief Returns the edge with the given id.
-      ///
-      /// \pre The argument should be a valid edge id in the graph.
-      Edge edgeFromId(int) const { return INVALID; } 
-
-      /// \brief Returns the arc with the given id.
-      ///
-      /// \pre The argument should be a valid arc id in the graph.
-      Arc arcFromId(int) const { return INVALID; } 
-
-      /// \brief Returns an upper bound on the node IDs.
-      int maxNodeId() const { return -1; } 
-
-      /// \brief Returns an upper bound on the edge IDs.
-      int maxEdgeId() const { return -1; } 
-
-      /// \brief Returns an upper bound on the arc IDs.
-      int maxArcId() const { return -1; } 
-
       void first(Node&) const {}
       void next(Node&) const {}
@@ -673 +640 @@
       void nextIn(Arc&) const {}
 
+
       void firstInc(Edge &, bool &, const Node &) const {}
       void nextInc(Edge &, bool &) const {}
-
-      // The second parameter is dummy.
-      Node fromId(int, Node) const { return INVALID; }
-      // The second parameter is dummy.
-      Edge fromId(int, Edge) const { return INVALID; }
-      // The second parameter is dummy.
-      Arc fromId(int, Arc) const { return INVALID; }
-
-      // Dummy parameter.
-      int maxId(Node) const { return -1; } 
-      // Dummy parameter.
-      int maxId(Edge) const { return -1; } 
-      // Dummy parameter.
-      int maxId(Arc) const { return -1; } 
 
       /// \brief Base node of the iterator
@@ -721 +675 @@
       ///
       /// Returns the base node of the iterator
-      Node baseNode(IncEdgeIt) const {
+      Node baseNode(IncArcIt) const {
         return INVALID;
       }
@@ -728 +682 @@
       ///
       /// Returns the running node of the iterator
-      Node runningNode(IncEdgeIt) const {
+      Node runningNode(IncArcIt) const {
         return INVALID;
       }
@@ -736 +690 @@
         void constraints() {
           checkConcept<IterableGraphComponent<>, Graph>();
-          checkConcept<IDableGraphComponent<>, Graph>();
           checkConcept<MappableGraphComponent<>, Graph>();
         }