COIN-OR::LEMON - Graph Library

About

Downloads

Documentation

Development

Issue Tracker

Browse Tickets

Custom Query

Roadmap

Browse Source

Local Info

Mailing Lists

Search

Changes in / [260:c691064dfd4f:259:362415050b29] in lemon-main


Ignore:
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • lemon/bfs.h

    r258 r252  
    231231
    232232    template <class T>
    233     struct SetPredMapTraits : public Traits {
     233    struct DefPredMapTraits : public Traits {
    234234      typedef T PredMap;
    235235      static PredMap *createPredMap(const Digraph &)
    … …  
    244244    ///\ref PredMap type.
    245245    template <class T>
    246     struct SetPredMap : public Bfs< Digraph, SetPredMapTraits<T> > {
    247       typedef Bfs< Digraph, SetPredMapTraits<T> > Create;
     246    struct DefPredMap : public Bfs< Digraph, DefPredMapTraits<T> > {
     247      typedef Bfs< Digraph, DefPredMapTraits<T> > Create;
    248248    };
    249249
    250250    template <class T>
    251     struct SetDistMapTraits : public Traits {
     251    struct DefDistMapTraits : public Traits {
    252252      typedef T DistMap;
    253253      static DistMap *createDistMap(const Digraph &)
    … …  
    262262    ///\ref DistMap type.
    263263    template <class T>
    264     struct SetDistMap : public Bfs< Digraph, SetDistMapTraits<T> > {
    265       typedef Bfs< Digraph, SetDistMapTraits<T> > Create;
     264    struct DefDistMap : public Bfs< Digraph, DefDistMapTraits<T> > {
     265      typedef Bfs< Digraph, DefDistMapTraits<T> > Create;
    266266    };
    267267
    268268    template <class T>
    269     struct SetReachedMapTraits : public Traits {
     269    struct DefReachedMapTraits : public Traits {
    270270      typedef T ReachedMap;
    271271      static ReachedMap *createReachedMap(const Digraph &)
    … …  
    280280    ///\ref ReachedMap type.
    281281    template <class T>
    282     struct SetReachedMap : public Bfs< Digraph, SetReachedMapTraits<T> > {
    283       typedef Bfs< Digraph, SetReachedMapTraits<T> > Create;
     282    struct DefReachedMap : public Bfs< Digraph, DefReachedMapTraits<T> > {
     283      typedef Bfs< Digraph, DefReachedMapTraits<T> > Create;
    284284    };
    285285
    286286    template <class T>
    287     struct SetProcessedMapTraits : public Traits {
     287    struct DefProcessedMapTraits : public Traits {
    288288      typedef T ProcessedMap;
    289289      static ProcessedMap *createProcessedMap(const Digraph &)
    … …  
    298298    ///\ref ProcessedMap type.
    299299    template <class T>
    300     struct SetProcessedMap : public Bfs< Digraph, SetProcessedMapTraits<T> > {
    301       typedef Bfs< Digraph, SetProcessedMapTraits<T> > Create;
    302     };
    303 
    304     struct SetStandardProcessedMapTraits : public Traits {
     300    struct DefProcessedMap : public Bfs< Digraph, DefProcessedMapTraits<T> > {
     301      typedef Bfs< Digraph, DefProcessedMapTraits<T> > Create;
     302    };
     303
     304    struct DefDigraphProcessedMapTraits : public Traits {
    305305      typedef typename Digraph::template NodeMap<bool> ProcessedMap;
    306306      static ProcessedMap *createProcessedMap(const Digraph &g)
    … …  
    315315    ///\ref ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
    316316    ///If you don't set it explicitly, it will be automatically allocated.
    317     struct SetStandardProcessedMap :
    318       public Bfs< Digraph, SetStandardProcessedMapTraits > {
    319       typedef Bfs< Digraph, SetStandardProcessedMapTraits > Create;
     317    template <class T>
     318    struct DefProcessedMapToBeDefaultMap :
     319      public Bfs< Digraph, DefDigraphProcessedMapTraits> {
     320      typedef Bfs< Digraph, DefDigraphProcessedMapTraits> Create;
    320321    };
    321322
    … …  
    10651066
    10661067    template<class T>
    1067     struct SetPredMapBase : public Base {
     1068    struct DefPredMapBase : public Base {
    10681069      typedef T PredMap;
    10691070      static PredMap *createPredMap(const Digraph &) { return 0; };
    1070       SetPredMapBase(const TR &b) : TR(b) {}
     1071      DefPredMapBase(const TR &b) : TR(b) {}
    10711072    };
    10721073    ///\brief \ref named-templ-param "Named parameter"
    … …  
    10761077    ///for setting \ref PredMap object.
    10771078    template<class T>
    1078     BfsWizard<SetPredMapBase<T> > predMap(const T &t)
     1079    BfsWizard<DefPredMapBase<T> > predMap(const T &t)
    10791080    {
    10801081      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
    1081       return BfsWizard<SetPredMapBase<T> >(*this);
     1082      return BfsWizard<DefPredMapBase<T> >(*this);
    10821083    }
    10831084
    10841085    template<class T>
    1085     struct SetReachedMapBase : public Base {
     1086    struct DefReachedMapBase : public Base {
    10861087      typedef T ReachedMap;
    10871088      static ReachedMap *createReachedMap(const Digraph &) { return 0; };
    1088       SetReachedMapBase(const TR &b) : TR(b) {}
     1089      DefReachedMapBase(const TR &b) : TR(b) {}
    10891090    };
    10901091    ///\brief \ref named-templ-param "Named parameter"
    … …  
    10941095    ///for setting \ref ReachedMap object.
    10951096    template<class T>
    1096     BfsWizard<SetReachedMapBase<T> > reachedMap(const T &t)
     1097    BfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
    10971098    {
    10981099      Base::_reached=reinterpret_cast<void*>(const_cast<T*>(&t));
    1099       return BfsWizard<SetReachedMapBase<T> >(*this);
     1100      return BfsWizard<DefReachedMapBase<T> >(*this);
    11001101    }
    11011102
    11021103    template<class T>
    1103     struct SetProcessedMapBase : public Base {
     1104    struct DefProcessedMapBase : public Base {
    11041105      typedef T ProcessedMap;
    11051106      static ProcessedMap *createProcessedMap(const Digraph &) { return 0; };
    1106       SetProcessedMapBase(const TR &b) : TR(b) {}
     1107      DefProcessedMapBase(const TR &b) : TR(b) {}
    11071108    };
    11081109    ///\brief \ref named-templ-param "Named parameter"
    … …  
    11121113    ///for setting \ref ProcessedMap object.
    11131114    template<class T>
    1114     BfsWizard<SetProcessedMapBase<T> > processedMap(const T &t)
     1115    BfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
    11151116    {
    11161117      Base::_processed=reinterpret_cast<void*>(const_cast<T*>(&t));
    1117       return BfsWizard<SetProcessedMapBase<T> >(*this);
     1118      return BfsWizard<DefProcessedMapBase<T> >(*this);
    11181119    }
    11191120
    11201121    template<class T>
    1121     struct SetDistMapBase : public Base {
     1122    struct DefDistMapBase : public Base {
    11221123      typedef T DistMap;
    11231124      static DistMap *createDistMap(const Digraph &) { return 0; };
    1124       SetDistMapBase(const TR &b) : TR(b) {}
     1125      DefDistMapBase(const TR &b) : TR(b) {}
    11251126    };
    11261127    ///\brief \ref named-templ-param "Named parameter"
    … …  
    11301131    ///for setting \ref DistMap object.
    11311132    template<class T>
    1132     BfsWizard<SetDistMapBase<T> > distMap(const T &t)
     1133    BfsWizard<DefDistMapBase<T> > distMap(const T &t)
    11331134    {
    11341135      Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
    1135       return BfsWizard<SetDistMapBase<T> >(*this);
     1136      return BfsWizard<DefDistMapBase<T> >(*this);
    11361137    }
    11371138
    … …  
    13541355    ///@{
    13551356    template <class T>
    1356     struct SetReachedMapTraits : public Traits {
     1357    struct DefReachedMapTraits : public Traits {
    13571358      typedef T ReachedMap;
    13581359      static ReachedMap *createReachedMap(const Digraph &digraph) {
    … …  
    13651366    /// \ref named-templ-param "Named parameter" for setting ReachedMap type.
    13661367    template <class T>
    1367     struct SetReachedMap : public BfsVisit< Digraph, Visitor,
    1368                                             SetReachedMapTraits<T> > {
    1369       typedef BfsVisit< Digraph, Visitor, SetReachedMapTraits<T> > Create;
     1368    struct DefReachedMap : public BfsVisit< Digraph, Visitor,
     1369                                            DefReachedMapTraits<T> > {
     1370      typedef BfsVisit< Digraph, Visitor, DefReachedMapTraits<T> > Create;
    13701371    };
    13711372    ///@}

  • lemon/bits/base_extender.h

    r256 r220  
    6060      Arc() {}
    6161
    62       // Invalid arc constructor
     62      /// Invalid arc constructor
    6363      Arc(Invalid i) : Edge(i), forward(true) {}
    6464
    … …  
    7575    };
    7676
    77     /// First node of the edge
    78     Node u(const Edge &e) const {
    79       return Parent::source(e);
    80     }
    81 
    82     /// Source of the given arc
     77
     78
     79    using Parent::source;
     80
     81    /// Source of the given Arc.
    8382    Node source(const Arc &e) const {
    8483      return e.forward ? Parent::source(e) : Parent::target(e);
    8584    }
    8685
    87     /// Second node of the edge
    88     Node v(const Edge &e) const {
    89       return Parent::target(e);
    90     }
    91 
    92     /// Target of the given arc
     86    using Parent::target;
     87
     88    /// Target of the given Arc.
    9389    Node target(const Arc &e) const {
    9490      return e.forward ? Parent::target(e) : Parent::source(e);
    … …  
    9793    /// \brief Directed arc from an edge.
    9894    ///
    99     /// Returns a directed arc corresponding to the specified edge.
    100     /// If the given bool is true, the first node of the given edge and
    101     /// the source node of the returned arc are the same.
    102     static Arc direct(const Edge &e, bool d) {
    103       return Arc(e, d);
    104     }
    105 
    106     /// Returns whether the given directed arc has the same orientation
    107     /// as the corresponding edge.
     95    /// Returns a directed arc corresponding to the specified Edge.
     96    /// If the given bool is true the given edge and the
     97    /// returned arc have the same source node.
     98    static Arc direct(const Edge &ue, bool d) {
     99      return Arc(ue, d);
     100    }
     101
     102    /// Returns whether the given directed arc is same orientation as the
     103    /// corresponding edge.
    108104    ///
    109105    /// \todo reference to the corresponding point of the undirected digraph
    110106    /// concept. "What does the direction of an edge mean?"
    111     static bool direction(const Arc &a) { return a.forward; }
     107    static bool direction(const Arc &e) { return e.forward; }
     108
    112109
    113110    using Parent::first;
    … …  
    232229      return Parent::maxArcId();
    233230    }
     231
    234232
    235233    int arcNum() const {

  • lemon/dfs.h

    r258 r252  
    231231
    232232    template <class T>
    233     struct SetPredMapTraits : public Traits {
     233    struct DefPredMapTraits : public Traits {
    234234      typedef T PredMap;
    235235      static PredMap *createPredMap(const Digraph &)
    … …  
    244244    ///\ref PredMap type.
    245245    template <class T>
    246     struct SetPredMap : public Dfs<Digraph, SetPredMapTraits<T> > {
    247       typedef Dfs<Digraph, SetPredMapTraits<T> > Create;
     246    struct DefPredMap : public Dfs<Digraph, DefPredMapTraits<T> > {
     247      typedef Dfs<Digraph, DefPredMapTraits<T> > Create;
    248248    };
    249249
    250250    template <class T>
    251     struct SetDistMapTraits : public Traits {
     251    struct DefDistMapTraits : public Traits {
    252252      typedef T DistMap;
    253253      static DistMap *createDistMap(const Digraph &)
    … …  
    262262    ///\ref DistMap type.
    263263    template <class T>
    264     struct SetDistMap : public Dfs< Digraph, SetDistMapTraits<T> > {
    265       typedef Dfs<Digraph, SetDistMapTraits<T> > Create;
     264    struct DefDistMap : public Dfs< Digraph, DefDistMapTraits<T> > {
     265      typedef Dfs<Digraph, DefDistMapTraits<T> > Create;
    266266    };
    267267
    268268    template <class T>
    269     struct SetReachedMapTraits : public Traits {
     269    struct DefReachedMapTraits : public Traits {
    270270      typedef T ReachedMap;
    271271      static ReachedMap *createReachedMap(const Digraph &)
    … …  
    280280    ///\ref ReachedMap type.
    281281    template <class T>
    282     struct SetReachedMap : public Dfs< Digraph, SetReachedMapTraits<T> > {
    283       typedef Dfs< Digraph, SetReachedMapTraits<T> > Create;
     282    struct DefReachedMap : public Dfs< Digraph, DefReachedMapTraits<T> > {
     283      typedef Dfs< Digraph, DefReachedMapTraits<T> > Create;
    284284    };
    285285
    286286    template <class T>
    287     struct SetProcessedMapTraits : public Traits {
     287    struct DefProcessedMapTraits : public Traits {
    288288      typedef T ProcessedMap;
    289289      static ProcessedMap *createProcessedMap(const Digraph &)
    … …  
    298298    ///\ref ProcessedMap type.
    299299    template <class T>
    300     struct SetProcessedMap : public Dfs< Digraph, SetProcessedMapTraits<T> > {
    301       typedef Dfs< Digraph, SetProcessedMapTraits<T> > Create;
    302     };
    303 
    304     struct SetStandardProcessedMapTraits : public Traits {
     300    struct DefProcessedMap : public Dfs< Digraph, DefProcessedMapTraits<T> > {
     301      typedef Dfs< Digraph, DefProcessedMapTraits<T> > Create;
     302    };
     303
     304    struct DefDigraphProcessedMapTraits : public Traits {
    305305      typedef typename Digraph::template NodeMap<bool> ProcessedMap;
    306306      static ProcessedMap *createProcessedMap(const Digraph &g)
    … …  
    315315    ///\ref ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
    316316    ///If you don't set it explicitly, it will be automatically allocated.
    317     struct SetStandardProcessedMap :
    318       public Dfs< Digraph, SetStandardProcessedMapTraits > {
    319       typedef Dfs< Digraph, SetStandardProcessedMapTraits > Create;
     317    template <class T>
     318    struct DefProcessedMapToBeDefaultMap :
     319      public Dfs< Digraph, DefDigraphProcessedMapTraits> {
     320      typedef Dfs< Digraph, DefDigraphProcessedMapTraits> Create;
    320321    };
    321322
    … …  
    10001001
    10011002    template<class T>
    1002     struct SetPredMapBase : public Base {
     1003    struct DefPredMapBase : public Base {
    10031004      typedef T PredMap;
    10041005      static PredMap *createPredMap(const Digraph &) { return 0; };
    1005       SetPredMapBase(const TR &b) : TR(b) {}
     1006      DefPredMapBase(const TR &b) : TR(b) {}
    10061007    };
    10071008    ///\brief \ref named-templ-param "Named parameter"
    … …  
    10111012    ///for setting \ref PredMap object.
    10121013    template<class T>
    1013     DfsWizard<SetPredMapBase<T> > predMap(const T &t)
     1014    DfsWizard<DefPredMapBase<T> > predMap(const T &t)
    10141015    {
    10151016      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
    1016       return DfsWizard<SetPredMapBase<T> >(*this);
     1017      return DfsWizard<DefPredMapBase<T> >(*this);
    10171018    }
    10181019
    10191020    template<class T>
    1020     struct SetReachedMapBase : public Base {
     1021    struct DefReachedMapBase : public Base {
    10211022      typedef T ReachedMap;
    10221023      static ReachedMap *createReachedMap(const Digraph &) { return 0; };
    1023       SetReachedMapBase(const TR &b) : TR(b) {}
     1024      DefReachedMapBase(const TR &b) : TR(b) {}
    10241025    };
    10251026    ///\brief \ref named-templ-param "Named parameter"
    … …  
    10291030    ///for setting \ref ReachedMap object.
    10301031    template<class T>
    1031     DfsWizard<SetReachedMapBase<T> > reachedMap(const T &t)
     1032    DfsWizard<DefReachedMapBase<T> > reachedMap(const T &t)
    10321033    {
    10331034      Base::_reached=reinterpret_cast<void*>(const_cast<T*>(&t));
    1034       return DfsWizard<SetReachedMapBase<T> >(*this);
     1035      return DfsWizard<DefReachedMapBase<T> >(*this);
    10351036    }
    10361037
    10371038    template<class T>
    1038     struct SetProcessedMapBase : public Base {
     1039    struct DefProcessedMapBase : public Base {
    10391040      typedef T ProcessedMap;
    10401041      static ProcessedMap *createProcessedMap(const Digraph &) { return 0; };
    1041       SetProcessedMapBase(const TR &b) : TR(b) {}
     1042      DefProcessedMapBase(const TR &b) : TR(b) {}
    10421043    };
    10431044    ///\brief \ref named-templ-param "Named parameter"
    … …  
    10471048    ///for setting \ref ProcessedMap object.
    10481049    template<class T>
    1049     DfsWizard<SetProcessedMapBase<T> > processedMap(const T &t)
     1050    DfsWizard<DefProcessedMapBase<T> > processedMap(const T &t)
    10501051    {
    10511052      Base::_processed=reinterpret_cast<void*>(const_cast<T*>(&t));
    1052       return DfsWizard<SetProcessedMapBase<T> >(*this);
     1053      return DfsWizard<DefProcessedMapBase<T> >(*this);
    10531054    }
    10541055
    10551056    template<class T>
    1056     struct SetDistMapBase : public Base {
     1057    struct DefDistMapBase : public Base {
    10571058      typedef T DistMap;
    10581059      static DistMap *createDistMap(const Digraph &) { return 0; };
    1059       SetDistMapBase(const TR &b) : TR(b) {}
     1060      DefDistMapBase(const TR &b) : TR(b) {}
    10601061    };
    10611062    ///\brief \ref named-templ-param "Named parameter"
    … …  
    10651066    ///for setting \ref DistMap object.
    10661067    template<class T>
    1067     DfsWizard<SetDistMapBase<T> > distMap(const T &t)
     1068    DfsWizard<DefDistMapBase<T> > distMap(const T &t)
    10681069    {
    10691070      Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
    1070       return DfsWizard<SetDistMapBase<T> >(*this);
     1071      return DfsWizard<DefDistMapBase<T> >(*this);
    10711072    }
    10721073
    … …  
    13011302    ///@{
    13021303    template <class T>
    1303     struct SetReachedMapTraits : public Traits {
     1304    struct DefReachedMapTraits : public Traits {
    13041305      typedef T ReachedMap;
    13051306      static ReachedMap *createReachedMap(const Digraph &digraph) {
    … …  
    13121313    /// \ref named-templ-param "Named parameter" for setting ReachedMap type.
    13131314    template <class T>
    1314     struct SetReachedMap : public DfsVisit< Digraph, Visitor,
    1315                                             SetReachedMapTraits<T> > {
    1316       typedef DfsVisit< Digraph, Visitor, SetReachedMapTraits<T> > Create;
     1315    struct DefReachedMap : public DfsVisit< Digraph, Visitor,
     1316                                            DefReachedMapTraits<T> > {
     1317      typedef DfsVisit< Digraph, Visitor, DefReachedMapTraits<T> > Create;
    13171318    };
    13181319    ///@}

  • lemon/dijkstra.h

    r258 r251  
    332332
    333333    template <class T>
    334     struct SetPredMapTraits : public Traits {
     334    struct DefPredMapTraits : public Traits {
    335335      typedef T PredMap;
    336336      static PredMap *createPredMap(const Digraph &)
    … …  
    345345    ///\ref PredMap type.
    346346    template <class T>
    347     struct SetPredMap
    348       : public Dijkstra< Digraph, LengthMap, SetPredMapTraits<T> > {
    349       typedef Dijkstra< Digraph, LengthMap, SetPredMapTraits<T> > Create;
     347    struct DefPredMap
     348      : public Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > {
     349      typedef Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > Create;
    350350    };
    351351
    352352    template <class T>
    353     struct SetDistMapTraits : public Traits {
     353    struct DefDistMapTraits : public Traits {
    354354      typedef T DistMap;
    355355      static DistMap *createDistMap(const Digraph &)
    … …  
    364364    ///\ref DistMap type.
    365365    template <class T>
    366     struct SetDistMap
    367       : public Dijkstra< Digraph, LengthMap, SetDistMapTraits<T> > {
    368       typedef Dijkstra< Digraph, LengthMap, SetDistMapTraits<T> > Create;
     366    struct DefDistMap
     367      : public Dijkstra< Digraph, LengthMap, DefDistMapTraits<T> > {
     368      typedef Dijkstra< Digraph, LengthMap, DefDistMapTraits<T> > Create;
    369369    };
    370370
    371371    template <class T>
    372     struct SetProcessedMapTraits : public Traits {
     372    struct DefProcessedMapTraits : public Traits {
    373373      typedef T ProcessedMap;
    374374      static ProcessedMap *createProcessedMap(const Digraph &)
    … …  
    383383    ///\ref ProcessedMap type.
    384384    template <class T>
    385     struct SetProcessedMap
    386       : public Dijkstra< Digraph, LengthMap, SetProcessedMapTraits<T> > {
    387       typedef Dijkstra< Digraph, LengthMap, SetProcessedMapTraits<T> > Create;
    388     };
    389 
    390     struct SetStandardProcessedMapTraits : public Traits {
     385    struct DefProcessedMap
     386      : public Dijkstra< Digraph, LengthMap, DefProcessedMapTraits<T> > {
     387      typedef Dijkstra< Digraph, LengthMap, DefProcessedMapTraits<T> > Create;
     388    };
     389
     390    struct DefDigraphProcessedMapTraits : public Traits {
    391391      typedef typename Digraph::template NodeMap<bool> ProcessedMap;
    392392      static ProcessedMap *createProcessedMap(const Digraph &g)
    … …  
    401401    ///\ref ProcessedMap type to be <tt>Digraph::NodeMap<bool></tt>.
    402402    ///If you don't set it explicitly, it will be automatically allocated.
    403     struct SetStandardProcessedMap
    404       : public Dijkstra< Digraph, LengthMap, SetStandardProcessedMapTraits > {
    405       typedef Dijkstra< Digraph, LengthMap, SetStandardProcessedMapTraits >
     403    template <class T>
     404    struct DefProcessedMapToBeDefaultMap
     405      : public Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits> {
     406      typedef Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits>
    406407      Create;
    407408    };
    408409
    409410    template <class H, class CR>
    410     struct SetHeapTraits : public Traits {
     411    struct DefHeapTraits : public Traits {
    411412      typedef CR HeapCrossRef;
    412413      typedef H Heap;
    … …  
    425426    ///reference type.
    426427    template <class H, class CR = typename Digraph::template NodeMap<int> >
    427     struct SetHeap
    428       : public Dijkstra< Digraph, LengthMap, SetHeapTraits<H, CR> > {
    429       typedef Dijkstra< Digraph, LengthMap, SetHeapTraits<H, CR> > Create;
     428    struct DefHeap
     429      : public Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > {
     430      typedef Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > Create;
    430431    };
    431432
    432433    template <class H, class CR>
    433     struct SetStandardHeapTraits : public Traits {
     434    struct DefStandardHeapTraits : public Traits {
    434435      typedef CR HeapCrossRef;
    435436      typedef H Heap;
    … …  
    450451    ///parameter and the heap's constructor waits for the cross reference.
    451452    template <class H, class CR = typename Digraph::template NodeMap<int> >
    452     struct SetStandardHeap
    453       : public Dijkstra< Digraph, LengthMap, SetStandardHeapTraits<H, CR> > {
    454       typedef Dijkstra< Digraph, LengthMap, SetStandardHeapTraits<H, CR> >
     453    struct DefStandardHeap
     454      : public Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> > {
     455      typedef Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> >
    455456      Create;
    456457    };
    457458
    458459    template <class T>
    459     struct SetOperationTraitsTraits : public Traits {
     460    struct DefOperationTraitsTraits : public Traits {
    460461      typedef T OperationTraits;
    461462    };
    … …  
    467468    ///\ref OperationTraits type.
    468469    template <class T>
    469     struct SetOperationTraits
    470       : public Dijkstra<Digraph, LengthMap, SetOperationTraitsTraits<T> > {
    471       typedef Dijkstra<Digraph, LengthMap, SetOperationTraitsTraits<T> >
     470    struct DefOperationTraits
     471      : public Dijkstra<Digraph, LengthMap, DefOperationTraitsTraits<T> > {
     472      typedef Dijkstra<Digraph, LengthMap, DefOperationTraitsTraits<T> >
    472473      Create;
    473474    };
    … …  
    12051206
    12061207    template<class T>
    1207     struct SetPredMapBase : public Base {
     1208    struct DefPredMapBase : public Base {
    12081209      typedef T PredMap;
    12091210      static PredMap *createPredMap(const Digraph &) { return 0; };
    1210       SetPredMapBase(const TR &b) : TR(b) {}
     1211      DefPredMapBase(const TR &b) : TR(b) {}
    12111212    };
    12121213    ///\brief \ref named-templ-param "Named parameter"
    … …  
    12161217    ///for setting \ref PredMap object.
    12171218    template<class T>
    1218     DijkstraWizard<SetPredMapBase<T> > predMap(const T &t)
     1219    DijkstraWizard<DefPredMapBase<T> > predMap(const T &t)
    12191220    {
    12201221      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
    1221       return DijkstraWizard<SetPredMapBase<T> >(*this);
     1222      return DijkstraWizard<DefPredMapBase<T> >(*this);
    12221223    }
    12231224
    12241225    template<class T>
    1225     struct SetProcessedMapBase : public Base {
     1226    struct DefProcessedMapBase : public Base {
    12261227      typedef T ProcessedMap;
    12271228      static ProcessedMap *createProcessedMap(const Digraph &) { return 0; };
    1228       SetProcessedMapBase(const TR &b) : TR(b) {}
     1229      DefProcessedMapBase(const TR &b) : TR(b) {}
    12291230    };
    12301231    ///\brief \ref named-templ-param "Named parameter"
    … …  
    12341235    ///for setting \ref ProcessedMap object.
    12351236    template<class T>
    1236     DijkstraWizard<SetProcessedMapBase<T> > processedMap(const T &t)
     1237    DijkstraWizard<DefProcessedMapBase<T> > processedMap(const T &t)
    12371238    {
    12381239      Base::_processed=reinterpret_cast<void*>(const_cast<T*>(&t));
    1239       return DijkstraWizard<SetProcessedMapBase<T> >(*this);
     1240      return DijkstraWizard<DefProcessedMapBase<T> >(*this);
    12401241    }
    12411242
    12421243    template<class T>
    1243     struct SetDistMapBase : public Base {
     1244    struct DefDistMapBase : public Base {
    12441245      typedef T DistMap;
    12451246      static DistMap *createDistMap(const Digraph &) { return 0; };
    1246       SetDistMapBase(const TR &b) : TR(b) {}
     1247      DefDistMapBase(const TR &b) : TR(b) {}
    12471248    };
    12481249    ///\brief \ref named-templ-param "Named parameter"
    … …  
    12521253    ///for setting \ref DistMap object.
    12531254    template<class T>
    1254     DijkstraWizard<SetDistMapBase<T> > distMap(const T &t)
     1255    DijkstraWizard<DefDistMapBase<T> > distMap(const T &t)
    12551256    {
    12561257      Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
    1257       return DijkstraWizard<SetDistMapBase<T> >(*this);
     1258      return DijkstraWizard<DefDistMapBase<T> >(*this);
    12581259    }
    12591260

  • test/heap_test.cc

    r257 r212  
    132132                      Node source) {
    133133
    134   typename Dijkstra<Digraph, IntArcMap>::template SetStandardHeap<Heap>::
     134  typename Dijkstra<Digraph, IntArcMap>::template DefStandardHeap<Heap>::
    135135    Create dijkstra(digraph, length);
    136136
Note: See TracChangeset for help on using the changeset viewer.