Changeset 2282:9d7b12f83daa in lemon-0.x

Timestamp:

10/31/06 15:27:58 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Bug fixes

Location:

lemon

Files:

• lemon_reader.h (modified) (4 diffs)
• lemon_writer.h (modified) (3 diffs)

lemon/lemon_reader.h

@@ -118 +118 @@
 
     private:
+      const Graph& graph;
       typename Ref<Map>::Type map;
-      const Graph& graph;
     };
 
@@ -148 +148 @@
 
     private:
+      const Graph& graph;
       typename Ref<Map>::Type map;
-      const Graph& graph;
     };
 
@@ -1378 +1378 @@
       checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
       checkConcept<concepts::WriteMap<Edge, typename Map::Value>, Map>();
-      readMap("+" + name, 
-              _reader_bits::forwardComposeMap(graph, map), reader);
-      readMap("-" + name, 
-              _reader_bits::backwardComposeMap(graph, map), reader);
+      readUEdgeMap("+" + name, 
+                   _reader_bits::forwardComposeMap(graph, map), reader);
+      readUEdgeMap("-" + name, 
+                   _reader_bits::backwardComposeMap(graph, map), reader);
       return *this;      
     }
@@ -1392 +1392 @@
     template <typename Reader>
     UEdgeSetReader& skipEdgeMap(std::string name, 
-                                    const Reader& reader = Reader()) {
-      skipMap("+" + name, reader);
-      skipMap("-" + name, reader);
+                                const Reader& reader = Reader()) {
+      skipUEdgeMap("+" + name, reader);
+      skipUEdgeMap("-" + name, reader);
       return *this;
     }

lemon/lemon_writer.h

@@ -878 +878 @@
     template <typename Writer, typename Map>
     UEdgeSetWriter& writeUEdgeMap(std::string name, const Map& map, 
-                                          const Writer& writer = Writer()) {
+                                  const Writer& writer = Writer()) {
       checkConcept<concepts::ReadMap<UEdge, typename Map::Value>, Map>();
       checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
@@ -901 +901 @@
     template <typename Writer, typename Map>
     UEdgeSetWriter& writeEdgeMap(std::string name, const Map& map, 
-                                     const Writer& writer = Writer()) {
+                                 const Writer& writer = Writer()) {
       checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
       checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
-      writeUEdge("+" + name, 
-                     _writer_bits::forwardComposeMap(graph, map), writer);
-      writeUEdge("-" + name, 
-                     _writer_bits::backwardComposeMap(graph, map), writer);
+      writeUEdgeMap("+" + name, 
+                    _writer_bits::forwardComposeMap(graph, map), writer);
+      writeUEdgeMap("-" + name, 
+                    _writer_bits::backwardComposeMap(graph, map), writer);
       return *this;
     }
@@ -956 +956 @@
       }
       os << std::endl;
-      for (typename std::vector<Edge>::iterator it = items.begin();
+      for (typename std::vector<UEdge>::iterator it = items.begin();
            it != items.end(); ++it) {
         nodeLabelWriter->write(os, graph.source(*it));