COIN-OR::LEMON - Graph Library

Changeset 1980:a954b780e3ab in lemon-0.x for lemon/graph_adaptor.h


Ignore:
Timestamp:
02/23/06 09:55:54 (18 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2573
Message:

Renaming to be convient to the naming of the adaptors
Concept checking of the ugraph adaptors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/graph_adaptor.h

    r1979 r1980  
    699699
    700700  template <typename _Graph>
    701   class UndirectGraphAdaptorBase :
     701  class UndirGraphAdaptorBase :
    702702    public UGraphBaseExtender<GraphAdaptorBase<_Graph> > {
    703703  public:
     
    705705    typedef UGraphBaseExtender<GraphAdaptorBase<_Graph> > Parent;
    706706  protected:
    707     UndirectGraphAdaptorBase() : Parent() { }
     707    UndirGraphAdaptorBase() : Parent() { }
    708708  public:
    709709    typedef typename Parent::UEdge UEdge;
     
    713713    class EdgeMap {
    714714    protected:
    715       const UndirectGraphAdaptorBase<_Graph>* g;
     715      const UndirGraphAdaptorBase<_Graph>* g;
    716716      template <typename TT> friend class EdgeMap;
    717717      typename _Graph::template EdgeMap<T> forward_map, backward_map;
     
    720720      typedef Edge Key;
    721721     
    722       EdgeMap(const UndirectGraphAdaptorBase<_Graph>& _g) : g(&_g),
     722      EdgeMap(const UndirGraphAdaptorBase<_Graph>& _g) : g(&_g),
    723723        forward_map(*(g->graph)), backward_map(*(g->graph)) { }
    724724
    725       EdgeMap(const UndirectGraphAdaptorBase<_Graph>& _g, T a) : g(&_g),
     725      EdgeMap(const UndirGraphAdaptorBase<_Graph>& _g, T a) : g(&_g),
    726726        forward_map(*(g->graph), a), backward_map(*(g->graph), a) { }
    727727     
     
    749749      typedef UEdge Key;
    750750     
    751       UEdgeMap(const UndirectGraphAdaptorBase<_Graph>& g) :
     751      UEdgeMap(const UndirGraphAdaptorBase<_Graph>& g) :
    752752        map(*(g.graph)) { }
    753753
    754       UEdgeMap(const UndirectGraphAdaptorBase<_Graph>& g, T a) :
     754      UEdgeMap(const UndirGraphAdaptorBase<_Graph>& g, T a) :
    755755        map(*(g.graph), a) { }
    756756     
     
    774774  /// \author Marton Makai
    775775  template<typename _Graph>
    776   class UndirectGraphAdaptor :
     776  class UndirGraphAdaptor :
    777777    public UGraphAdaptorExtender<
    778     UndirectGraphAdaptorBase<_Graph> > {
     778    UndirGraphAdaptorBase<_Graph> > {
    779779  public:
    780780    typedef _Graph Graph;
    781781    typedef UGraphAdaptorExtender<
    782       UndirectGraphAdaptorBase<_Graph> > Parent;
     782      UndirGraphAdaptorBase<_Graph> > Parent;
    783783  protected:
    784     UndirectGraphAdaptor() { }
    785   public:
    786     UndirectGraphAdaptor(_Graph& _graph) {
     784    UndirGraphAdaptor() { }
     785  public:
     786    UndirGraphAdaptor(_Graph& _graph) {
    787787      setGraph(_graph);
    788788    }
Note: See TracChangeset for help on using the changeset viewer.