1.1 --- a/lemon/graph_adaptor.h	Thu Jan 26 06:44:22 2006 +0000
     1.2 +++ b/lemon/graph_adaptor.h	Thu Jan 26 15:42:13 2006 +0000
     1.3 @@ -672,31 +672,31 @@
     1.4    };
     1.5  
     1.6    template <typename _Graph>
     1.7 -  class UndirGraphAdaptorBase : 
     1.8 -    public UndirGraphExtender<GraphAdaptorBase<_Graph> > {
     1.9 +  class UGraphAdaptorBase : 
    1.10 +    public UGraphExtender<GraphAdaptorBase<_Graph> > {
    1.11    public:
    1.12      typedef _Graph Graph;
    1.13 -    typedef UndirGraphExtender<GraphAdaptorBase<_Graph> > Parent;
    1.14 +    typedef UGraphExtender<GraphAdaptorBase<_Graph> > Parent;
    1.15    protected:
    1.16 -    UndirGraphAdaptorBase() : Parent() { }
    1.17 +    UGraphAdaptorBase() : Parent() { }
    1.18    public:
    1.19 -    typedef typename Parent::UndirEdge UndirEdge;
    1.20 +    typedef typename Parent::UEdge UEdge;
    1.21      typedef typename Parent::Edge Edge;
    1.22      
    1.23      template <typename T>
    1.24      class EdgeMap {
    1.25      protected:
    1.26 -      const UndirGraphAdaptorBase<_Graph>* g;
    1.27 +      const UGraphAdaptorBase<_Graph>* g;
    1.28        template <typename TT> friend class EdgeMap;
    1.29        typename _Graph::template EdgeMap<T> forward_map, backward_map; 
    1.30      public:
    1.31        typedef T Value;
    1.32        typedef Edge Key;
    1.33        
    1.34 -      EdgeMap(const UndirGraphAdaptorBase<_Graph>& _g) : g(&_g), 
    1.35 +      EdgeMap(const UGraphAdaptorBase<_Graph>& _g) : g(&_g), 
    1.36  	forward_map(*(g->graph)), backward_map(*(g->graph)) { }
    1.37  
    1.38 -      EdgeMap(const UndirGraphAdaptorBase<_Graph>& _g, T a) : g(&_g), 
    1.39 +      EdgeMap(const UGraphAdaptorBase<_Graph>& _g, T a) : g(&_g), 
    1.40  	forward_map(*(g->graph), a), backward_map(*(g->graph), a) { }
    1.41        
    1.42        void set(Edge e, T a) { 
    1.43 @@ -715,24 +715,24 @@
    1.44      };
    1.45          
    1.46      template <typename T>
    1.47 -    class UndirEdgeMap {
    1.48 -      template <typename TT> friend class UndirEdgeMap;
    1.49 +    class UEdgeMap {
    1.50 +      template <typename TT> friend class UEdgeMap;
    1.51        typename _Graph::template EdgeMap<T> map; 
    1.52      public:
    1.53        typedef T Value;
    1.54 -      typedef UndirEdge Key;
    1.55 +      typedef UEdge Key;
    1.56        
    1.57 -      UndirEdgeMap(const UndirGraphAdaptorBase<_Graph>& g) : 
    1.58 +      UEdgeMap(const UGraphAdaptorBase<_Graph>& g) : 
    1.59  	map(*(g.graph)) { }
    1.60  
    1.61 -      UndirEdgeMap(const UndirGraphAdaptorBase<_Graph>& g, T a) : 
    1.62 +      UEdgeMap(const UGraphAdaptorBase<_Graph>& g, T a) : 
    1.63  	map(*(g.graph), a) { }
    1.64        
    1.65 -      void set(UndirEdge e, T a) { 
    1.66 +      void set(UEdge e, T a) { 
    1.67  	map.set(e, a); 
    1.68        }
    1.69  
    1.70 -      T operator[](UndirEdge e) const { 
    1.71 +      T operator[](UEdge e) const { 
    1.72  	return map[e]; 
    1.73        }
    1.74      };
    1.75 @@ -746,17 +746,17 @@
    1.76    /// 
    1.77    /// \author Marton Makai
    1.78    template<typename _Graph>
    1.79 -  class UndirGraphAdaptor : 
    1.80 -    public IterableUndirGraphExtender<
    1.81 -    UndirGraphAdaptorBase<_Graph> > {
    1.82 +  class UGraphAdaptor : 
    1.83 +    public IterableUGraphExtender<
    1.84 +    UGraphAdaptorBase<_Graph> > {
    1.85    public:
    1.86      typedef _Graph Graph;
    1.87 -    typedef IterableUndirGraphExtender<
    1.88 -      UndirGraphAdaptorBase<_Graph> > Parent;
    1.89 +    typedef IterableUGraphExtender<
    1.90 +      UGraphAdaptorBase<_Graph> > Parent;
    1.91    protected:
    1.92 -    UndirGraphAdaptor() { }
    1.93 +    UGraphAdaptor() { }
    1.94    public:
    1.95 -    UndirGraphAdaptor(_Graph& _graph) { 
    1.96 +    UGraphAdaptor(_Graph& _graph) { 
    1.97        setGraph(_graph);
    1.98      }
    1.99    };