Changeset 1669:66ae78d29f1e in lemon-0.x for lemon/bits/vector_map.h

Timestamp:

08/31/05 15:29:32 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Template assign operator for graph maps.

Some naming and coding conventions.

File:

• lemon/bits/vector_map.h (modified) (5 diffs)

lemon/bits/vector_map.h

@@ -24 +24 @@
 #include <lemon/bits/map_iterator.h>
 #include <lemon/bits/alteration_notifier.h>
-
-///\ingroup graphmapfactory
+#include <lemon/concept_check.h>
+#include <lemon/concept/maps.h>
+
+/// \ingroup graphmapfactory
+///
 ///\file
 ///\brief Vector based graph maps.
 
 namespace lemon {
-  
-  /// \addtogroup graphmapfactory
-  /// @{
-  
+
+  /// \ingroup graphmapfactory
+  ///
+  /// \brief Graph map based on the std::vector storage.
+  ///
   /// The VectorMap template class is graph map structure what
   /// automatically updates the map when a key is added to or erased from
@@ -118 +122 @@
     }
 
-    using Parent::attach;
-    using Parent::detach;
-    using Parent::attached;
-
-    /** Assign operator to copy a map of the same map type.
-     */
-    VectorMap& operator=(const VectorMap& copy) {
-      if (&copy == this) return *this;
-      
-      if (graph != copy.graph) {
-        if (attached()) {
-          detach();
-        }
-        if (copy.attached()) {
-          attach(*copy.getRegistry());
-        }
-      }
-      container = copy.container;
-
-      return *this;
-    }
-
-
     virtual ~VectorMap() {
       if (attached()) {
@@ -147 +128 @@
     }
 
+
+  private:
+
+    VectorMap& operator=(const VectorMap&);
+
+  protected:
+
+    using Parent::attach;
+    using Parent::detach;
+    using Parent::attached;
+
     const Graph* getGraph() const {
       return graph;
     }
+
+  public:
 
     /// The subcript operator.
@@ -174 +168 @@
     /// It the same as operator[](key) = value expression.
     ///
-     
     void set(const Key& key, const Value& value) {
       (*this)[key] = value;
     }
 
-    /// Adds a new key to the map.
-                
+  protected:
+
+    /// \brief Adds a new key to the map.
+    ///         
     /// It adds a new key to the map. It called by the observer registry
     /// and it overrides the add() member function of the observer base.
@@ -221 +216 @@
   };
 
-
-  template <typename _Base> 
-  class VectorMappableGraphExtender : public _Base {
-  public:
-
-    typedef VectorMappableGraphExtender<_Base> Graph;
-    typedef _Base Parent;
-
-    typedef typename Parent::Node Node;
-    typedef typename Parent::NodeIt NodeIt;
-    typedef typename Parent::NodeIdMap NodeIdMap;
-    typedef typename Parent::NodeNotifier NodeObserverRegistry;
-
-    typedef typename Parent::Edge Edge;
-    typedef typename Parent::EdgeIt EdgeIt;
-    typedef typename Parent::EdgeIdMap EdgeIdMap;
-    typedef typename Parent::EdgeNotifier EdgeObserverRegistry;
-
-    
-    template <typename _Value>
-    class NodeMap : 
-      public IterableMapExtender<VectorMap<Graph, Node, _Value> > {
-    public:
-      typedef VectorMappableGraphExtender<_Base> Graph;
-
-      typedef typename Graph::Node Node;
-
-      typedef IterableMapExtender<VectorMap<Graph, Node, _Value> > Parent;
-
-      //typedef typename Parent::Graph Graph;
-      typedef typename Parent::Value Value;
-
-      NodeMap(const Graph& g) 
-        : Parent(g) {}
-      NodeMap(const Graph& g, const Value& v) 
-        : Parent(g, v) {}
-
-    };
-
-    template <typename _Value>
-    class EdgeMap 
-      : public IterableMapExtender<VectorMap<Graph, Edge, _Value> > {
-    public:
-      typedef VectorMappableGraphExtender<_Base> Graph;
-
-      typedef typename Graph::Edge Edge;
-
-      typedef IterableMapExtender<VectorMap<Graph, Edge, _Value> > Parent;
-
-      //typedef typename Parent::Graph Graph;
-      typedef typename Parent::Value Value;
-
-      EdgeMap(const Graph& g) 
-        : Parent(g) {}
-      EdgeMap(const Graph& g, const Value& v) 
-        : Parent(g, v) {}
-
-    };
-    
-  };
-  
-  /// @}
-  
 }