Changeset 664:4137ef9aacc6 in lemon for lemon/edge_set.h

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/edge_set.h (modified) (17 diffs)

lemon/edge_set.h

@@ -34 +34 @@
   public:
 
-    typedef GR Graph;
     typedef typename GR::Node Node;
     typedef typename GR::NodeIt NodeIt;
@@ -209 +208 @@
     template <typename V>
     class NodeMap : public GR::template NodeMap<V> {
+      typedef typename GR::template NodeMap<V> Parent;
+
     public:
-
-      typedef typename GR::template NodeMap<V> Parent;
 
       explicit NodeMap(const ListArcSetBase<GR>& arcset)
@@ -260 +259 @@
   template <typename GR>
   class ListArcSet : public ArcSetExtender<ListArcSetBase<GR> > {
-
-  public:
-
     typedef ArcSetExtender<ListArcSetBase<GR> > Parent;
+
+  public:
 
     typedef typename Parent::Node Node;
     typedef typename Parent::Arc Arc;
-
-    typedef GR Graph;
-
 
     typedef typename Parent::NodesImplBase NodesImplBase;
@@ -293 +288 @@
 
     class NodesImpl : public NodesImplBase {
+      typedef NodesImplBase Parent;
+
     public:
-      typedef NodesImplBase Parent;
-
       NodesImpl(const GR& graph, ListArcSet& arcset)
         : Parent(graph), _arcset(arcset) {}
@@ -355 +350 @@
   public:
 
-    typedef GR Graph;
     typedef typename GR::Node Node;
     typedef typename GR::NodeIt NodeIt;
@@ -638 +632 @@
     template <typename V>
     class NodeMap : public GR::template NodeMap<V> {
+      typedef typename GR::template NodeMap<V> Parent;
+
     public:
-
-      typedef typename GR::template NodeMap<V> Parent;
 
       explicit NodeMap(const ListEdgeSetBase<GR>& arcset)
@@ -689 +683 @@
   template <typename GR>
   class ListEdgeSet : public EdgeSetExtender<ListEdgeSetBase<GR> > {
-
-  public:
-
     typedef EdgeSetExtender<ListEdgeSetBase<GR> > Parent;
+
+  public:
 
     typedef typename Parent::Node Node;
     typedef typename Parent::Arc Arc;
     typedef typename Parent::Edge Edge;
-
-    typedef GR Graph;
-
 
     typedef typename Parent::NodesImplBase NodesImplBase;
@@ -718 +708 @@
 
     class NodesImpl : public NodesImplBase {
+      typedef NodesImplBase Parent;
+
     public:
-      typedef NodesImplBase Parent;
-
       NodesImpl(const GR& graph, ListEdgeSet& arcset)
         : Parent(graph), _arcset(arcset) {}
@@ -780 +770 @@
   public:
 
-    typedef GR Graph;
-    typedef typename Graph::Node Node;
-    typedef typename Graph::NodeIt NodeIt;
+    typedef typename GR::Node Node;
+    typedef typename GR::NodeIt NodeIt;
 
   protected:
@@ -901 +890 @@
     template <typename V>
     class NodeMap : public GR::template NodeMap<V> {
+      typedef typename GR::template NodeMap<V> Parent;
+
     public:
-
-      typedef typename GR::template NodeMap<V> Parent;
 
       explicit NodeMap(const SmartArcSetBase<GR>& arcset)
@@ -957 +946 @@
   template <typename GR>
   class SmartArcSet : public ArcSetExtender<SmartArcSetBase<GR> > {
-
-  public:
-
     typedef ArcSetExtender<SmartArcSetBase<GR> > Parent;
+
+  public:
 
     typedef typename Parent::Node Node;
     typedef typename Parent::Arc Arc;
-
-    typedef GR Graph;
 
   protected:
@@ -984 +970 @@
 
     class NodesImpl : public NodesImplBase {
+      typedef NodesImplBase Parent;
+
     public:
-      typedef NodesImplBase Parent;
-
       NodesImpl(const GR& graph, SmartArcSet& arcset)
         : Parent(graph), _arcset(arcset) {}
@@ -1063 +1049 @@
   public:
 
-    typedef GR Graph;
     typedef typename GR::Node Node;
     typedef typename GR::NodeIt NodeIt;
@@ -1250 +1235 @@
     template <typename V>
     class NodeMap : public GR::template NodeMap<V> {
+      typedef typename GR::template NodeMap<V> Parent;
+
     public:
-
-      typedef typename GR::template NodeMap<V> Parent;
 
       explicit NodeMap(const SmartEdgeSetBase<GR>& arcset)
@@ -1305 +1290 @@
   template <typename GR>
   class SmartEdgeSet : public EdgeSetExtender<SmartEdgeSetBase<GR> > {
-
-  public:
-
     typedef EdgeSetExtender<SmartEdgeSetBase<GR> > Parent;
+
+  public:
 
     typedef typename Parent::Node Node;
@@ -1314 +1298 @@
     typedef typename Parent::Edge Edge;
 
-    typedef GR Graph;
-
   protected:
 
@@ -1332 +1314 @@
 
     class NodesImpl : public NodesImplBase {
+      typedef NodesImplBase Parent;
+
     public:
-      typedef NodesImplBase Parent;
-
       NodesImpl(const GR& graph, SmartEdgeSet& arcset)
         : Parent(graph), _arcset(arcset) {}