Changeset 844:9bf990cb066d in lemon-0.x for src/hugo/sym_map.h

Timestamp:

09/13/04 22:05:13 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Bug fix in the symmetric maps.
Faster map initialization.
Iterators and Containers STL compatible.

File:

• src/hugo/sym_map.h (modified) (5 diffs)

src/hugo/sym_map.h

@@ -18 +18 @@
    */
 
+
   template <typename Graph, typename Edge, typename EdgeIt>
   class SymEdgeIt : public EdgeIt {
@@ -31 +32 @@
     SymEdgeIt(const Graph& graph) 
       : EdgeIt(graph) {
-      while ( (n & 1) && n != -1) {
+      while ( (EdgeIt::n & 1) && EdgeIt::n != -1) {
         EdgeIt::operator++();
       }
@@ -45 +46 @@
     SymEdgeIt(const Graph& graph, const Edge& edge)
       : EdgeIt(graph, edge) {
-      while ( (n & 1) && n != -1) {
+      while ( (EdgeIt::n & 1) && EdgeIt::n != -1) {
         EdgeIt::operator++();
       }
@@ -54 +55 @@
     SymEdgeIt& operator++() {
       EdgeIt::operator++();
-      while ( (n & 1) && n != -1) {
+      while ( (EdgeIt::n & 1) && EdgeIt::n != -1) {
         EdgeIt::operator++();
       }
@@ -122 +123 @@
     }
    
-    /**
-     * The subscript operator. The map can be subscripted by the
-     * actual keys of the graph. 
-     */
-    typename MapImpl::ReferenceType operator[](const KeyType& key) {
-      int id = MapImpl::getGraph()->id(key);    
-      return MapImpl::operator[](id >> 1);
-    } 
-                
-    /**
-     * The const subscript operator. The map can be subscripted by the
-     * actual keys of the graph. 
-     */
-    typename MapImpl::ConstReferenceType operator[](const KeyType& key) const {
-      int id = MapImpl::getGraph()->id(key);
-      return MapImpl::operator[](id >> 1);
-    }
-        
-    /** Setter function of the map. Equivalent with map[key] = val.
-     *  This is a compatibility feature with the not dereferable maps.
-     */
-    void set(const KeyType& key, const typename MapImpl::ValueType& val) {
-      int id = MapImpl::getGraph()->id(key);
-      MapImpl::operator[](id >> 1) = val;
-    }
-                
     /** Add a new key to the map. It called by the map registry.
      */