Changeset 234:348f8fd374ee in lemon-0.x for src/work/marci

Timestamp:

03/22/04 17:37:10 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

RevGraphWrapper?

File:

• src/work/marci/graph_wrapper.h (modified) (3 diffs)

src/work/marci/graph_wrapper.h

@@ -241 +241 @@
 //   };
 
-  template<typename Graph>
+  template<typename /*Graph*/GraphWrapper
+  /*=typename GraphWrapperSkeleton< TrivGraphWrapper<Graph>*/ >
   class RevGraphWrapper : 
-    public GraphWrapperSkeleton< TrivGraphWrapper<Graph> > {
+    public GraphWrapper/*GraphWrapperSkeleton< TrivGraphWrapper<Graph> >*/ {
   protected:
     //Graph* graph;
@@ -254 +255 @@
   
     //typedef typename Graph::Edge Edge;
-    typedef typename GraphWrapperSkeleton< TrivGraphWrapper<Graph> >::OutEdgeIt InEdgeIt;
-    typedef typename GraphWrapperSkeleton< TrivGraphWrapper<Graph> >::InEdgeIt OutEdgeIt;
+    typedef typename GraphWrapper/*typename GraphWrapperSkeleton< TrivGraphWrapper<Graph> >*/::OutEdgeIt InEdgeIt;
+    typedef typename GraphWrapper/*typename GraphWrapperSkeleton< TrivGraphWrapper<Graph> >*/::InEdgeIt OutEdgeIt;
     //typedef typename Graph::SymEdgeIt SymEdgeIt;
     //typedef typename Graph::EdgeIt EdgeIt;
 
     //RevGraphWrapper() : graph(0) { }
-    RevGraphWrapper(Graph& _graph) : GraphWrapperSkeleton< TrivGraphWrapper<Graph> >(TrivGraphWrapper<Graph>(_graph)) { }
+    RevGraphWrapper(GraphWrapper _gw/*BaseGraph& _graph*/) : GraphWrapper/*GraphWrapperSkeleton< TrivGraphWrapper<Graph> >*/(_gw/*TrivGraphWrapper<Graph>(_graph)*/) { }
     
     //void setGraph(Graph& _graph) { graph = &_graph; }
@@ -305 +306 @@
 
     template<typename T> class NodeMap : 
-      public GraphWrapperSkeleton< TrivGraphWrapper<Graph> >::NodeMap<T> 
+      public GraphWrapper/*Skeleton< TrivGraphWrapper<Graph> >*/::NodeMap<T> 
     { 
     public:
-      NodeMap(const RevGraphWrapper<Graph>& _G) : 
-        GraphWrapperSkeleton< TrivGraphWrapper<Graph> >::NodeMap<T>(_G) { }
-      NodeMap(const RevGraphWrapper<Graph>& _G, T a) : 
-        GraphWrapperSkeleton< TrivGraphWrapper<Graph> >::NodeMap<T>(_G, a) { }
+      NodeMap(const RevGraphWrapper<GraphWrapper>& _gw) : 
+        GraphWrapper/*Skeleton< TrivGraphWrapper<Graph> >*/::NodeMap<T>(_gw) { }
+      NodeMap(const RevGraphWrapper<GraphWrapper>& _gw, T a) : 
+        GraphWrapper/*Skeleton< TrivGraphWrapper<Graph> >*/::NodeMap<T>(_gw, a) { }
     };
     
     template<typename T> class EdgeMap : 
-      public GraphWrapperSkeleton< TrivGraphWrapper<Graph> >::EdgeMap<T> { 
-    public:
-      EdgeMap(const RevGraphWrapper<Graph>& _G) : 
-        GraphWrapperSkeleton< TrivGraphWrapper<Graph> >::EdgeMap<T>(_G) { }
-      EdgeMap(const RevGraphWrapper<Graph>& _G, T a) : 
-        GraphWrapperSkeleton< TrivGraphWrapper<Graph> >::EdgeMap<T>(_G, a) { }
+      public GraphWrapper/*Skeleton< TrivGraphWrapper<Graph> >*/::EdgeMap<T> { 
+    public:
+      EdgeMap(const RevGraphWrapper<GraphWrapper>& _gw) : 
+        GraphWrapper/*Skeleton< TrivGraphWrapper<Graph> >*/::EdgeMap<T>(_gw) { }
+      EdgeMap(const RevGraphWrapper<GraphWrapper>& _gw, T a) : 
+        GraphWrapper/*Skeleton< TrivGraphWrapper<Graph> >*/::EdgeMap<T>(_gw, a) { }
     };
   };