Changeset 149:2f7ae34e1333 in lemon-1.2 for lemon

Timestamp:

04/24/08 14:53:09 (16 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Phase:

public

Message:

Item validity checking for ListGraph? and SmartGraph?

Location:

lemon

Files:

• list_graph.h (modified) (8 diffs)
• smart_graph.h (modified) (4 diffs)

lemon/list_graph.h

@@ -153 +153 @@
     static Arc arcFromId(int id) { return Arc(id);}
 
+    bool valid(Node n) const { 
+      return n.id >= 0 && n.id < static_cast<int>(nodes.size()) && 
+        nodes[n.id].prev != -2;
+    }
+
+    bool valid(Arc a) const { 
+      return a.id >= 0 && a.id < static_cast<int>(arcs.size()) && 
+        arcs[a.id].prev_in != -2;
+    }
+
     Node addNode() {     
       int n;
@@ -220 +230 @@
       nodes[n].next = first_free_node;
       first_free_node = n;
+      nodes[n].prev = -2;
 
     }
@@ -248 +259 @@
       
       arcs[n].next_in = first_free_arc;
-      first_free_arc = n;      
-
+      first_free_arc = n;
+      arcs[n].prev_in = -2;
     }
 
@@ -350 +361 @@
       return Parent::addArc(s, t); 
     }
+
+    /// 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 Node pointing to a removed item
+    /// could become valid again later if new nodes are
+    /// added to the graph.
+    bool valid(Node n) const { return Parent::valid(n); }
+
+    /// Arc validity check
+
+    /// This function gives back true if the given arc is valid,
+    /// ie. it is a real arc of the graph.  
+    ///
+    /// \warning An Arc pointing to a removed item
+    /// could become valid again later if new nodes are
+    /// added to the graph.
+    bool valid(Arc a) const { return Parent::valid(a); }
 
     /// Change the target of \c e to \c n
@@ -946 +977 @@
     static Edge edgeFromId(int id) { return Edge(id);}
 
+    bool valid(Node n) const { 
+      return n.id >= 0 && n.id < static_cast<int>(nodes.size()) && 
+        nodes[n.id].prev != -2;
+    }
+
+    bool valid(Arc a) const { 
+      return a.id >= 0 && a.id < static_cast<int>(arcs.size()) && 
+        arcs[a.id].prev_out != -2;
+    }
+
+    bool valid(Edge e) const { 
+      return e.id >= 0 && 2 * e.id < static_cast<int>(arcs.size()) && 
+        arcs[2 * e.id].prev_out != -2;
+    }
+
     Node addNode() {     
       int n;
@@ -1014 +1060 @@
       nodes[n].next = first_free_node;
       first_free_node = n;
-
+      nodes[n].prev = -2;
     }
     
@@ -1042 +1088 @@
       arcs[n].next_out = first_free_arc;
       first_free_arc = n;      
+      arcs[n].prev_out = -2;
+      arcs[n | 1].prev_out = -2;
 
     }
@@ -1158 +1206 @@
       return Parent::addEdge(s, t); 
     }
+    /// 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 Node pointing to a removed item
+    /// could become valid again later if new nodes are
+    /// added to the graph.
+    bool valid(Node n) const { return Parent::valid(n); }
+    /// Arc validity check
+
+    /// This function gives back true if the given arc is valid,
+    /// ie. it is a real arc of the graph.  
+    ///
+    /// \warning An Arc pointing to a removed item
+    /// could become valid again later if new edges are
+    /// added to the graph.
+    bool valid(Arc a) const { return Parent::valid(a); }
+    /// Edge validity check
+
+    /// This function gives back true if the given edge is valid,
+    /// ie. it is a real arc of the graph.  
+    ///
+    /// \warning A Edge pointing to a removed item
+    /// could become valid again later if new edges are
+    /// added to the graph.
+    bool valid(Edge e) const { return Parent::valid(e); }
     /// \brief Change the source of \c e to \c n
     ///

lemon/smart_graph.h

@@ -116 +116 @@
     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 {
       friend class SmartDigraphBase;
@@ -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();
@@ -642 +677 @@
       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.