Changes in lemon/smart_graph.h [125:19e82bda606a:149:2f7ae34e1333] in lemon-1.2

File:

• lemon/smart_graph.h (modified) (6 diffs)

lemon/smart_graph.h

@@ -74 +74 @@
     
     typedef True NodeNumTag;
-    typedef True ArcNumTag;
+    typedef True EdgeNumTag;
 
     int nodeNum() const { return nodes.size(); }
@@ -115 +115 @@
     static Node nodeFromId(int id) { return Node(id);}
     static Arc arcFromId(int id) { return Arc(id);}
+
+    bool valid(Node n) const { 
+      return n._id >= 0 && n._id < static_cast<int>(nodes.size()); 
+    }
+    bool valid(Arc a) const { 
+      return a._id >= 0 && a._id < static_cast<int>(arcs.size()); 
+    }
 
     class Node {
@@ -261 +268 @@
     /// \sa reserveNode
     void reserveArc(int m) { arcs.reserve(m); };
+
+    /// \brief Node validity check
+    ///
+    /// This function gives back true if the given node is valid,
+    /// ie. it is a real node of the graph.  
+    ///
+    /// \warning A removed node (using Snapshot) could become valid again
+    /// when new nodes are added to the graph.
+    bool valid(Node n) const { return Parent::valid(n); }
+
+    /// \brief Arc validity check
+    ///
+    /// This function gives back true if the given arc is valid,
+    /// ie. it is a real arc of the graph.  
+    ///
+    /// \warning A removed arc (using Snapshot) could become valid again
+    /// when new arcs are added to the graph.
+    bool valid(Arc a) const { return Parent::valid(a); }
 
     ///Clear the digraph.
@@ -551 +576 @@
     static Edge edgeFromId(int id) { return Edge(id);}
 
+    bool valid(Node n) const { 
+      return n._id >= 0 && n._id < static_cast<int>(nodes.size()); 
+    }
+    bool valid(Arc a) const { 
+      return a._id >= 0 && a._id < static_cast<int>(arcs.size());
+    }
+    bool valid(Edge e) const { 
+      return e._id >= 0 && 2 * e._id < static_cast<int>(arcs.size()); 
+    }
+
     Node addNode() {     
       int n = nodes.size();
@@ -559 +594 @@
     }
     
-    Edge addArc(Node u, Node v) {
+    Edge addEdge(Node u, Node v) {
       int n = arcs.size();
       arcs.push_back(ArcT());
@@ -640 +675 @@
     ///\return the new edge.
     Edge addEdge(const Node& s, const Node& t) { 
-      return Parent::addArc(s, t); 
-    }
+      return Parent::addEdge(s, t); 
+    }
+
+    /// \brief Node validity check
+    ///
+    /// This function gives back true if the given node is valid,
+    /// ie. it is a real node of the graph.  
+    ///
+    /// \warning A removed node (using Snapshot) could become valid again
+    /// when new nodes are added to the graph.
+    bool valid(Node n) const { return Parent::valid(n); }
+
+    /// \brief Arc validity check
+    ///
+    /// This function gives back true if the given arc is valid,
+    /// ie. it is a real arc of the graph.  
+    ///
+    /// \warning A removed arc (using Snapshot) could become valid again
+    /// when new edges are added to the graph.
+    bool valid(Arc a) const { return Parent::valid(a); }
+
+    /// \brief Edge validity check
+    ///
+    /// This function gives back true if the given edge is valid,
+    /// ie. it is a real edge of the graph.  
+    ///
+    /// \warning A removed edge (using Snapshot) could become valid again
+    /// when new edges are added to the graph.
+    bool valid(Edge e) const { return Parent::valid(e); }
 
     ///Clear the graph.