diff -r 467d7927a901 -r 3f63d9db307b lemon/lemon_reader.h
--- a/lemon/lemon_reader.h	Wed Oct 05 13:17:42 2005 +0000
+++ b/lemon/lemon_reader.h	Wed Oct 05 13:18:51 2005 +0000
@@ -36,6 +36,8 @@
 #include <lemon/utility.h>
 #include <lemon/bits/item_reader.h>
 
+#include <lemon/xy.h>
+
 #include <lemon/concept_check.h>
 #include <lemon/concept/maps.h>
 
@@ -94,38 +96,108 @@
       }
     };
 
-    template <typename M1, typename M2>
-    class WriteComposeMap {
+    template <typename Map>
+    struct Ref { typedef Map& Type; };
+    template <typename Map>
+    struct Arg { typedef Map& Type; };
+
+    template <typename Graph, typename Map>
+    class ForwardComposeMap {
     public:
-      typedef True NeedCopy;
+      typedef typename Graph::UndirEdge Key;
+      typedef typename Map::Value Value;
+
+      ForwardComposeMap(const Graph& _graph, typename Arg<Map>::Type _map) 
+	: graph(_graph), map(_map) {}
       
-      typedef typename M2::Key Key;
-      typedef typename M1::Value Value;
-
-      WriteComposeMap(typename SmartParameter<M1>::Type _m1, const M2& _m2) 
-	: m1(_m1), m2(_m2) {}
-      
-      void set(const Key& key, const Value& value) {
-	m1.set(m2[key], value);
+      void set(const Key& key, const Value& val) {
+	map.set(graph.direct(key, true), val);
       }
 
     private:
-      
-      typename SmartReference<M1>::Type m1;
-      typename SmartConstReference<M2>::Type m2;
-      
+      typename Ref<Map>::Type map;
+      const Graph& graph;
     };
 
-    template <typename M1, typename M2>
-    WriteComposeMap<M1, M2> writeComposeMap(M1& m1, const M2& m2) {
-      return WriteComposeMap<M1, M2>(m1, m2);
+    template <typename Graph, typename Map>
+    ForwardComposeMap<Graph, Map>
+    forwardComposeMap(const Graph& graph, const Map& map) {
+      return ForwardComposeMap<Graph, Map>(graph, map);
     }
 
-    template <typename M1, typename M2>
-    WriteComposeMap<M1, M2> writeComposeMap(const M1& m1, const M2& m2) {
-      return WriteComposeMap<M1, M2>(m1, m2);
+    template <typename Graph, typename Map>
+    ForwardComposeMap<Graph, Map>
+    forwardComposeMap(const Graph& graph, Map& map) {
+      return ForwardComposeMap<Graph, Map>(graph, map);
     }
-  
+
+    template <typename Graph, typename Map>
+    class BackwardComposeMap {
+    public:
+      typedef typename Graph::UndirEdge Key;
+      typedef typename Map::Value Value;
+
+      BackwardComposeMap(const Graph& _graph, typename Arg<Map>::Type _map) 
+	: graph(_graph), map(_map) {}
+      
+      void set(const Key& key, const Value& val) {
+	map.set(graph.direct(key, false), val);
+      }
+
+    private:
+      typename Ref<Map>::Type map;
+      const Graph& graph;
+    };
+
+
+    template <typename Graph, typename Map>
+    BackwardComposeMap<Graph, Map>
+    backwardComposeMap(const Graph& graph, const Map& map) {
+      return BackwardComposeMap<Graph, Map>(graph, map);
+    }
+
+    template <typename Graph, typename Map>
+    BackwardComposeMap<Graph, Map>
+    backwardComposeMap(const Graph& graph, Map& map) {
+      return BackwardComposeMap<Graph, Map>(graph, map);
+    }
+
+    template <typename Graph, typename Map>
+    struct Ref<ForwardComposeMap<Graph, Map> > { 
+      typedef ForwardComposeMap<Graph, Map> Type;
+    };
+    template <typename Graph, typename Map>
+    struct Arg<ForwardComposeMap<Graph, Map> > { 
+      typedef const ForwardComposeMap<Graph, Map>& Type;
+    };
+
+    template <typename Graph, typename Map>
+    struct Ref<BackwardComposeMap<Graph, Map> > { 
+      typedef BackwardComposeMap<Graph, Map> Type; 
+    };
+    template <typename Graph, typename Map>
+    struct Arg<BackwardComposeMap<Graph, Map> > { 
+      typedef const BackwardComposeMap<Graph, Map>& Type; 
+    };
+
+    template <typename Map>
+    struct Ref<XMap<Map> > { 
+      typedef XMap<Map> Type;
+    };
+    template <typename Map>
+    struct Arg<XMap<Map> > { 
+      typedef const XMap<Map>& Type;
+    };
+
+    template <typename Map>
+    struct Ref<YMap<Map> > { 
+      typedef YMap<Map> Type;
+    };
+    template <typename Map>
+    struct Arg<YMap<Map> > { 
+      typedef const YMap<Map>& Type;
+    };
+
   }
 
   /// \ingroup io_group
@@ -432,11 +504,11 @@
       typedef _Map Map;
       typedef std::map<Value, Item, _reader_bits::Less<Value> > Inverse;
 
-      typename SmartReference<Map>::Type map;
+      typename _reader_bits::Ref<Map>::Type map;
       Reader reader;
       Inverse inverse;
 
-      MapReaderInverter(typename SmartParameter<Map>::Type _map,
+      MapReaderInverter(typename _reader_bits::Arg<Map>::Type _map,
 			const Reader& _reader) 
 	: map(_map), reader(_reader) {}
 
@@ -526,10 +598,10 @@
       typedef typename Reader::Value Value;
       typedef _Item Item;
       
-      typename SmartReference<Map>::Type map;
+      typename _reader_bits::Ref<Map>::Type map;
       Reader reader;
 
-      MapReader(typename SmartParameter<Map>::Type _map, 
+      MapReader(typename _reader_bits::Arg<Map>::Type _map, 
 		const Reader& _reader) 
 	: map(_map), reader(_reader) {}
 
@@ -659,7 +731,7 @@
     /// add the readed nodes to the given Graph. The reader will read
     /// the section when the \c section_id and the \c _id are the same. 
     NodeSetReader(LemonReader& _reader, 
-		  typename SmartParameter<Graph>::Type _graph, 
+		  Graph& _graph, 
 		  const std::string& _id = std::string(),
 		  const DefaultSkipper& _skipper = DefaultSkipper()) 
       : Parent(_reader), graph(_graph), id(_id), skipper(_skipper) {} 
@@ -688,14 +760,14 @@
     NodeSetReader& readNodeMap(std::string name, Map& map) {
       return _readMap<
 	typename Traits::template Reader<typename Map::Value>, Map,
-	typename SmartParameter<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
     template <typename Map>
     NodeSetReader& readNodeMap(std::string name, const Map& map) {
       return _readMap<
 	typename Traits::template Reader<typename Map::Value>, Map,
-	typename SmartParameter<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
     /// \brief Add a new node map reader command for the reader.
@@ -704,14 +776,14 @@
     template <typename Reader, typename Map>
     NodeSetReader& readNodeMap(std::string name, Map& map, 
 			       const Reader& reader = Reader()) {
-      return _readMap<Reader, Map, typename SmartParameter<Map>::Type>
+      return _readMap<Reader, Map, typename _reader_bits::Arg<Map>::Type>
 	(name, map, reader);
     }
 
     template <typename Reader, typename Map>
     NodeSetReader& readNodeMap(std::string name, const Map& map, 
 			       const Reader& reader = Reader()) {
-      return _readMap<Reader, Map, typename SmartParameter<Map>::Type>
+      return _readMap<Reader, Map, typename _reader_bits::Arg<Map>::Type>
 	(name, map, reader);
     }
 
@@ -817,7 +889,7 @@
     typedef std::map<std::string, ReaderBase<Node>*> MapReaders;
     MapReaders readers;
    
-    typename SmartReference<Graph>::Type graph;   
+    Graph& graph;   
     std::string id;
     SkipReader<Node, DefaultSkipper> skipper;
 
@@ -867,7 +939,7 @@
     /// \c edgset_id are the same. 
     template <typename NodeIdReader>
     EdgeSetReader(LemonReader& _reader, 
-		  typename SmartParameter<Graph>::Type _graph, 
+		  Graph& _graph, 
 		  const NodeIdReader& _nodeIdReader, 
 		  const std::string& _id = std::string(),
 		  const DefaultSkipper& _skipper = DefaultSkipper()) 
@@ -898,14 +970,14 @@
     EdgeSetReader& readEdgeMap(std::string name, Map& map) {
       return _readMap<
 	typename Traits::template Reader<typename Map::Value>, Map,
-	typename SmartParameter<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
     template <typename Map>
     EdgeSetReader& readEdgeMap(std::string name, const Map& map) {
       return _readMap<
 	typename Traits::template Reader<typename Map::Value>, Map,
-	typename SmartParameter<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
     /// \brief Add a new edge map reader command for the reader.
@@ -915,14 +987,14 @@
     EdgeSetReader& readEdgeMap(std::string name, Map& map, 
 			   const Reader& reader = Reader()) {
       return _readMap<Reader, Map,
-	typename SmartParameter<Map>::Type>(name, map, reader);
+	typename _reader_bits::Arg<Map>::Type>(name, map, reader);
     }
 
     template <typename Reader, typename Map>
     EdgeSetReader& readEdgeMap(std::string name, const Map& map, 
 			       const Reader& reader = Reader()) {
       return _readMap<Reader, Map,
-	typename SmartParameter<Map>::Type>(name, map, reader);
+	typename _reader_bits::Arg<Map>::Type>(name, map, reader);
     }
 
   private:
@@ -1032,7 +1104,7 @@
     typedef std::map<std::string, ReaderBase<Edge>*> MapReaders;
     MapReaders readers;
    
-    typename SmartReference<Graph>::Type graph;   
+    Graph& graph;   
     std::string id;
     SkipReader<Edge, DefaultSkipper> skipper;
 
@@ -1089,7 +1161,7 @@
     /// \c _id and the \c undiredgset_id are the same. 
     template <typename NodeIdReader>
     UndirEdgeSetReader(LemonReader& _reader, 
-		       typename SmartParameter<Graph>::Type _graph, 
+		       Graph& _graph, 
 		       const NodeIdReader& _nodeIdReader, 
 		       const std::string& _id = std::string(),
 		       const DefaultSkipper& _skipper = DefaultSkipper()) 
@@ -1120,14 +1192,14 @@
     UndirEdgeSetReader& readUndirEdgeMap(std::string name, Map& map) {
       return _readMap<
 	typename Traits::template Reader<typename Map::Value>, Map, 
-	typename SmartParameter<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
     template <typename Map>
     UndirEdgeSetReader& readUndirEdgeMap(std::string name, const Map& map) {
       return _readMap<
 	typename Traits::template Reader<typename Map::Value>, Map, 
-	typename SmartParameter<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
     /// \brief Add a new undirected edge map reader command for the reader.
@@ -1136,14 +1208,14 @@
     template <typename Reader, typename Map>
     UndirEdgeSetReader& readUndirEdgeMap(std::string name, Map& map, 
 					 const Reader& reader = Reader()) {
-      return _readMap<Reader, Map, typename SmartParameter<Map>::Type>
+      return _readMap<Reader, Map, typename _reader_bits::Arg<Map>::Type>
 	(name, map, reader);
     }
 
     template <typename Reader, typename Map>
     UndirEdgeSetReader& readUndirEdgeMap(std::string name, const Map& map, 
 					 const Reader& reader = Reader()) {
-      return _readMap<Reader, Map, typename SmartParameter<Map>::Type >
+      return _readMap<Reader, Map, typename _reader_bits::Arg<Map>::Type >
 	(name, map, reader);
     }
 
@@ -1189,14 +1261,14 @@
     UndirEdgeSetReader& readEdgeMap(std::string name, Map& map) {
       return _readDirMap<
 	typename Traits::template Reader<typename Map::Value>, Map,
-	typename SmartParameter<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
     template <typename Map>
     UndirEdgeSetReader& readEdgeMap(std::string name, const Map& map) {
       return _readDirMap<
 	typename Traits::template Reader<typename Map::Value>, Map,
-	typename SmartParameter<Map>::Type>(name, map);
+	typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
     /// \brief Add a new directed edge map reader command for the reader.
@@ -1205,14 +1277,14 @@
     template <typename Reader, typename Map>
     UndirEdgeSetReader& readEdgeMap(std::string name, Map& map, 
 				    const Reader& reader = Reader()) {
-      return _readDirMap<Reader, Map, typename SmartParameter<Map>::Type>
+      return _readDirMap<Reader, Map, typename _reader_bits::Arg<Map>::Type>
 	(name, map, reader);
     }
 
     template <typename Reader, typename Map>
     UndirEdgeSetReader& readEdgeMap(std::string name, const Map& map, 
 				    const Reader& reader = Reader()) {
-      return _readDirMap<Reader, Map, typename SmartParameter<Map>::Type>
+      return _readDirMap<Reader, Map, typename _reader_bits::Arg<Map>::Type>
 	(name, map, reader);
     }
 
@@ -1224,9 +1296,9 @@
       checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
       checkConcept<concept::WriteMap<Edge, typename Map::Value>, Map>();
       readMap("+" + name, 
-	      _reader_bits::writeComposeMap(map, forwardMap(graph)), reader);
+	      _reader_bits::forwardComposeMap(graph, map), reader);
       readMap("-" + name, 
-	      _reader_bits::writeComposeMap(map, backwardMap(graph)), reader);
+	      _reader_bits::backwardComposeMap(graph, map), reader);
       return *this;      
     }
 
@@ -1336,7 +1408,7 @@
     typedef std::map<std::string, ReaderBase<UndirEdge>*> MapReaders;
     MapReaders readers;
    
-    typename SmartReference<Graph>::Type graph;   
+    Graph& graph;   
     std::string id;
     SkipReader<UndirEdge, DefaultSkipper> skipper;