Changeset 980:0f1044b7a3af in lemon-0.x for src/lemon/default_map.h

Timestamp:

11/11/04 10:31:55 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

maxNodeId() and maxEdgeId() changed to maxId(Node) and maxId(Edge)
getNodeObserverRegistry() and getEdgeObserverRegistry() changed to
getObserverRegistry(Node) and getObserverRegistry(Edge)

IdMappableGraphExtender? erased

File:

• src/lemon/default_map.h (modified) (6 diffs)

src/lemon/default_map.h

@@ -43 +43 @@
 
 
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap, typename _Value>
+  template <typename _Graph, typename _Item, typename _ItemIt, typename _Value>
   struct DefaultMapSelector {
-    typedef ArrayMap<_Graph, _Item, _ItemIt, _IdMap, _Value> Map;
+    typedef ArrayMap<_Graph, _Item, _ItemIt, _Value> Map;
   };
 
   // bool
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap>
-  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, bool> {
-    typedef VectorMap<_Graph, _Item, _IdMap, bool> Map;
+  template <typename _Graph, typename _Item, typename _ItemIt>
+  struct DefaultMapSelector<_Graph, _Item, _ItemIt, bool> {
+    typedef VectorMap<_Graph, _Item, bool> Map;
   };
 
   // char
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap>
-  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, char> {
-    typedef VectorMap<_Graph, _Item, _IdMap, char> Map;
-  };
-
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap>
-  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, signed char> {
-    typedef VectorMap<_Graph, _Item, _IdMap, signed char> Map;
-  };
-
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap>
-  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, unsigned char> {
-    typedef VectorMap<_Graph, _Item, _IdMap, unsigned char> Map;
+  template <typename _Graph, typename _Item, typename _ItemIt>
+  struct DefaultMapSelector<_Graph, _Item, _ItemIt, char> {
+    typedef VectorMap<_Graph, _Item, char> Map;
+  };
+
+  template <typename _Graph, typename _Item, typename _ItemIt>
+  struct DefaultMapSelector<_Graph, _Item, _ItemIt, signed char> {
+    typedef VectorMap<_Graph, _Item, signed char> Map;
+  };
+
+  template <typename _Graph, typename _Item, typename _ItemIt>
+  struct DefaultMapSelector<_Graph, _Item, _ItemIt, unsigned char> {
+    typedef VectorMap<_Graph, _Item, unsigned char> Map;
   };
 
 
   // int
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap>
-  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, signed int> {
-    typedef VectorMap<_Graph, _Item, _IdMap, signed int> Map;
-  };
-
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap>
-  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, unsigned int> {
-    typedef VectorMap<_Graph, _Item, _IdMap, unsigned int> Map;
+  template <typename _Graph, typename _Item, typename _ItemIt>
+  struct DefaultMapSelector<_Graph, _Item, _ItemIt, signed int> {
+    typedef VectorMap<_Graph, _Item, signed int> Map;
+  };
+
+  template <typename _Graph, typename _Item, typename _ItemIt>
+  struct DefaultMapSelector<_Graph, _Item, _ItemIt, unsigned int> {
+    typedef VectorMap<_Graph, _Item, unsigned int> Map;
   };
 
 
   // short
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap>
-  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, signed short> {
-    typedef VectorMap<_Graph, _Item, _IdMap, signed short> Map;
-  };
-
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap>
-  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, unsigned short> {
-    typedef VectorMap<_Graph, _Item, _IdMap, unsigned short> Map;
+  template <typename _Graph, typename _Item, typename _ItemIt>
+  struct DefaultMapSelector<_Graph, _Item, _ItemIt, signed short> {
+    typedef VectorMap<_Graph, _Item, signed short> Map;
+  };
+
+  template <typename _Graph, typename _Item, typename _ItemIt>
+  struct DefaultMapSelector<_Graph, _Item, _ItemIt, unsigned short> {
+    typedef VectorMap<_Graph, _Item, unsigned short> Map;
   };
 
 
   // long
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap>
-  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, signed long> {
-    typedef VectorMap<_Graph, _Item, _IdMap, signed long> Map;
-  };
-
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap>
-  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, unsigned long> {
-    typedef VectorMap<_Graph, _Item, _IdMap, unsigned long> Map;
+  template <typename _Graph, typename _Item, typename _ItemIt>
+  struct DefaultMapSelector<_Graph, _Item, _ItemIt, signed long> {
+    typedef VectorMap<_Graph, _Item, signed long> Map;
+  };
+
+  template <typename _Graph, typename _Item, typename _ItemIt>
+  struct DefaultMapSelector<_Graph, _Item, _ItemIt, unsigned long> {
+    typedef VectorMap<_Graph, _Item, unsigned long> Map;
   };
 
@@ -110 +110 @@
 
   // float
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap>
-  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, float> {
-    typedef VectorMap<_Graph, _Item, _IdMap, float> Map;
+  template <typename _Graph, typename _Item, typename _ItemIt>
+  struct DefaultMapSelector<_Graph, _Item, _ItemIt, float> {
+    typedef VectorMap<_Graph, _Item, float> Map;
   };
 
 
   // double
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap>
-  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, double> {
-    typedef VectorMap<_Graph, _Item, _IdMap,  double> Map;
+  template <typename _Graph, typename _Item, typename _ItemIt>
+  struct DefaultMapSelector<_Graph, _Item, _ItemIt, double> {
+    typedef VectorMap<_Graph, _Item,  double> Map;
   };
 
 
   // long double
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap>
-  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, long double> {
-    typedef VectorMap<_Graph, _Item, _IdMap, long double> Map;
+  template <typename _Graph, typename _Item, typename _ItemIt>
+  struct DefaultMapSelector<_Graph, _Item, _ItemIt, long double> {
+    typedef VectorMap<_Graph, _Item, long double> Map;
   };
 
 
   // pointer
-  template <typename _Graph, typename _Item, typename _ItemIt, typename _IdMap, typename _Ptr>
-  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, _Ptr*> {
-    typedef VectorMap<_Graph, _Item, _IdMap, _Ptr*> Map;
+  template <typename _Graph, typename _Item, typename _ItemIt, typename _Ptr>
+  struct DefaultMapSelector<_Graph, _Item, _ItemIt, _Ptr*> {
+    typedef VectorMap<_Graph, _Item, _Ptr*> Map;
   };
 
@@ -141 +141 @@
             typename _Item,
             typename _ItemIt,
-            typename _IdMap,
             typename _Value>
-  class DefaultMap : public DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, _Value>::Map {
+  class DefaultMap : public DefaultMapSelector<_Graph, _Item, _ItemIt, _Value>::Map {
   public:
-    typedef typename DefaultMapSelector<_Graph, _Item, _ItemIt, _IdMap, _Value>::Map Parent;
-    typedef DefaultMap<_Graph, _Item, _ItemIt, _IdMap, bool> Map;
+    typedef typename DefaultMapSelector<_Graph, _Item, _ItemIt, _Value>::Map Parent;
+    typedef DefaultMap<_Graph, _Item, _ItemIt, _Value> Map;
     
     typedef typename Parent::Graph Graph;
-    typedef typename Parent::Registry Registry;
     typedef typename Parent::ValueType ValueType;
 
-    DefaultMap(const Graph& _g, Registry& _r) : Parent(_g, _r) {}
-    DefaultMap(const Graph& _g, Registry& _r, const ValueType& _v) : Parent(_g, _r, _v) {}
+    DefaultMap(const Graph& _g) : Parent(_g) {}
+    DefaultMap(const Graph& _g, const ValueType& _v) : Parent(_g, _v) {}
   };
 
@@ -167 +165 @@
     typedef typename Parent::Node Node;
     typedef typename Parent::NodeIt NodeIt;
-    typedef typename Parent::NodeIdMap NodeIdMap;
-    typedef typename Parent::NodeObserverRegistry NodeObserverRegistry;
 
     typedef typename Parent::Edge Edge;
     typedef typename Parent::EdgeIt EdgeIt;
-    typedef typename Parent::EdgeIdMap EdgeIdMap;
-    typedef typename Parent::EdgeObserverRegistry EdgeObserverRegistry;
 
     
-
     template <typename _Value>
-    class NodeMap : public DefaultMap<Graph, Node, NodeIt, NodeIdMap, _Value> {
+    class NodeMap : public DefaultMap<Graph, Node, NodeIt, _Value> {
     public:
       typedef DefaultMappableGraphExtender<_Base> Graph;
@@ -184 +177 @@
       typedef typename Graph::Node Node;
       typedef typename Graph::NodeIt NodeIt;
-      typedef typename Graph::NodeIdMap NodeIdMap;
-
-      typedef DefaultMap<Graph, Node, NodeIt, NodeIdMap, _Value> Parent;
+
+      typedef DefaultMap<Graph, Node, NodeIt, _Value> Parent;
 
       //typedef typename Parent::Graph Graph;
       typedef typename Parent::ValueType ValueType;
 
-      NodeMap(const Graph& g) 
-        : Parent(g, g.getNodeObserverRegistry()) {}
-      NodeMap(const Graph& g, const ValueType& v) 
-        : Parent(g, g.getNodeObserverRegistry(), v) {}
+      NodeMap(const Graph& _g) 
+        : Parent(_g) {}
+      NodeMap(const Graph& _g, const ValueType& _v) 
+        : Parent(_g, _v) {}
 
     };
 
     template <typename _Value>
-    class EdgeMap : public DefaultMap<Graph, Edge, EdgeIt, EdgeIdMap, _Value> {
+    class EdgeMap : public DefaultMap<Graph, Edge, EdgeIt, _Value> {
     public:
       typedef DefaultMappableGraphExtender<_Base> Graph;
@@ -205 +197 @@
       typedef typename Graph::Edge Edge;
       typedef typename Graph::EdgeIt EdgeIt;
-      typedef typename Graph::EdgeIdMap EdgeIdMap;
-
-      typedef DefaultMap<Graph, Edge, EdgeIt, EdgeIdMap, _Value> Parent;
+
+      typedef DefaultMap<Graph, Edge, EdgeIt, _Value> Parent;
 
       //typedef typename Parent::Graph Graph;
       typedef typename Parent::ValueType ValueType;
 
-      EdgeMap(const Graph& g) 
-        : Parent(g, g.getEdgeObserverRegistry()) {}
-      EdgeMap(const Graph& g, const ValueType& v) 
-        : Parent(g, g.getEdgeObserverRegistry(), v) {}
+      EdgeMap(const Graph& _g) 
+        : Parent(_g) {}
+      EdgeMap(const Graph& _g, const ValueType& _v) 
+        : Parent(_g, _v) {}
 
     };