lemon-1.2: comparison lemon/list

equal deleted inserted replaced

-:a0590c6b6d2e
+:e01f5a795e18
 /// \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 a to \c n
-/// Change the target of \c e to \c n
+/// Change the target of \c a to \c n
 ///
 ///\note The <tt>ArcIt</tt>s and <tt>OutArcIt</tt>s referencing
 ///the changed arc remain valid. However <tt>InArcIt</tt>s are
 ///invalidated.
 ///
 ///\warning This functionality cannot be used together with the Snapshot
 ///feature.
-void changeTarget(Arc e, Node n) {
+void changeTarget(Arc a, Node n) {
-Parent::changeTarget(e,n);
+Parent::changeTarget(a,n);
 }
-/// Change the source of \c e to \c n
+/// Change the source of \c a to \c n
-/// Change the source of \c e to \c n
+/// Change the source of \c a to \c n
 ///
-///\note The <tt>ArcIt</tt>s and <tt>InArcIt</tt>s referencing
+///\note The <tt>InArcIt</tt>s referencing the changed arc remain
-///the changed arc remain valid. However <tt>OutArcIt</tt>s are
+///valid. However the <tt>ArcIt<tt>s and <tt>OutArcIt</tt>s are
 ///invalidated.
 ///
 ///\warning This functionality cannot be used together with the Snapshot
 ///feature.
-void changeSource(Arc e, Node n) {
+void changeSource(Arc a, Node n) {
-Parent::changeSource(e,n);
+Parent::changeSource(a,n);
 }
 /// Invert the direction of an arc.
 ///\note The <tt>ArcIt</tt>s referencing the changed arc remain
 first_node = first_free_node = first_free_arc = -1;
 }
 protected:
-void changeTarget(Edge e, Node n) {
+void changeV(Edge e, Node n) {
 if(arcs[2 * e.id].next_out != -1) {
 arcs[arcs[2 * e.id].next_out].prev_out = arcs[2 * e.id].prev_out;
 }
 if(arcs[2 * e.id].prev_out != -1) {
 arcs[arcs[2 * e.id].prev_out].next_out =
 arcs[2 * e.id].prev_out = -1;
 arcs[2 * e.id].next_out = nodes[n.id].first_out;
 nodes[n.id].first_out = 2 * e.id;
 }
-void changeSource(Edge e, Node n) {
+void changeU(Edge e, Node n) {
 if(arcs[(2 * e.id) | 1].next_out != -1) {
 arcs[arcs[(2 * e.id) | 1].next_out].prev_out =
 arcs[(2 * e.id) | 1].prev_out;
 }
 if(arcs[(2 * e.id) | 1].prev_out != -1) {
 ///
 /// \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
+/// \brief Change the end \c u of \c e to \c n
 ///
-/// This function changes the source of \c e to \c n.
+/// This function changes the end \c u of \c e to node \c n.
 ///
-///\note The <tt>ArcIt</tt>s and <tt>InArcIt</tt>s
+///\note The <tt>EdgeIt</tt>s and <tt>ArcIt</tt>s referencing the
-///referencing the changed arc remain
+///changed edge are invalidated and if the changed node is the
-///valid. However <tt>OutArcIt</tt>s are invalidated.
+///base node of an iterator then this iterator is also
+///invalidated.
 ///
 ///\warning This functionality cannot be used together with the
 ///Snapshot feature.
-void changeSource(Edge e, Node n) {
+void changeU(Edge e, Node n) {
-Parent::changeSource(e,n);
+Parent::changeU(e,n);
 }
-/// \brief Change the target of \c e to \c n
+/// \brief Change the end \c v of \c e to \c n
 ///
-/// This function changes the target of \c e to \c n.
+/// This function changes the end \c v of \c e to \c n.
 ///
-/// \note The <tt>ArcIt</tt>s referencing the changed arc remain
+///\note The <tt>EdgeIt</tt>s referencing the changed edge remain
-/// valid. However the other iterators may be invalidated.
+///valid, however <tt>ArcIt</tt>s and if the changed node is the
+///base node of an iterator then this iterator is invalidated.
 ///
 ///\warning This functionality cannot be used together with the
 ///Snapshot feature.
-void changeTarget(Edge e, Node n) {
+void changeV(Edge e, Node n) {
-Parent::changeTarget(e,n);
+Parent::changeV(e,n);
-}
-/// \brief Change the source of \c e to \c n
-///
-/// This function changes the source of \c e to \c n.
-/// It also changes the proper node of the represented edge.
-///
-///\note The <tt>ArcIt</tt>s and <tt>InArcIt</tt>s
-///referencing the changed arc remain
-///valid. However <tt>OutArcIt</tt>s are invalidated.
-///
-///\warning This functionality cannot be used together with the
-///Snapshot feature.
-void changeSource(Arc e, Node n) {
-if (Parent::direction(e)) {
-Parent::changeSource(e,n);
-} else {
-Parent::changeTarget(e,n);
-}
-}
-/// \brief Change the target of \c e to \c n
-///
-/// This function changes the target of \c e to \c n.
-/// It also changes the proper node of the represented edge.
-///
-///\note The <tt>ArcIt</tt>s and <tt>OutArcIt</tt>s
-///referencing the changed arc remain
-///valid. However <tt>InArcIt</tt>s are invalidated.
-///
-///\warning This functionality cannot be used together with the
-///Snapshot feature.
-void changeTarget(Arc e, Node n) {
-if (Parent::direction(e)) {
-Parent::changeTarget(e,n);
-} else {
-Parent::changeSource(e,n);
-}
 }
 /// \brief Contract two nodes.
 ///
 /// This function contracts two nodes.
 /// Node \p b will be removed but instead of deleting
 void contract(Node a, Node b, bool r = true) {
 for(IncEdgeIt e(*this, b); e!=INVALID;) {
 IncEdgeIt f = e; ++f;
 if (r && runningNode(e) == a) {
 erase(e);
-} else if (source(e) == b) {
+} else if (u(e) == b) {
-changeSource(e, a);
+changeU(e, a);
 } else {
-changeTarget(e, a);
+changeV(e, a);
 }
 e = f;
 }
 erase(b);
 }

changeset 268	986d30f5c1c0
parent 238	79643f6e8c52
parent 235	b46d2787e9c2
child 280	e7f8647ce760