Changeset 891:74589d20dbc3 in lemon-0.x for src/hugo/vector_map.h

Timestamp:

09/21/04 00:57:48 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

template<typename CMap> Map(const CMap&) like constructors and
assigns are removed.

File:

• src/hugo/vector_map.h (modified) (2 diffs)

src/hugo/vector_map.h

@@ -33 +33 @@
   template <typename MapRegistry, typename Value>
   class VectorMap : public MapRegistry::MapBase {
+    template <typename MR, typename T> friend class VectorMap;
   public:
                 
@@ -83 +84 @@
       : MapBase(g, r), container(KeyInfo<Graph, KeyIt>::maxId(g)+1, v) {}
 
-    /** Constructor to copy a map of an other map type.
-     */
-    template <typename CMap> VectorMap(const CMap& copy) : MapBase(copy) {
-      if (MapBase::getGraph()) {
-        container.resize(KeyInfo<Graph, KeyIt>::maxId(*MapBase::getGraph())+1);
-        for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
-          set(it, copy[it]);
-        }
+    /** Assign operator to copy a map of an other map type.
+     */
+    template <typename TT>
+    VectorMap(const VectorMap<MapRegistry, TT>& c) 
+      : MapBase(c), container(c.container.size()) {
+      for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
+        int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), it);
+        container[id] = c.container[id];
       }
     }
 
-    /** Assign operator to copy a map an other map type.
-     */
-    template <typename CMap> VectorMap& operator=(const CMap& copy) {
-      container.clear();
-      this->MapBase::operator=(copy);
-      if (MapBase::getGraph()) {
-        container.resize(KeyInfo<Graph, KeyIt>::maxId(*MapBase::getGraph())+1);
-        for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
-          set(it, copy[it]);
-        }
+    /** Assign operator to copy a map of an other map type.
+     */
+    template <typename TT>
+    VectorMap& operator=(const VectorMap<MapRegistry, TT>& c) {
+      container.resize(c.container.size());
+      MapBase::operator=(c);
+      for (KeyIt it(*MapBase::getGraph()); it != INVALID; ++it) {
+        int id = KeyInfo<Graph, KeyIt>::id(*MapBase::getGraph(), it);
+        container[id] = c.container[id];
       }
       return *this;
     }
-
-    /** The destructor of the map.
-     */
-    virtual ~VectorMap() {
-    }
-                
     /**
      * The subscript operator. The map can be subscripted by the