1.1 --- a/lemon/graph_adaptor.h Mon Nov 14 18:36:45 2005 +0000
1.2 +++ b/lemon/graph_adaptor.h Mon Nov 14 18:38:41 2005 +0000
1.3 @@ -33,7 +33,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 -#include <lemon/bits/undir_graph_extender.h>
1.8 +#include <lemon/bits/graph_extender.h>
1.9 #include <iostream>
1.10
1.11 namespace lemon {
1.12 @@ -1859,11 +1859,11 @@
1.13 int id(const Node& node) const { return graph->id(node); }
1.14 int id(const Edge& edge) const { return edge.id; }
1.15
1.16 - Node fromId(int id, Node) const { return graph->fromId(id, Node()); }
1.17 - Edge fromId(int id, Edge) const { return Edge(id); }
1.18 + Node nodeFromId(int id) const { return graph->fromId(id, Node()); }
1.19 + Edge edgeFromId(int id) const { return Edge(id); }
1.20
1.21 - int maxId(Node) const { return graph->maxId(Node()); };
1.22 - int maxId(Edge) const { return edges.size() - 1; }
1.23 + int maxNodeId() const { return graph->maxId(Node()); };
1.24 + int maxEdgeId() const { return edges.size() - 1; }
1.25
1.26 Node source(const Edge& edge) const { return edges[edge.id].source;}
1.27 Node target(const Edge& edge) const { return edges[edge.id].target;}