Changeset 1705:3f63d9db307b in lemon-0.x for lemon/lemon_reader.h

Timestamp:

10/05/05 15:18:51 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Removing smart references

File:

• lemon/lemon_reader.h (modified) (27 diffs)

lemon/lemon_reader.h

@@ -37 +37 @@
 #include <lemon/bits/item_reader.h>
 
+#include <lemon/xy.h>
+
 #include <lemon/concept_check.h>
 #include <lemon/concept/maps.h>
@@ -95 +97 @@
     };
 
-    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& val) {
+        map.set(graph.direct(key, true), val);
+      }
+
+    private:
+      typename Ref<Map>::Type map;
+      const Graph& graph;
+    };
+
+    template <typename Graph, typename Map>
+    ForwardComposeMap<Graph, Map>
+    forwardComposeMap(const Graph& graph, const Map& map) {
+      return ForwardComposeMap<Graph, Map>(graph, map);
+    }
+
+    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& value) {
-        m1.set(m2[key], value);
+      void set(const Key& key, const Value& val) {
+        map.set(graph.direct(key, false), val);
       }
 
     private:
-      
-      typename SmartReference<M1>::Type m1;
-      typename SmartConstReference<M2>::Type m2;
-      
-    };
-
-    template <typename M1, typename M2>
-    WriteComposeMap<M1, M2> writeComposeMap(M1& m1, const M2& m2) {
-      return WriteComposeMap<M1, M2>(m1, m2);
-    }
-
-    template <typename M1, typename M2>
-    WriteComposeMap<M1, M2> writeComposeMap(const M1& m1, const M2& m2) {
-      return WriteComposeMap<M1, M2>(m1, m2);
-    }
-  
+      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;
+    };
+
   }
 
@@ -433 +505 @@
       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) {}
@@ -527 +599 @@
       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) {}
@@ -660 +732 @@
     /// 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()) 
@@ -689 +761 @@
       return _readMap<
         typename Traits::template Reader<typename Map::Value>, Map,
-        typename SmartParameter<Map>::Type>(name, map);
+        typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
@@ -696 +768 @@
       return _readMap<
         typename Traits::template Reader<typename Map::Value>, Map,
-        typename SmartParameter<Map>::Type>(name, map);
+        typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
@@ -705 +777 @@
     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);
     }
@@ -712 +784 @@
     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);
     }
@@ -818 +890 @@
     MapReaders readers;
    
-    typename SmartReference<Graph>::Type graph;   
+    Graph& graph;   
     std::string id;
     SkipReader<Node, DefaultSkipper> skipper;
@@ -868 +940 @@
     template <typename NodeIdReader>
     EdgeSetReader(LemonReader& _reader, 
-                  typename SmartParameter<Graph>::Type _graph, 
+                  Graph& _graph, 
                   const NodeIdReader& _nodeIdReader, 
                   const std::string& _id = std::string(),
@@ -899 +971 @@
       return _readMap<
         typename Traits::template Reader<typename Map::Value>, Map,
-        typename SmartParameter<Map>::Type>(name, map);
+        typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
@@ -906 +978 @@
       return _readMap<
         typename Traits::template Reader<typename Map::Value>, Map,
-        typename SmartParameter<Map>::Type>(name, map);
+        typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
@@ -916 +988 @@
                            const Reader& reader = Reader()) {
       return _readMap<Reader, Map,
-        typename SmartParameter<Map>::Type>(name, map, reader);
+        typename _reader_bits::Arg<Map>::Type>(name, map, reader);
     }
 
@@ -923 +995 @@
                                const Reader& reader = Reader()) {
       return _readMap<Reader, Map,
-        typename SmartParameter<Map>::Type>(name, map, reader);
+        typename _reader_bits::Arg<Map>::Type>(name, map, reader);
     }
 
@@ -1033 +1105 @@
     MapReaders readers;
    
-    typename SmartReference<Graph>::Type graph;   
+    Graph& graph;   
     std::string id;
     SkipReader<Edge, DefaultSkipper> skipper;
@@ -1090 +1162 @@
     template <typename NodeIdReader>
     UndirEdgeSetReader(LemonReader& _reader, 
-                       typename SmartParameter<Graph>::Type _graph, 
+                       Graph& _graph, 
                        const NodeIdReader& _nodeIdReader, 
                        const std::string& _id = std::string(),
@@ -1121 +1193 @@
       return _readMap<
         typename Traits::template Reader<typename Map::Value>, Map, 
-        typename SmartParameter<Map>::Type>(name, map);
+        typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
@@ -1128 +1200 @@
       return _readMap<
         typename Traits::template Reader<typename Map::Value>, Map, 
-        typename SmartParameter<Map>::Type>(name, map);
+        typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
@@ -1137 +1209 @@
     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);
     }
@@ -1144 +1216 @@
     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);
     }
@@ -1190 +1262 @@
       return _readDirMap<
         typename Traits::template Reader<typename Map::Value>, Map,
-        typename SmartParameter<Map>::Type>(name, map);
+        typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
@@ -1197 +1269 @@
       return _readDirMap<
         typename Traits::template Reader<typename Map::Value>, Map,
-        typename SmartParameter<Map>::Type>(name, map);
+        typename _reader_bits::Arg<Map>::Type>(name, map);
     }
 
@@ -1206 +1278 @@
     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);
     }
@@ -1213 +1285 @@
     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);
     }
@@ -1225 +1297 @@
       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;      
     }
@@ -1337 +1409 @@
     MapReaders readers;
    
-    typename SmartReference<Graph>::Type graph;   
+    Graph& graph;   
     std::string id;
     SkipReader<UndirEdge, DefaultSkipper> skipper;