Changeset 2111:ea1fa1bc3f6d in lemon-0.x for lemon/list_graph.h

Timestamp:

06/28/06 17:06:24 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2817

Message:

Removing concepts for extendable and erasable graphs
Renaming StaticGraph? to Graph

File:

• lemon/list_graph.h (modified) (11 diffs)

lemon/list_graph.h

@@ -275 +275 @@
 
   protected:
-    void _changeTarget(Edge e, Node n) 
+    void changeTarget(Edge e, Node n) 
     {
       if(edges[e.id].next_in != -1)
@@ -290 +290 @@
       nodes[n.id].first_in = e.id;
     }
-    void _changeSource(Edge e, Node n) 
+    void changeSource(Edge e, Node n) 
     {
       if(edges[e.id].next_out != -1)
@@ -317 +317 @@
   ///This is a simple and fast erasable graph implementation.
   ///
-  ///It conforms to the
-  ///\ref concept::ErasableGraph "ErasableGraph" concept and
-  ///it also provides several additional useful extra functionalities.
-  ///\sa concept::ErasableGraph.
+  ///It conforms to the \ref concept::Graph "Graph" concept and it
+  ///also provides several additional useful extra functionalities.
+  ///The most of the member functions and nested classes are
+  ///documented only in the concept class.
+  ///\sa concept::Graph.
 
   class ListGraph : public ExtendedListGraphBase {
@@ -326 +327 @@
 
     typedef ExtendedListGraphBase Parent;
+
+    ///Add a new node to the graph.
+    
+    /// \return the new node.
+    ///
+    Node addNode() { return Parent::addNode(); }
+
+    ///Add a new edge to the graph.
+    
+    ///Add a new edge to the graph with source node \c s
+    ///and target node \c t.
+    ///\return the new edge.
+    Edge addEdge(const Node& s, const Node& t) { 
+      return Parent::addEdge(s, t); 
+    }
 
     /// Changes the target of \c e to \c n
@@ -335 +351 @@
     ///valid. However <tt>InEdge</tt>s are invalidated.
     void changeTarget(Edge e, Node n) { 
-      _changeTarget(e,n); 
+      Parent::changeTarget(e,n); 
     }
     /// Changes the source of \c e to \c n
@@ -345 +361 @@
     ///valid. However <tt>OutEdge</tt>s are invalidated.
     void changeSource(Edge e, Node n) { 
-      _changeSource(e,n);
+      Parent::changeSource(e,n);
     }
 
@@ -355 +371 @@
     void reverseEdge(Edge e) {
       Node t=target(e);
-      _changeTarget(e,source(e));
-      _changeSource(e,t);
-    }
-
-    ///Using this it is possible to avoid the superfluous memory
-    ///allocation.
+      changeTarget(e,source(e));
+      changeSource(e,t);
+    }
+
+    /// \brief Using this it is possible to avoid the superfluous memory
+    /// allocation.
 
     ///Using this it is possible to avoid the superfluous memory
@@ -368 +384 @@
     void reserveNode(int n) { nodes.reserve(n); };
 
-    ///Using this it is possible to avoid the superfluous memory
-    ///allocation.
+    /// \brief Using this it is possible to avoid the superfluous memory
+    /// allocation.
 
     ///Using this it is possible to avoid the superfluous memory
@@ -599 +615 @@
   public:
     typedef ExtendedListUGraphBase Parent;
+    /// \brief Add a new node to the graph.
+    ///
+    /// \return the new node.
+    ///
+    Node addNode() { return Parent::addNode(); }
+
+    /// \brief Add a new edge to the graph.
+    ///
+    /// Add a new edge to the graph with source node \c s
+    /// and target node \c t.
+    /// \return the new undirected edge.
+    UEdge addEdge(const Node& s, const Node& t) { 
+      return Parent::addEdge(s, t); 
+    }
     /// \brief Changes the target of \c e to \c n
     ///
@@ -607 +637 @@
     /// valid. However <tt>InEdge</tt>'s are invalidated.
     void changeTarget(UEdge e, Node n) { 
-      _changeTarget(e,n); 
+      Parent::changeTarget(e,n); 
     }
     /// Changes the source of \c e to \c n
@@ -617 +647 @@
     ///valid. However <tt>OutEdge</tt>'s are invalidated.
     void changeSource(UEdge e, Node n) { 
-      _changeSource(e,n); 
+      Parent::changeSource(e,n); 
     }
     /// \brief Contract two nodes.