1.1 --- a/doc/graph_io.dox	Wed Nov 30 13:24:23 2005 +0000
     1.2 +++ b/doc/graph_io.dox	Wed Nov 30 13:24:37 2005 +0000
     1.3 @@ -442,15 +442,17 @@
     1.4  
     1.5  \code
     1.6  UndirListGraph network;
     1.7 -UndirListGraph::UndirEdgeSet<double> capacity;
     1.8 +UndirListGraph::UndirEdgeMap<double> capacity;
     1.9  NewEdgeSetAdaptor<UndirListGraph> traffic(network);
    1.10  NewEdgeSetAdaptor<UndirListGraph>::EdgeSet<double> request(network);
    1.11  
    1.12  LemonReader reader(std::cin);
    1.13 -NodeSetReader nodesetReader(reader, network);
    1.14 -UndirEdgeSetReader undirEdgesetReader(reader, network, nodesetReader);
    1.15 +NodeSetReader<UndirListGraph> nodesetReader(reader, network);
    1.16 +UndirEdgeSetReader<UndirListGraph> 
    1.17 +  undirEdgesetReader(reader, network, nodesetReader);
    1.18  undirEdgesetReader.readEdgeMap("capacity", capacity);
    1.19 -EdgeSetReader edgesetReader(reader, traffic, nodesetReader);
    1.20 +EdgeSetReader<NewEdgeSetAdaptor<UndirListGraph> > 
    1.21 +  edgesetReader(reader, traffic, nodesetReader);
    1.22  edgesetReader.readEdgeMap("request", request);
    1.23  
    1.24  reader.run();

     2.1 --- a/lemon/graph_adaptor.h	Wed Nov 30 13:24:23 2005 +0000
     2.2 +++ b/lemon/graph_adaptor.h	Wed Nov 30 13:24:37 2005 +0000
     2.3 @@ -1892,7 +1892,8 @@
     2.4      MappableGraphExtender<
     2.5      IterableGraphExtender<
     2.6      AlterableGraphExtender<
     2.7 -    NewEdgeSetAdaptorBase<_Graph> > > > > > > {
     2.8 +    GraphExtender<
     2.9 +    NewEdgeSetAdaptorBase<_Graph> > > > > > > > {
    2.10  
    2.11    public:
    2.12  
    2.13 @@ -1902,7 +1903,8 @@
    2.14        MappableGraphExtender<
    2.15        IterableGraphExtender<
    2.16        AlterableGraphExtender<
    2.17 -      NewEdgeSetAdaptorBase<_Graph> > > > > > > Parent;
    2.18 +      GraphExtender<
    2.19 +      NewEdgeSetAdaptorBase<_Graph> > > > > > > > Parent;
    2.20      
    2.21  
    2.22      typedef typename Parent::Node Node;

     3.1 --- a/lemon/time_measure.h	Wed Nov 30 13:24:23 2005 +0000
     3.2 +++ b/lemon/time_measure.h	Wed Nov 30 13:24:37 2005 +0000
     3.3 @@ -371,7 +371,7 @@
     3.4    ///\return The average running time of \c f.
     3.5    
     3.6    template<class F>
     3.7 -  TimeStamp runningTimeTest(const F &f,double min_time=10,int *num = NULL,
     3.8 +  TimeStamp runningTimeTest(F f,double min_time=10,int *num = NULL,
     3.9  			TimeStamp *full_time=NULL)
    3.10    {
    3.11      Timer t;