Changeset 798:6d1abeb62dd3 in lemon-0.x for src/hugo/vector_map_factory.h

Timestamp:

09/03/04 17:11:17 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

 

File:

• src/hugo/vector_map_factory.h (modified) (11 diffs)

src/hugo/vector_map_factory.h

@@ -18 +18 @@
   /** The VectorMapFactory template class is a factory class
    *  to create maps for the edge and nodes. This map factory
-   *  use the std::vector to implement the container function.
+   *  uses the std::vector to implement the container function.
    *
    *  The template parameter is the MapRegistry that the maps
@@ -43 +43 @@
     template <typename V> 
     class Map : public MapBase {
+
+      typedef std::vector<V> Container; 
+
     public:
+
+      /// The value type of the map.
+      typedef V ValueType;
 
       /// The value type of the map.
       typedef V Value;
-
-      typedef std::vector<Value> Container;     
+      /// The reference type of the map;
+      typedef typename Container::reference Reference;
+      /// The pointer type of the map;
+      typedef typename Container::pointer Pointer;
+
+      /// The const value type of the map.
+      typedef const Value ConstValue;
+      /// The const reference type of the map;
+      typedef typename Container::const_reference ConstReference;
+      /// The pointer type of the map;
+      typedef typename Container::const_pointer ConstPointer;
 
       /** Default constructor for the map.
@@ -65 +80 @@
         for (KeyIt it(*getGraph()); it != INVALID; ++it) {
           int id = getGraph()->id(it);
-          if (id >= container.size()) {
+          if (id >= (int)container.size()) {
             container.resize(id + 1);
           }
@@ -78 +93 @@
           for (KeyIt it(*getGraph()); it != INVALID; ++it) {
             int id = getGraph()->id(it);
-            if (id >= container.size()) {
+            if (id >= (int)container.size()) {
               container.resize(id + 1);
             }
@@ -96 +111 @@
           for (KeyIt it(*getGraph()); it != INVALID; ++it) {
             int id = getGraph()->id(it);
-            if (id >= container.size()) {
+            if (id >= (int)container.size()) {
               container.resize(id + 1);
             }
@@ -102 +117 @@
           }
         }
+        return *this;
       }
 
@@ -113 +129 @@
        * actual keys of the graph. 
        */
+<<<<<<< .mine
+      Reference operator[](const Key& key) {
+=======
       typename Container::reference operator[](const KeyType& key) {
+>>>>>>> .r1091
         int id = getGraph()->id(key);
         return container[id];
@@ -122 +142 @@
        * actual keys of the graph. 
        */
+<<<<<<< .mine
+      ConstReference operator[](const Key& key) const {
+=======
       typename Container::const_reference operator[](const KeyType& key) const {
+>>>>>>> .r1091
         int id = getGraph()->id(key);
         return container[id];
@@ -139 +163 @@
       void add(const KeyType& key) {
         int id = getGraph()->id(key);
-        if (id >= container.size()) {
+        if (id >= (int)container.size()) {
           container.resize(id + 1);
         }
@@ -174 +198 @@
 
         typedef extended_pair<const KeyType&, const KeyType&, 
-                              Value&, Value&> Reference;
+                              Map::Reference, Map::Reference> Reference;
 
         /** Dereference operator for map.
@@ -264 +288 @@
       
         typedef extended_pair<const KeyType&, const KeyType&, 
-          const Value&, const Value&> Reference;
+          Map::ConstReference, Map::ConstReference> Reference;
 
         /** Dereference operator for map.