Changeset 1839:b2dfd32b4895 in lemon-0.x

Timestamp:

11/30/05 14:24:37 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2392

Message:

Some bug fix

Files:

• doc/graph_io.dox (modified) (1 diff)
• lemon/graph_adaptor.h (modified) (2 diffs)
• lemon/time_measure.h (modified) (1 diff)

doc/graph_io.dox

@@ -443 +443 @@
 \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);
 

lemon/graph_adaptor.h

@@ -1893 +1893 @@
     IterableGraphExtender<
     AlterableGraphExtender<
-    NewEdgeSetAdaptorBase<_Graph> > > > > > > {
+    GraphExtender<
+    NewEdgeSetAdaptorBase<_Graph> > > > > > > > {
 
   public:
@@ -1903 +1904 @@
       IterableGraphExtender<
       AlterableGraphExtender<
-      NewEdgeSetAdaptorBase<_Graph> > > > > > > Parent;
+      GraphExtender<
+      NewEdgeSetAdaptorBase<_Graph> > > > > > > > Parent;
     
 

lemon/time_measure.h

@@ -372 +372 @@
   
   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)
   {