lemon-1.2: comparison lemon/list

equal deleted inserted replaced

-:e51dfcdb46b1
+:f2f995ea1744
 static int id(Arc e) { return e.id; }
 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()) &&
+	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;
 if(first_free_node==-1) {
 	n = nodes.size();
 	first_node = nodes[n].next;
 }
 nodes[n].next = first_free_node;
 first_free_node = n;
+nodes[n].prev = -2;
 }
 void erase(const Arc& arc) {
 int n = arc.id;
 } else {
 	nodes[arcs[n].source].first_out = arcs[n].next_out;
 }
 arcs[n].next_in = first_free_arc;
 first_free_arc = n;
+arcs[n].prev_in = -2;
 }
 void clear() {
 arcs.clear();
 nodes.clear();
 ///and target node \c t.
 ///\return the new arc.
 Arc addArc(const Node& s, const Node& t) {
 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
 /// Change the target of \c e to \c n
 ///
 static Node nodeFromId(int id) { return Node(id);}
 static Arc arcFromId(int id) { return Arc(id);}
 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;
 if(first_free_node==-1) {
 	n = nodes.size();
 	first_node = nodes[n].next;
 }
 nodes[n].next = first_free_node;
 first_free_node = n;
+nodes[n].prev = -2;
 }
 void erase(const Edge& edge) {
 int n = edge.id * 2;
 	nodes[arcs[n].target].first_out = arcs[n | 1].next_out;
 }
 arcs[n].next_out = first_free_arc;
 first_free_arc = n;
+arcs[n].prev_out = -2;
+arcs[n | 1].prev_out = -2;
 }
 void clear() {
 arcs.clear();
 /// and target node \c t.
 /// \return the new edge.
 Edge addEdge(const Node& s, const Node& t) {
 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
 ///
 /// This function changes the source of \c e to \c n.
 ///
 ///\note The <tt>ArcIt</tt>s and <tt>InArcIt</tt>s

changeset 154	f4e4dbc1d467
parent 73	c56b7389dc78
child 184	716b220697a0