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

Timestamp:

11/11/04 10:31:55 (19 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/vector_map.h (modified) (11 diffs)

src/lemon/vector_map.h

@@ -47 +47 @@
   template <typename _Graph, 
             typename _Item,
-            typename _IdMap,
             typename _Value>
   class VectorMap : public AlterationObserverRegistry<_Item>::ObserverBase {
@@ -57 +56 @@
     typedef _Item KeyType;
     /// The id map type of the map.
-    typedef _IdMap IdMap;
-    /// The registry type of the map.
     typedef AlterationObserverRegistry<_Item> Registry;
     /// The value type of the map.
@@ -94 +91 @@
     /// It adds all the items of the graph to the map.
      
-    VectorMap(const Graph& _g, Registry& _r) : graph(&_g) {
-      attach(_r);
+    VectorMap(const Graph& _g) : graph(&_g) {
+      attach(_g.getObserverRegistry(_Item()));
       build();
     }
@@ -104 +101 @@
     /// It adds all the items of the graph to the map.
      
-    VectorMap(const Graph& g, Registry& r, const Value& v) : graph(&g) { 
-      attach(r);
-      container.resize(IdMap(*graph).maxId() + 1, v);
-    }
-
-    VectorMap(const VectorMap& copy) : graph(copy.getGraph()) {
-      if (copy.attached()) {
-        attach(*copy.getRegistry());
-        container = copy.container;
+    VectorMap(const Graph& _g, const Value& _v) : graph(&_g) { 
+      attach(_g.getObserverRegistry(_Item()));
+      container.resize(graph->maxId(_Item()) + 1, _v);
+    }
+
+    VectorMap(const VectorMap& _copy) : graph(_copy.getGraph()) {
+      if (_copy.attached()) {
+        attach(*_copy.getRegistry());
+        container = _copy.container;
       }
     }
@@ -155 +152 @@
      
     ReferenceType operator[](const KeyType& key) {
-      return container[IdMap(*graph)[key]];
+      return container[graph->id(key)];
     } 
                 
@@ -164 +161 @@
      
     ConstReferenceType operator[](const KeyType& key) const {
-      return container[IdMap(*graph)[key]];
+      return container[graph->id(key)];
     }
 
@@ -183 +180 @@
      
     void add(const KeyType& key) {
-      int id = IdMap(*graph)[key];
+      int id = graph->id(key);
       if (id >= (int)container.size()) {
         container.resize(id + 1);
@@ -201 +198 @@
 
     void build() { 
-      container.resize(IdMap(*graph).maxId() + 1);
+      container.resize(graph->maxId(_Item()) + 1);
     }
 
@@ -240 +237 @@
 
     template <typename _Value>
-    class NodeMap : public VectorMap<Graph, Node, NodeIdMap, _Value> {
+    class NodeMap : public VectorMap<Graph, Node, _Value> {
     public:
       typedef VectorMappableGraphExtender<_Base> Graph;
 
       typedef typename Graph::Node Node;
-      typedef typename Graph::NodeIdMap NodeIdMap;
-
-      typedef VectorMap<Graph, Node, NodeIdMap, _Value> Parent;
+
+      typedef VectorMap<Graph, Node, _Value> Parent;
 
       //typedef typename Parent::Graph Graph;
@@ -253 +249 @@
 
       NodeMap(const Graph& g) 
-        : Parent(g, g.getNodeObserverRegistry()) {}
+        : Parent(g) {}
       NodeMap(const Graph& g, const Value& v) 
-        : Parent(g, g.getNodeObserverRegistry(), v) {}
+        : Parent(g, v) {}
 
     };
 
     template <typename _Value>
-    class EdgeMap : public VectorMap<Graph, Edge, EdgeIdMap, _Value> {
+    class EdgeMap : public VectorMap<Graph, Edge, _Value> {
     public:
       typedef VectorMappableGraphExtender<_Base> Graph;
 
       typedef typename Graph::Edge Edge;
-      typedef typename Graph::EdgeIdMap EdgeIdMap;
-
-      typedef VectorMap<Graph, Edge, EdgeIdMap, _Value> Parent;
+
+      typedef VectorMap<Graph, Edge, _Value> Parent;
 
       //typedef typename Parent::Graph Graph;
@@ -273 +268 @@
 
       EdgeMap(const Graph& g) 
-        : Parent(g, g.getEdgeObserverRegistry()) {}
+        : Parent(g) {}
       EdgeMap(const Graph& g, const Value& v) 
-        : Parent(g, g.getEdgeObserverRegistry(), v) {}
+        : Parent(g, v) {}
 
     };