[Lemon-commits] [lemon_svn] deba: r2392 - in hugo/trunk: doc lemon

[Lemon SVN]

Author: deba
Date: Wed Nov 30 14:24:37 2005
New Revision: 2392

Modified:
   hugo/trunk/doc/graph_io.dox
   hugo/trunk/lemon/graph_adaptor.h
   hugo/trunk/lemon/time_measure.h

Log:
Some bug fix


Modified: hugo/trunk/doc/graph_io.dox
==============================================================================
--- hugo/trunk/doc/graph_io.dox	(original)
+++ hugo/trunk/doc/graph_io.dox	Wed Nov 30 14:24:37 2005
@@ -442,15 +442,17 @@
 
 \code
 UndirListGraph network;
-UndirListGraph::UndirEdgeSet<double> capacity;
+UndirListGraph::UndirEdgeMap<double> capacity;
 NewEdgeSetAdaptor<UndirListGraph> traffic(network);
 NewEdgeSetAdaptor<UndirListGraph>::EdgeSet<double> request(network);
 
 LemonReader reader(std::cin);
-NodeSetReader nodesetReader(reader, network);
-UndirEdgeSetReader undirEdgesetReader(reader, network, nodesetReader);
+NodeSetReader<UndirListGraph> nodesetReader(reader, network);
+UndirEdgeSetReader<UndirListGraph> 
+  undirEdgesetReader(reader, network, nodesetReader);
 undirEdgesetReader.readEdgeMap("capacity", capacity);
-EdgeSetReader edgesetReader(reader, traffic, nodesetReader);
+EdgeSetReader<NewEdgeSetAdaptor<UndirListGraph> > 
+  edgesetReader(reader, traffic, nodesetReader);
 edgesetReader.readEdgeMap("request", request);
 
 reader.run();

Modified: hugo/trunk/lemon/graph_adaptor.h
==============================================================================
--- hugo/trunk/lemon/graph_adaptor.h	(original)
+++ hugo/trunk/lemon/graph_adaptor.h	Wed Nov 30 14:24:37 2005
@@ -1892,7 +1892,8 @@
     MappableGraphExtender<
     IterableGraphExtender<
     AlterableGraphExtender<
-    NewEdgeSetAdaptorBase<_Graph> > > > > > > {
+    GraphExtender<
+    NewEdgeSetAdaptorBase<_Graph> > > > > > > > {
 
   public:
 
@@ -1902,7 +1903,8 @@
       MappableGraphExtender<
       IterableGraphExtender<
       AlterableGraphExtender<
-      NewEdgeSetAdaptorBase<_Graph> > > > > > > Parent;
+      GraphExtender<
+      NewEdgeSetAdaptorBase<_Graph> > > > > > > > Parent;
     
 
     typedef typename Parent::Node Node;

Modified: hugo/trunk/lemon/time_measure.h
==============================================================================
--- hugo/trunk/lemon/time_measure.h	(original)
+++ hugo/trunk/lemon/time_measure.h	Wed Nov 30 14:24:37 2005
@@ -371,7 +371,7 @@
   ///\return The average running time of \c f.
   
   template<class F>
-  TimeStamp runningTimeTest(const F &f,double min_time=10,int *num = NULL,
+  TimeStamp runningTimeTest(F f,double min_time=10,int *num = NULL,
 			TimeStamp *full_time=NULL)
   {
     Timer t;