[Lemon-commits] [lemon_svn] deba: r3046 - hugo/trunk/lemon

[Lemon SVN]

Author: deba
Date: Tue Oct 31 15:27:58 2006
New Revision: 3046

Modified:
   hugo/trunk/lemon/lemon_reader.h
   hugo/trunk/lemon/lemon_writer.h

Log:
Bug fixes



Modified: hugo/trunk/lemon/lemon_reader.h
==============================================================================
--- hugo/trunk/lemon/lemon_reader.h	(original)
+++ hugo/trunk/lemon/lemon_reader.h	Tue Oct 31 15:27:58 2006
@@ -117,8 +117,8 @@
       }
 
     private:
-      typename Ref<Map>::Type map;
       const Graph& graph;
+      typename Ref<Map>::Type map;
     };
 
     template <typename Graph, typename Map>
@@ -147,8 +147,8 @@
       }
 
     private:
-      typename Ref<Map>::Type map;
       const Graph& graph;
+      typename Ref<Map>::Type map;
     };
 
 
@@ -1377,10 +1377,10 @@
 				    const Reader& reader = Reader()) { 
       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;      
     }
 
@@ -1391,9 +1391,9 @@
     /// Add a new directed edge map skipper command for the reader.
     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;
     }
 

Modified: hugo/trunk/lemon/lemon_writer.h
==============================================================================
--- hugo/trunk/lemon/lemon_writer.h	(original)
+++ hugo/trunk/lemon/lemon_writer.h	Tue Oct 31 15:27:58 2006
@@ -877,7 +877,7 @@
     /// Add a new undirected map writer command for the writer.
     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>();
       writers.push_back(
@@ -900,13 +900,13 @@
     /// Add a new directed map writer command for the writer.
     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;
     }
 
@@ -955,7 +955,7 @@
 	os << writers[i].first << '\t';
       }
       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));
 	os << '\t';