lemon/list_graph.h
changeset 1791 62e7d237e1fb
parent 1774 9fd56d75293e
child 1812 a6f019fa6e7a
     1.1 --- a/lemon/list_graph.h	Mon Nov 14 18:36:45 2005 +0000
     1.2 +++ b/lemon/list_graph.h	Mon Nov 14 18:38:41 2005 +0000
     1.3 @@ -27,8 +27,7 @@
     1.4  #include <lemon/bits/iterable_graph_extender.h>
     1.5  #include <lemon/bits/alteration_notifier.h>
     1.6  #include <lemon/bits/default_map.h>
     1.7 -
     1.8 -#include <lemon/bits/undir_graph_extender.h>
     1.9 +#include <lemon/bits/graph_extender.h>
    1.10  
    1.11  #include <lemon/error.h>
    1.12  
    1.13 @@ -105,13 +104,13 @@
    1.14      
    1.15      /// Maximum node ID.
    1.16      ///\sa id(Node)
    1.17 -    int maxId(Node = INVALID) const { return nodes.size()-1; } 
    1.18 +    int maxNodeId() const { return nodes.size()-1; } 
    1.19  
    1.20      /// Maximum edge ID.
    1.21      
    1.22      /// Maximum edge ID.
    1.23      ///\sa id(Edge)
    1.24 -    int maxId(Edge = INVALID) const { return edges.size()-1; }
    1.25 +    int maxEdgeId() const { return edges.size()-1; }
    1.26  
    1.27      Node source(Edge e) const { return edges[e.id].source; }
    1.28      Node target(Edge e) const { return edges[e.id].target; }
    1.29 @@ -164,8 +163,8 @@
    1.30      static int id(Node v) { return v.id; }
    1.31      static int id(Edge e) { return e.id; }
    1.32  
    1.33 -    static Node fromId(int id, Node) { return Node(id);}
    1.34 -    static Edge fromId(int id, Edge) { return Edge(id);}
    1.35 +    static Node nodeFromId(int id) { return Node(id);}
    1.36 +    static Edge edgeFromId(int id) { return Edge(id);}
    1.37  
    1.38      /// Adds a new node to the graph.
    1.39  
    1.40 @@ -315,7 +314,8 @@
    1.41      ExtendableGraphExtender<
    1.42      MappableGraphExtender<
    1.43      IterableGraphExtender<
    1.44 -    AlterableGraphExtender<ListGraphBase> > > > > > ExtendedListGraphBase;
    1.45 +    AlterableGraphExtender<
    1.46 +    GraphExtender<ListGraphBase> > > > > > > ExtendedListGraphBase;
    1.47  
    1.48    /// \addtogroup graphs
    1.49    /// @{