lemon/graph_adaptor.h
changeset 1980 a954b780e3ab
parent 1979 c2992fd74dad
child 1989 d276e88aa48a
     1.1 --- a/lemon/graph_adaptor.h	Wed Feb 22 18:26:56 2006 +0000
     1.2 +++ b/lemon/graph_adaptor.h	Thu Feb 23 08:55:54 2006 +0000
     1.3 @@ -698,13 +698,13 @@
     1.4    };
     1.5  
     1.6    template <typename _Graph>
     1.7 -  class UndirectGraphAdaptorBase : 
     1.8 +  class UndirGraphAdaptorBase : 
     1.9      public UGraphBaseExtender<GraphAdaptorBase<_Graph> > {
    1.10    public:
    1.11      typedef _Graph Graph;
    1.12      typedef UGraphBaseExtender<GraphAdaptorBase<_Graph> > Parent;
    1.13    protected:
    1.14 -    UndirectGraphAdaptorBase() : Parent() { }
    1.15 +    UndirGraphAdaptorBase() : Parent() { }
    1.16    public:
    1.17      typedef typename Parent::UEdge UEdge;
    1.18      typedef typename Parent::Edge Edge;
    1.19 @@ -712,17 +712,17 @@
    1.20      template <typename T>
    1.21      class EdgeMap {
    1.22      protected:
    1.23 -      const UndirectGraphAdaptorBase<_Graph>* g;
    1.24 +      const UndirGraphAdaptorBase<_Graph>* g;
    1.25        template <typename TT> friend class EdgeMap;
    1.26        typename _Graph::template EdgeMap<T> forward_map, backward_map; 
    1.27      public:
    1.28        typedef T Value;
    1.29        typedef Edge Key;
    1.30        
    1.31 -      EdgeMap(const UndirectGraphAdaptorBase<_Graph>& _g) : g(&_g), 
    1.32 +      EdgeMap(const UndirGraphAdaptorBase<_Graph>& _g) : g(&_g), 
    1.33  	forward_map(*(g->graph)), backward_map(*(g->graph)) { }
    1.34  
    1.35 -      EdgeMap(const UndirectGraphAdaptorBase<_Graph>& _g, T a) : g(&_g), 
    1.36 +      EdgeMap(const UndirGraphAdaptorBase<_Graph>& _g, T a) : g(&_g), 
    1.37  	forward_map(*(g->graph), a), backward_map(*(g->graph), a) { }
    1.38        
    1.39        void set(Edge e, T a) { 
    1.40 @@ -748,10 +748,10 @@
    1.41        typedef T Value;
    1.42        typedef UEdge Key;
    1.43        
    1.44 -      UEdgeMap(const UndirectGraphAdaptorBase<_Graph>& g) : 
    1.45 +      UEdgeMap(const UndirGraphAdaptorBase<_Graph>& g) : 
    1.46  	map(*(g.graph)) { }
    1.47  
    1.48 -      UEdgeMap(const UndirectGraphAdaptorBase<_Graph>& g, T a) : 
    1.49 +      UEdgeMap(const UndirGraphAdaptorBase<_Graph>& g, T a) : 
    1.50  	map(*(g.graph), a) { }
    1.51        
    1.52        void set(UEdge e, T a) { 
    1.53 @@ -773,17 +773,17 @@
    1.54    /// 
    1.55    /// \author Marton Makai
    1.56    template<typename _Graph>
    1.57 -  class UndirectGraphAdaptor : 
    1.58 +  class UndirGraphAdaptor : 
    1.59      public UGraphAdaptorExtender<
    1.60 -    UndirectGraphAdaptorBase<_Graph> > {
    1.61 +    UndirGraphAdaptorBase<_Graph> > {
    1.62    public:
    1.63      typedef _Graph Graph;
    1.64      typedef UGraphAdaptorExtender<
    1.65 -      UndirectGraphAdaptorBase<_Graph> > Parent;
    1.66 +      UndirGraphAdaptorBase<_Graph> > Parent;
    1.67    protected:
    1.68 -    UndirectGraphAdaptor() { }
    1.69 +    UndirGraphAdaptor() { }
    1.70    public:
    1.71 -    UndirectGraphAdaptor(_Graph& _graph) { 
    1.72 +    UndirGraphAdaptor(_Graph& _graph) { 
    1.73        setGraph(_graph);
    1.74      }
    1.75    };