Changeset 822:88226d9fe821 in lemon-0.x for src/hugo/list_graph.h

Timestamp:

09/08/04 14:06:45 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

The MapFactories? have been removed from the code because
if we use macros then they increases only the complexity.

The pair iterators of the maps are separeted from the maps.

Some macros and comments has been changed.

File:

• src/hugo/list_graph.h (modified) (6 diffs)

src/hugo/list_graph.h

@@ -14 +14 @@
 
 #include <hugo/map_registry.h>
-#include <hugo/default_map_factory.h>
-
-#include <hugo/sym_map_factory.h>
+#include <hugo/default_map.h>
+
+#include <hugo/sym_map.h>
 
 #include <hugo/map_defines.h>
@@ -80 +80 @@
     class InEdgeIt;
 
+    /// Creating map registries.
     CREATE_MAP_REGISTRIES;
-    CREATE_MAPS(DefaultMapFactory);
+    /// Creating node and edge maps.
+    CREATE_MAPS(DefaultMap);
 
   public:
@@ -444 +446 @@
     typedef SymListGraph Graph;
 
-    KEEP_NODE_MAP(ListGraph);
-    KEEP_EDGE_MAP(ListGraph);
-
+    /// Importing maps from the base class ListGraph.
+    KEEP_MAPS(ListGraph, SymListGraph);
+
+    /// Creating symmetric map registry.
     CREATE_SYM_EDGE_MAP_REGISTRY;
-    CREATE_SYM_EDGE_MAP_FACTORY(DefaultMapFactory);
-    IMPORT_SYM_EDGE_MAP(SymEdgeMapFactory);
+    /// Creating symmetric edge map.
+    CREATE_SYM_EDGE_MAP(DefaultMap);
 
     SymListGraph() : ListGraph() { }
@@ -530 +533 @@
     class InEdgeIt;
     
-    CREATE_MAP_REGISTRIES;
-    CREATE_MAPS(DefaultMapFactory);
+    /// Creating node map registry.
+    CREATE_NODE_MAP_REGISTRY;
+    /// Creating node maps.
+    CREATE_NODE_MAP(DefaultMap);
+
+    /// Creating empty map structure for edges.
+    template <typename Value>
+    class EdgeMap {
+    public:
+      EdgeMap() {}
+      EdgeMap(const Graph&) {}
+      EdgeMap(const Graph&, const Value&) {}
+
+      EdgeMap(const EdgeMap&) {}
+      template <typename CMap> EdgeMap(const CMap&) {}
+
+      EdgeMap& operator=(const EdgeMap&) {}
+      template <typename CMap> EdgeMap& operator=(const CMap&) {}
+      
+      class ConstIterator {
+      public:
+        bool operator==(const ConstIterator&) {return true;}
+        bool operator!=(const ConstIterator&) {return false;}
+      };
+
+      typedef ConstIterator Iterator;
+      
+      Iterator begin() { return Iterator();}
+      Iterator end() { return Iterator();}
+
+      ConstIterator begin() const { return ConstIterator();}
+      ConstIterator end() const { return ConstIterator();}
+
+    };
     
   public:
@@ -849 +884 @@
 
 
+    /// Creating edge map registry.
     CREATE_EDGE_MAP_REGISTRY;
-    CREATE_EDGE_MAP_FACTORY(DefaultMapFactory);
-    IMPORT_EDGE_MAP(EdgeMapFactory);
+    /// Creating edge maps.
+    CREATE_EDGE_MAP(DefaultMap);
+
+    /// Importing node maps from the NodeGraphType.
+    IMPORT_NODE_MAP(NodeGraphType, graph.G, EdgeSet, graph);
     
     
@@ -1091 +1130 @@
       InEdgeIt &operator++() { n=G->edges[n].next_in; return *this; }
     };
-
-    
-    template <typename V> class NodeMap 
-      : public NodeGraphType::template NodeMap<V>
-    {
-      //This is a must, the constructors need it.
-      typedef typename NodeGraphType::template NodeMap<V> MapImpl;
-      typedef V Value;
-    public:
-      NodeMap() : MapImpl() {}
-      
-      NodeMap(const EdgeSet& graph) 
-        : MapImpl(graph.G) { }
-
-      NodeMap(const EdgeSet& graph, const Value& value) 
-        : MapImpl(graph.G, value) { }
-
-      NodeMap(const NodeMap& copy) 
-        : MapImpl(static_cast<const MapImpl&>(copy)) {}
-
-      template<typename CMap>
-      NodeMap(const CMap& copy)
-        : MapImpl(copy) { }
-
-      NodeMap& operator=(const NodeMap& copy) {
-        MapImpl::operator=(static_cast<const MapImpl&>(copy));
-        return *this;
-      }
-
-      template <typename CMap>
-      NodeMap& operator=(const CMap& copy) {
-        MapImpl::operator=(copy);
-        return *this;
-      }
-
-    };
+    
   };