COIN-OR::LEMON - Graph Library

Changeset 257:8d76a7bf9961 in lemon-1.0 for lemon/dijkstra.h


Ignore:
Timestamp:
09/01/08 22:00:40 (11 years ago)
Author:
Peter Kovacs <kpeter@…>
Branch:
default
Phase:
public
Message:

Rename Def* to Set* in Bfs, Dfs, Dijkstra (ticket #134)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/dijkstra.h

    r247 r257  
    332332
    333333    template <class T>
    334     struct DefPredMapTraits : public Traits {
     334    struct SetPredMapTraits : public Traits {
    335335      typedef T PredMap;
    336336      static PredMap *createPredMap(const Digraph &)
     
    345345    ///\ref PredMap type.
    346346    template <class T>
    347     struct DefPredMap
    348       : public Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > {
    349       typedef Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > Create;
     347    struct SetPredMap
     348      : public Dijkstra< Digraph, LengthMap, SetPredMapTraits<T> > {
     349      typedef Dijkstra< Digraph, LengthMap, SetPredMapTraits<T> > Create;
    350350    };
    351351
    352352    template <class T>
    353     struct DefDistMapTraits : public Traits {
     353    struct SetDistMapTraits : public Traits {
    354354      typedef T DistMap;
    355355      static DistMap *createDistMap(const Digraph &)
     
    364364    ///\ref DistMap type.
    365365    template <class T>
    366     struct DefDistMap
    367       : public Dijkstra< Digraph, LengthMap, DefDistMapTraits<T> > {
    368       typedef Dijkstra< Digraph, LengthMap, DefDistMapTraits<T> > Create;
     366    struct SetDistMap
     367      : public Dijkstra< Digraph, LengthMap, SetDistMapTraits<T> > {
     368      typedef Dijkstra< Digraph, LengthMap, SetDistMapTraits<T> > Create;
    369369    };
    370370
    371371    template <class T>
    372     struct DefProcessedMapTraits : public Traits {
     372    struct SetProcessedMapTraits : public Traits {
    373373      typedef T ProcessedMap;
    374374      static ProcessedMap *createProcessedMap(const Digraph &)
     
    383383    ///\ref ProcessedMap type.
    384384    template <class T>
    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 {
     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 {
    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     template <class T>
    404     struct DefProcessedMapToBeDefaultMap
    405       : public Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits> {
    406       typedef Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits>
     403    struct SetStandardProcessedMap
     404      : public Dijkstra< Digraph, LengthMap, SetStandardProcessedMapTraits > {
     405      typedef Dijkstra< Digraph, LengthMap, SetStandardProcessedMapTraits >
    407406      Create;
    408407    };
    409408
    410409    template <class H, class CR>
    411     struct DefHeapTraits : public Traits {
     410    struct SetHeapTraits : public Traits {
    412411      typedef CR HeapCrossRef;
    413412      typedef H Heap;
     
    426425    ///reference type.
    427426    template <class H, class CR = typename Digraph::template NodeMap<int> >
    428     struct DefHeap
    429       : public Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > {
    430       typedef Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > Create;
     427    struct SetHeap
     428      : public Dijkstra< Digraph, LengthMap, SetHeapTraits<H, CR> > {
     429      typedef Dijkstra< Digraph, LengthMap, SetHeapTraits<H, CR> > Create;
    431430    };
    432431
    433432    template <class H, class CR>
    434     struct DefStandardHeapTraits : public Traits {
     433    struct SetStandardHeapTraits : public Traits {
    435434      typedef CR HeapCrossRef;
    436435      typedef H Heap;
     
    451450    ///parameter and the heap's constructor waits for the cross reference.
    452451    template <class H, class CR = typename Digraph::template NodeMap<int> >
    453     struct DefStandardHeap
    454       : public Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> > {
    455       typedef Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> >
     452    struct SetStandardHeap
     453      : public Dijkstra< Digraph, LengthMap, SetStandardHeapTraits<H, CR> > {
     454      typedef Dijkstra< Digraph, LengthMap, SetStandardHeapTraits<H, CR> >
    456455      Create;
    457456    };
    458457
    459458    template <class T>
    460     struct DefOperationTraitsTraits : public Traits {
     459    struct SetOperationTraitsTraits : public Traits {
    461460      typedef T OperationTraits;
    462461    };
     
    468467    ///\ref OperationTraits type.
    469468    template <class T>
    470     struct DefOperationTraits
    471       : public Dijkstra<Digraph, LengthMap, DefOperationTraitsTraits<T> > {
    472       typedef Dijkstra<Digraph, LengthMap, DefOperationTraitsTraits<T> >
     469    struct SetOperationTraits
     470      : public Dijkstra<Digraph, LengthMap, SetOperationTraitsTraits<T> > {
     471      typedef Dijkstra<Digraph, LengthMap, SetOperationTraitsTraits<T> >
    473472      Create;
    474473    };
     
    12001199
    12011200    template<class T>
    1202     struct DefPredMapBase : public Base {
     1201    struct SetPredMapBase : public Base {
    12031202      typedef T PredMap;
    12041203      static PredMap *createPredMap(const Digraph &) { return 0; };
    1205       DefPredMapBase(const TR &b) : TR(b) {}
     1204      SetPredMapBase(const TR &b) : TR(b) {}
    12061205    };
    12071206    ///\brief \ref named-templ-param "Named parameter"
     
    12111210    ///for setting \ref PredMap object.
    12121211    template<class T>
    1213     DijkstraWizard<DefPredMapBase<T> > predMap(const T &t)
     1212    DijkstraWizard<SetPredMapBase<T> > predMap(const T &t)
    12141213    {
    12151214      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
    1216       return DijkstraWizard<DefPredMapBase<T> >(*this);
     1215      return DijkstraWizard<SetPredMapBase<T> >(*this);
    12171216    }
    12181217
    12191218    template<class T>
    1220     struct DefProcessedMapBase : public Base {
     1219    struct SetProcessedMapBase : public Base {
    12211220      typedef T ProcessedMap;
    12221221      static ProcessedMap *createProcessedMap(const Digraph &) { return 0; };
    1223       DefProcessedMapBase(const TR &b) : TR(b) {}
     1222      SetProcessedMapBase(const TR &b) : TR(b) {}
    12241223    };
    12251224    ///\brief \ref named-templ-param "Named parameter"
     
    12291228    ///for setting \ref ProcessedMap object.
    12301229    template<class T>
    1231     DijkstraWizard<DefProcessedMapBase<T> > processedMap(const T &t)
     1230    DijkstraWizard<SetProcessedMapBase<T> > processedMap(const T &t)
    12321231    {
    12331232      Base::_processed=reinterpret_cast<void*>(const_cast<T*>(&t));
    1234       return DijkstraWizard<DefProcessedMapBase<T> >(*this);
     1233      return DijkstraWizard<SetProcessedMapBase<T> >(*this);
    12351234    }
    12361235
    12371236    template<class T>
    1238     struct DefDistMapBase : public Base {
     1237    struct SetDistMapBase : public Base {
    12391238      typedef T DistMap;
    12401239      static DistMap *createDistMap(const Digraph &) { return 0; };
    1241       DefDistMapBase(const TR &b) : TR(b) {}
     1240      SetDistMapBase(const TR &b) : TR(b) {}
    12421241    };
    12431242    ///\brief \ref named-templ-param "Named parameter"
     
    12471246    ///for setting \ref DistMap object.
    12481247    template<class T>
    1249     DijkstraWizard<DefDistMapBase<T> > distMap(const T &t)
     1248    DijkstraWizard<SetDistMapBase<T> > distMap(const T &t)
    12501249    {
    12511250      Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
    1252       return DijkstraWizard<DefDistMapBase<T> >(*this);
     1251      return DijkstraWizard<SetDistMapBase<T> >(*this);
    12531252    }
    12541253
Note: See TracChangeset for help on using the changeset viewer.