diff -r c7dd9d8c770a -r 62e7d237e1fb lemon/list_graph.h --- a/lemon/list_graph.h Mon Nov 14 18:36:45 2005 +0000 +++ b/lemon/list_graph.h Mon Nov 14 18:38:41 2005 +0000 @@ -27,8 +27,7 @@ #include #include #include - -#include +#include #include @@ -105,13 +104,13 @@ /// Maximum node ID. ///\sa id(Node) - int maxId(Node = INVALID) const { return nodes.size()-1; } + int maxNodeId() const { return nodes.size()-1; } /// Maximum edge ID. /// Maximum edge ID. ///\sa id(Edge) - int maxId(Edge = INVALID) const { return edges.size()-1; } + int maxEdgeId() const { return edges.size()-1; } Node source(Edge e) const { return edges[e.id].source; } Node target(Edge e) const { return edges[e.id].target; } @@ -164,8 +163,8 @@ static int id(Node v) { return v.id; } 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);} /// Adds a new node to the graph. @@ -315,7 +314,8 @@ ExtendableGraphExtender< MappableGraphExtender< IterableGraphExtender< - AlterableGraphExtender > > > > > ExtendedListGraphBase; + AlterableGraphExtender< + GraphExtender > > > > > > ExtendedListGraphBase; /// \addtogroup graphs /// @{