Changeset 664:4137ef9aacc6 in lemon for lemon/concepts

Timestamp:

04/24/09 11:54:48 (15 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Fix and uniform the usage of Graph and Parent typedefs (#268)

• Rename Graph typedefs to GraphType? in the implementation of graph maps and MapExtender? to prevent conflicts (especially using VS). They are not public.
• Make Parent typedefs private in all classes.
• Replace Digraph with Graph in some places (fix faulty renamings of the script).
• Use Graph and Digraph typedefs (more) consequently.

File:

• lemon/concepts/graph_components.h (modified) (8 diffs)

lemon/concepts/graph_components.h

@@ -181 +181 @@
     class BaseGraphComponent : public BaseDigraphComponent {
     public:
+
+      typedef BaseGraphComponent Graph;
+
       typedef BaseDigraphComponent::Node Node;
       typedef BaseDigraphComponent::Arc Arc;
@@ -190 +193 @@
       /// represented by two opposite directed arcs.
       class Edge : public GraphItem<'e'> {
+        typedef GraphItem<'e'> Parent;
+
       public:
-        typedef GraphItem<'e'> Parent;
-
         /// \brief Default constructor.
         ///
@@ -992 +995 @@
     template <typename GR, typename K, typename V>
     class GraphMap : public ReferenceMap<K, V, V&, const V&> {
-    public:
-
-      typedef ReadWriteMap<K, V> Parent;
-
-      /// The graph type of the map.
-      typedef GR Graph;
+      typedef ReferenceMap<K, V, V&, const V&> Parent;
+
+    public:
+
       /// The key type of the map.
       typedef K Key;
@@ -1013 +1014 @@
       ///
       /// Construct a new map for the graph.
-      explicit GraphMap(const Graph&) {}
+      explicit GraphMap(const GR&) {}
       /// \brief Construct a new map with default value.
       ///
       /// Construct a new map for the graph and initalize the values.
-      GraphMap(const Graph&, const Value&) {}
+      GraphMap(const GR&, const Value&) {}
 
     private:
@@ -1058 +1059 @@
 
         const _Map &m;
-        const Graph &g;
+        const GR &g;
         const typename GraphMap::Value &t;
       };
@@ -1086 +1087 @@
       template <typename V>
       class NodeMap : public GraphMap<MappableDigraphComponent, Node, V> {
+        typedef GraphMap<MappableDigraphComponent, Node, V> Parent;
+
       public:
-        typedef GraphMap<MappableDigraphComponent, Node, V> Parent;
-
         /// \brief Construct a new map.
         ///
@@ -1124 +1125 @@
       template <typename V>
       class ArcMap : public GraphMap<MappableDigraphComponent, Arc, V> {
+        typedef GraphMap<MappableDigraphComponent, Arc, V> Parent;
+
       public:
-        typedef GraphMap<MappableDigraphComponent, Arc, V> Parent;
-
         /// \brief Construct a new map.
         ///
@@ -1222 +1223 @@
       template <typename V>
       class EdgeMap : public GraphMap<MappableGraphComponent, Edge, V> {
+        typedef GraphMap<MappableGraphComponent, Edge, V> Parent;
+
       public:
-        typedef GraphMap<MappableGraphComponent, Edge, V> Parent;
-
         /// \brief Construct a new map.
         ///