lemon-1.2: comparison lemon/core.h

equal deleted inserted replaced

-:a575e99f7891
+:0d1b228b5e4e
 /// }
 ///\endcode
 ///
 ///\sa findArc()
 ///\sa ArcLookUp, AllArcLookUp, DynArcLookUp
-template <typename _Graph>
+template <typename GR>
-class ConArcIt : public _Graph::Arc {
+class ConArcIt : public GR::Arc {
 public:
-typedef _Graph Graph;
+typedef GR Graph;
 typedef typename Graph::Arc Parent;
 typedef typename Graph::Arc Arc;
 typedef typename Graph::Node Node;
 ///   ...
 /// }
 ///\endcode
 ///
 ///\sa findEdge()
-template <typename _Graph>
+template <typename GR>
-class ConEdgeIt : public _Graph::Edge {
+class ConEdgeIt : public GR::Edge {
 public:
-typedef _Graph Graph;
+typedef GR Graph;
 typedef typename Graph::Edge Parent;
 typedef typename Graph::Edge Edge;
 typedef typename Graph::Node Node;
 ///of Sleator and Tarjan to guarantee the logarithmic amortized
 ///time bound for arc look-ups. This class also guarantees the
 ///optimal time bound in a constant factor for any distribution of
 ///queries.
 ///
-///\tparam G The type of the underlying digraph.
+///\tparam GR The type of the underlying digraph.
 ///
 ///\sa ArcLookUp
 ///\sa AllArcLookUp
-template<class G>
+template <typename GR>
 class DynArcLookUp
-: protected ItemSetTraits<G, typename G::Arc>::ItemNotifier::ObserverBase
+: protected ItemSetTraits<GR, typename GR::Arc>::ItemNotifier::ObserverBase
 {
 public:
-typedef typename ItemSetTraits<G, typename G::Arc>
+typedef typename ItemSetTraits<GR, typename GR::Arc>
 ::ItemNotifier::ObserverBase Parent;
-TEMPLATE_DIGRAPH_TYPEDEFS(G);
+TEMPLATE_DIGRAPH_TYPEDEFS(GR);
-typedef G Digraph;
+typedef GR Digraph;
 protected:
-class AutoNodeMap : public ItemSetTraits<G, Node>::template Map<Arc>::Type {
+class AutoNodeMap : public ItemSetTraits<GR, Node>::template Map<Arc>::Type {
 public:
-typedef typename ItemSetTraits<G, Node>::template Map<Arc>::Type Parent;
+typedef typename ItemSetTraits<GR, Node>::template Map<Arc>::Type Parent;
-AutoNodeMap(const G& digraph) : Parent(digraph, INVALID) {}
+AutoNodeMap(const GR& digraph) : Parent(digraph, INVALID) {}
 virtual void add(const Node& node) {
 Parent::add(node);
 Parent::set(node, INVALID);
 }
 ///\warning This class is static, so you should call refresh() (or at
 ///least refresh(Node)) to refresh this data structure whenever the
 ///digraph changes. This is a time consuming (superlinearly proportional
 ///(<em>O</em>(<em>m</em> log<em>m</em>)) to the number of arcs).
 ///
-///\tparam G The type of the underlying digraph.
+///\tparam GR The type of the underlying digraph.
 ///
 ///\sa DynArcLookUp
 ///\sa AllArcLookUp
-template<class G>
+template<class GR>
 class ArcLookUp
 {
 public:
-TEMPLATE_DIGRAPH_TYPEDEFS(G);
+TEMPLATE_DIGRAPH_TYPEDEFS(GR);
-typedef G Digraph;
+typedef GR Digraph;
 protected:
 const Digraph &_g;
 typename Digraph::template NodeMap<Arc> _head;
 typename Digraph::template ArcMap<Arc> _left;
 ///\warning This class is static, so you should call refresh() (or at
 ///least refresh(Node)) to refresh this data structure whenever the
 ///digraph changes. This is a time consuming (superlinearly proportional
 ///(<em>O</em>(<em>m</em> log<em>m</em>)) to the number of arcs).
 ///
-///\tparam G The type of the underlying digraph.
+///\tparam GR The type of the underlying digraph.
 ///
 ///\sa DynArcLookUp
 ///\sa ArcLookUp
-template<class G>
+template<class GR>
-class AllArcLookUp : public ArcLookUp<G>
+class AllArcLookUp : public ArcLookUp<GR>
 {
-using ArcLookUp<G>::_g;
+using ArcLookUp<GR>::_g;
-using ArcLookUp<G>::_right;
+using ArcLookUp<GR>::_right;
-using ArcLookUp<G>::_left;
+using ArcLookUp<GR>::_left;
-using ArcLookUp<G>::_head;
+using ArcLookUp<GR>::_head;
-TEMPLATE_DIGRAPH_TYPEDEFS(G);
+TEMPLATE_DIGRAPH_TYPEDEFS(GR);
-typedef G Digraph;
+typedef GR Digraph;
 typename Digraph::template ArcMap<Arc> _next;
 Arc refreshNext(Arc head,Arc next=INVALID)
 {
 ///Constructor.
 ///
 ///It builds up the search database, which remains valid until the digraph
 ///changes.
-AllArcLookUp(const Digraph &g) : ArcLookUp<G>(g), _next(g) {refreshNext();}
+AllArcLookUp(const Digraph &g) : ArcLookUp<GR>(g), _next(g) {refreshNext();}
 ///Refresh the data structure at a node.
 ///Build up the search database of node \c n.
 ///
 ///It runs in time <em>O</em>(<em>d</em> log<em>d</em>), where <em>d</em> is
 ///the number of the outgoing arcs of \c n.
 void refresh(Node n)
 {
-ArcLookUp<G>::refresh(n);
+ArcLookUp<GR>::refresh(n);
 refreshNext(_head[n]);
 }
 ///Refresh the full data structure.
 ///a single node \c n, then \ref refresh(Node) "refresh(n)" is enough.
 ///
 #ifdef DOXYGEN
 Arc operator()(Node s, Node t, Arc prev=INVALID) const {}
 #else
-using ArcLookUp<G>::operator() ;
+using ArcLookUp<GR>::operator() ;
 Arc operator()(Node s, Node t, Arc prev) const
 {
 return prev==INVALID?(*this)(s,t):_next[prev];
 }
 #endif

changeset 559	c5fd2d996909
parent 535	6a17a722b50e
child 581	aa1804409f29