1.1 --- a/lemon/smart_graph.h	Mon Nov 14 18:36:45 2005 +0000
     1.2 +++ b/lemon/smart_graph.h	Mon Nov 14 18:38:41 2005 +0000
     1.3 @@ -30,8 +30,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/utility.h>
    1.12  
    1.13 @@ -90,12 +89,12 @@
    1.14      
    1.15      /// Maximum node ID.
    1.16      ///\sa id(Node)
    1.17 -    int maxId(Node) const { return nodes.size()-1; }
    1.18 +    int maxNodeId() const { return nodes.size()-1; }
    1.19      /// Maximum edge ID.
    1.20      
    1.21      /// Maximum edge ID.
    1.22      ///\sa id(Edge)
    1.23 -    int maxId(Edge) const { return edges.size()-1; }
    1.24 +    int maxEdgeId() const { return edges.size()-1; }
    1.25  
    1.26      Node source(Edge e) const { return edges[e.n].source; }
    1.27      Node target(Edge e) const { return edges[e.n].target; }
    1.28 @@ -103,8 +102,8 @@
    1.29      /// Node ID.
    1.30      
    1.31      /// The ID of a valid Node is a nonnegative integer not greater than
    1.32 -    /// \ref maxId(Node). The range of the ID's is not surely continuous
    1.33 -    /// and the greatest node ID can be actually less then \ref maxId(Node).
    1.34 +    /// \ref maxNodeId(). The range of the ID's is not surely continuous
    1.35 +    /// and the greatest node ID can be actually less then \ref maxNodeId().
    1.36      ///
    1.37      /// The ID of the \ref INVALID node is -1.
    1.38      ///\return The ID of the node \c v. 
    1.39 @@ -112,16 +111,16 @@
    1.40      /// Edge ID.
    1.41      
    1.42      /// The ID of a valid Edge is a nonnegative integer not greater than
    1.43 -    /// \ref maxId(Edge). The range of the ID's is not surely continuous
    1.44 -    /// and the greatest edge ID can be actually less then \ref maxId(Edge).
    1.45 +    /// \ref maxEdgeId(). The range of the ID's is not surely continuous
    1.46 +    /// and the greatest edge ID can be actually less then \ref maxEdgeId().
    1.47      ///
    1.48      /// The ID of the \ref INVALID edge is -1.
    1.49      ///\return The ID of the edge \c e. 
    1.50      static int id(Edge e) { return e.n; }
    1.51  
    1.52 -    static Node fromId(int id, Node) { return Node(id);}
    1.53 +    static Node nodeFromId(int id) { return Node(id);}
    1.54  
    1.55 -    static Edge fromId(int id, Edge) { return Edge(id);}
    1.56 +    static Edge edgeFromId(int id) { return Edge(id);}
    1.57  
    1.58      Node addNode() {
    1.59        Node n; n.n=nodes.size();
    1.60 @@ -151,10 +150,6 @@
    1.61  
    1.62      protected:
    1.63        int n;
    1.64 -      ///\e
    1.65 -
    1.66 -      ///\todo It should be removed (or at least define a setToId() instead).
    1.67 -      ///
    1.68        Node(int nn) {n=nn;}
    1.69      public:
    1.70        Node() {}
    1.71 @@ -171,8 +166,6 @@
    1.72  
    1.73      protected:
    1.74        int n;
    1.75 -      ///\todo It should be removed (or at least define a setToId() instead).
    1.76 -      ///
    1.77        Edge(int nn) {n=nn;}
    1.78      public:
    1.79        Edge() { }
    1.80 @@ -230,10 +223,10 @@
    1.81      ExtendableGraphExtender<
    1.82      MappableGraphExtender<
    1.83      IterableGraphExtender<
    1.84 -    AlterableGraphExtender<SmartGraphBase> > > > > ExtendedSmartGraphBase;
    1.85 +    AlterableGraphExtender<
    1.86 +    GraphExtender<SmartGraphBase> > > > > > ExtendedSmartGraphBase;
    1.87  
    1.88 -  /// \addtogroup graphs
    1.89 -  /// @{
    1.90 +  /// \ingroup graphs
    1.91  
    1.92    ///A smart graph class.
    1.93