Changeset 1791:62e7d237e1fb in lemon-0.x for lemon/full_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/full_graph.h (modified) (6 diffs)

lemon/full_graph.h

@@ -24 +24 @@
 #include <lemon/bits/alteration_notifier.h>
 #include <lemon/bits/static_map.h>
-
-#include <lemon/bits/undir_graph_extender.h>
+#include <lemon/bits/graph_extender.h>
 
 #include <lemon/invalid.h>
@@ -71 +70 @@
     /// Maximum node ID.
     ///\sa id(Node)
-    int maxId(Node = INVALID) const { return _nodeNum-1; }
+    int maxNodeId() const { return _nodeNum-1; }
     /// Maximum edge ID.
     
     /// Maximum edge ID.
     ///\sa id(Edge)
-    int maxId(Edge = INVALID) const { return _edgeNum-1; }
+    int maxEdgeId() const { return _edgeNum-1; }
 
     Node source(Edge e) const { return e.id % _nodeNum; }
@@ -102 +101 @@
     static int id(Edge e) { return e.id; }
 
-    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);}
 
     typedef True FindEdgeTag;
@@ -191 +190 @@
   };
 
-
-  typedef AlterableGraphExtender<FullGraphBase> 
-  AlterableFullGraphBase;
-  typedef IterableGraphExtender<AlterableFullGraphBase> 
-  IterableFullGraphBase;
   typedef StaticMappableGraphExtender<
     IterableGraphExtender<
-    AlterableGraphExtender<FullGraphBase> > > ExtendedFullGraphBase;
+    AlterableGraphExtender<
+    GraphExtender<FullGraphBase> > > > ExtendedFullGraphBase;
 
   /// \ingroup graphs
@@ -218 +213 @@
   };
 
-  ///@}
 
   class UndirFullGraphBase {
@@ -253 +247 @@
     /// Maximum node ID.
     ///\sa id(Node)
-    int maxId(Node = INVALID) const { return _nodeNum-1; }
+    int maxNodeId() const { return _nodeNum-1; }
     /// Maximum edge ID.
     
     /// Maximum edge ID.
     ///\sa id(Edge)
-    int maxId(Edge = INVALID) const { return _edgeNum-1; }
+    int maxEdgeId() const { return _edgeNum-1; }
 
     Node source(Edge e) const {