Changeset 1791:62e7d237e1fb in lemon-0.x for lemon/smart_graph.h

Timestamp:

11/14/05 19:38:41 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Modification on the base graph concept
The extended interface does not changed

File:

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

lemon/smart_graph.h

@@ -31 +31 @@
 #include <lemon/bits/alteration_notifier.h>
 #include <lemon/bits/default_map.h>
-
-#include <lemon/bits/undir_graph_extender.h>
+#include <lemon/bits/graph_extender.h>
 
 #include <lemon/utility.h>
@@ -91 +90 @@
     /// Maximum node ID.
     ///\sa id(Node)
-    int maxId(Node) const { return nodes.size()-1; }
+    int maxNodeId() const { return nodes.size()-1; }
     /// Maximum edge ID.
     
     /// Maximum edge ID.
     ///\sa id(Edge)
-    int maxId(Edge) const { return edges.size()-1; }
+    int maxEdgeId() const { return edges.size()-1; }
 
     Node source(Edge e) const { return edges[e.n].source; }
@@ -104 +103 @@
     
     /// The ID of a valid Node is a nonnegative integer not greater than
-    /// \ref maxId(Node). The range of the ID's is not surely continuous
-    /// and the greatest node ID can be actually less then \ref maxId(Node).
+    /// \ref maxNodeId(). The range of the ID's is not surely continuous
+    /// and the greatest node ID can be actually less then \ref maxNodeId().
     ///
     /// The ID of the \ref INVALID node is -1.
@@ -113 +112 @@
     
     /// The ID of a valid Edge is a nonnegative integer not greater than
-    /// \ref maxId(Edge). The range of the ID's is not surely continuous
-    /// and the greatest edge ID can be actually less then \ref maxId(Edge).
+    /// \ref maxEdgeId(). The range of the ID's is not surely continuous
+    /// and the greatest edge ID can be actually less then \ref maxEdgeId().
     ///
     /// The ID of the \ref INVALID edge is -1.
@@ -120 +119 @@
     static int id(Edge e) { return e.n; }
 
-    static Node fromId(int id, Node) { return Node(id);}
-
-    static Edge fromId(int id, Edge) { return Edge(id);}
+    static Node nodeFromId(int id) { return Node(id);}
+
+    static Edge edgeFromId(int id) { return Edge(id);}
 
     Node addNode() {
@@ -152 +151 @@
     protected:
       int n;
-      ///\e
-
-      ///\todo It should be removed (or at least define a setToId() instead).
-      ///
       Node(int nn) {n=nn;}
     public:
@@ -172 +167 @@
     protected:
       int n;
-      ///\todo It should be removed (or at least define a setToId() instead).
-      ///
       Edge(int nn) {n=nn;}
     public:
@@ -231 +224 @@
     MappableGraphExtender<
     IterableGraphExtender<
-    AlterableGraphExtender<SmartGraphBase> > > > > ExtendedSmartGraphBase;
-
-  /// \addtogroup graphs
-  /// @{
+    AlterableGraphExtender<
+    GraphExtender<SmartGraphBase> > > > > > ExtendedSmartGraphBase;
+
+  /// \ingroup graphs
 
   ///A smart graph class.