LEMON/LEMON-main Changeset - r617:4137ef9aacc6

Repositories » LEMON » LEMON-main

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r617:4137ef9aacc6

« 616:f2d6d3

618:b95898 »

r617:4137ef9aacc6

Fri, 24 Apr 2009 11:54:48

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Fix and uniform the usage of Graph and Parent typedefs (#268) - Rename Graph typedefs to GraphType in the implementation of graph maps and MapExtender to prevent conflicts (especially using VS). They are not public. - Make Parent typedefs private in all classes. - Replace Digraph with Graph in some places (fix faulty renamings of the script). - Use Graph and Digraph typedefs (more) consequently.

0 19 0

default

19 files changed with 297 insertions and 276 deletions:

lemon/adaptors.h

lemon/bits/array_map.h

lemon/bits/base_extender.h

lemon/bits/default_map.h

lemon/bits/edge_set_extender.h

lemon/bits/graph_adaptor_extender.h

lemon/bits/graph_extender.h

lemon/bits/map_extender.h

lemon/bits/vector_map.h

lemon/concepts/graph_components.h

lemon/core.h

lemon/edge_set.h

lemon/full_graph.h

lemon/graph_to_eps.h

lemon/grid_graph.h

lemon/hypercube_graph.h

lemon/list_graph.h

lemon/maps.h

lemon/smart_graph.h

↑ Collapse diff ↑

lemon/adaptors.h

Show inline comments

@@ -111,9 +111,7 @@
 		    class NodeMap : public DGR::template NodeMap<V> {
 		      typedef typename DGR::template NodeMap<V> Parent;
 		    public:
 		      typedef typename DGR::template NodeMap<V> Parent;
 		      explicit NodeMap(const Adaptor& adaptor)
 		        : Parent(*adaptor._digraph) {}
 		      NodeMap(const Adaptor& adaptor, const V& value)
@@ -136,9 +134,7 @@
 		    class ArcMap : public DGR::template ArcMap<V> {
 		      typedef typename DGR::template ArcMap<V> Parent;
 		    public:
 		      typedef typename DGR::template ArcMap<V> Parent;
 		      explicit ArcMap(const DigraphAdaptorBase<DGR>& adaptor)
 		        : Parent(*adaptor._digraph) {}
 		      ArcMap(const DigraphAdaptorBase<DGR>& adaptor, const V& value)
@@ -257,4 +253,5 @@
 		    class NodeMap : public GR::template NodeMap<V> {
 		      typedef typename GR::template NodeMap<V> Parent;
 		    public:
 		      typedef typename GR::template NodeMap<V> Parent;
 		      explicit NodeMap(const GraphAdaptorBase<GR>& adapter)
@@ -279,4 +276,5 @@
 		    class ArcMap : public GR::template ArcMap<V> {
 		      typedef typename GR::template ArcMap<V> Parent;
 		    public:
 		      typedef typename GR::template ArcMap<V> Parent;
 		      explicit ArcMap(const GraphAdaptorBase<GR>& adapter)
@@ -300,4 +298,5 @@
 		    class EdgeMap : public GR::template EdgeMap<V> {
 		      typedef typename GR::template EdgeMap<V> Parent;
 		    public:
 		      typedef typename GR::template EdgeMap<V> Parent;
 		      explicit EdgeMap(const GraphAdaptorBase<GR>& adapter)
@@ -323,5 +322,5 @@
 		  class ReverseDigraphBase : public DigraphAdaptorBase<DGR> {
 		    typedef DigraphAdaptorBase<DGR> Parent;
 		  public:
 		    typedef DGR Digraph;
 		    typedef DigraphAdaptorBase<DGR> Parent;
 		  protected:
@@ -376,2 +375,3 @@
 		#endif
 		    typedef DigraphAdaptorExtender<ReverseDigraphBase<DGR> > Parent;
 		  public:
@@ -379,3 +379,2 @@
 		    typedef DGR Digraph;
 		    typedef DigraphAdaptorExtender<ReverseDigraphBase<DGR> > Parent;
 		  protected:
@@ -405,2 +404,3 @@
 		  class SubDigraphBase : public DigraphAdaptorBase<DGR> {
 		    typedef DigraphAdaptorBase<DGR> Parent;
 		  public:
@@ -411,3 +411,2 @@
 		    typedef SubDigraphBase Adaptor;
 		    typedef DigraphAdaptorBase<DGR> Parent;
 		  protected:
@@ -511,6 +510,7 @@
 			      LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> {
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
 			LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> Parent;
 		    public:
 		      typedef V Value;
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
 			    LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> Parent;
@@ -537,6 +537,7 @@
 			      LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> {
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
 		        LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> Parent;
 		    public:
 		      typedef V Value;
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
 		        LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> Parent;
@@ -564,2 +565,3 @@
 		    : public DigraphAdaptorBase<DGR> {
 		    typedef DigraphAdaptorBase<DGR> Parent;
 		  public:
@@ -570,3 +572,2 @@
 		    typedef SubDigraphBase Adaptor;
 		    typedef DigraphAdaptorBase<Digraph> Parent;
 		  protected:
@@ -652,6 +653,7 @@
 		          LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> {
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
 		        LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> Parent;
 		    public:
 		      typedef V Value;
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
 		        LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> Parent;
@@ -678,6 +680,7 @@
 		          LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> {
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
 		        LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> Parent;
 		    public:
 		      typedef V Value;
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
 		          LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> Parent;
@@ -865,2 +868,3 @@
 		  class SubGraphBase : public GraphAdaptorBase<GR> {
 		    typedef GraphAdaptorBase<GR> Parent;
 		  public:
@@ -871,3 +875,2 @@
 		    typedef SubGraphBase Adaptor;
 		    typedef GraphAdaptorBase<GR> Parent;
 		  protected:
@@ -1018,6 +1021,7 @@
 		          LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> {
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> Parent;
 		    public:
 		      typedef V Value;
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> Parent;
@@ -1044,6 +1048,7 @@
 		          LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> {
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> Parent;
 		    public:
 		      typedef V Value;
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> Parent;
@@ -1070,6 +1075,7 @@
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> {
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> Parent;
 		    public:
 		      typedef V Value;
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> Parent;
@@ -1098,2 +1104,3 @@
 		    : public GraphAdaptorBase<GR> {
 		    typedef GraphAdaptorBase<GR> Parent;
 		  public:
@@ -1104,3 +1111,2 @@
 		    typedef SubGraphBase Adaptor;
 		    typedef GraphAdaptorBase<GR> Parent;
 		  protected:
@@ -1213,6 +1219,7 @@
 		          LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> {
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> Parent;
 		    public:
 		      typedef V Value;
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> Parent;
@@ -1239,6 +1246,7 @@
 		          LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> {
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> Parent;
 		    public:
 		      typedef V Value;
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> Parent;
@@ -1265,6 +1273,7 @@
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> {
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 			LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> Parent;
 		    public:
 		      typedef V Value;
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 				  LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> Parent;
@@ -1487,7 +1496,2 @@
 		#endif
 		  public:
 		    typedef GR Digraph;
 		    typedef NF NodeFilterMap;
 		    typedef DigraphAdaptorExtender<
@@ -1496,2 +1500,7 @@
 		  public:
 		    typedef GR Digraph;
 		    typedef NF NodeFilterMap;
 		    typedef typename Parent::Node Node;
@@ -1550,5 +1559,2 @@
 		  public:
 		    typedef GR Graph;
 		    typedef NF NodeFilterMap;
 		    typedef GraphAdaptorExtender<
@@ -1557,3 +1563,9 @@
 		  public:
 		    typedef GR Graph;
 		    typedef NF NodeFilterMap;
 		    typedef typename Parent::Node Node;
 		  protected:
@@ -1631,3 +1643,8 @@
 		#endif
 		    typedef DigraphAdaptorExtender<
 		      SubDigraphBase<DGR, ConstMap<typename DGR::Node, Const<bool, true> >,
 		                     AF, false> > Parent;
 		  public:
 		    /// The type of the adapted digraph.
@@ -1637,6 +1654,2 @@
 		    typedef DigraphAdaptorExtender<
 		      SubDigraphBase<DGR, ConstMap<typename DGR::Node, Const<bool, true> >,
 		                     AF, false> > Parent;
 		    typedef typename Parent::Arc Arc;
@@ -1740,3 +1753,8 @@
 		#endif
 		    typedef GraphAdaptorExtender<
 		      SubGraphBase<GR, ConstMap<typename GR::Node, Const<bool, true > >,
 		                   EF, false> > Parent;
 		  public:
 		    /// The type of the adapted graph.
@@ -1746,6 +1764,2 @@
 		    typedef GraphAdaptorExtender<
 		      SubGraphBase<GR, ConstMap<typename GR::Node, Const<bool, true > >,
 		                   EF, false> > Parent;
 		    typedef typename Parent::Edge Edge;
@@ -2113,6 +2127,6 @@
 		    class NodeMap : public DGR::template NodeMap<V> {
 		      typedef typename DGR::template NodeMap<V> Parent;
 		    public:
 		      typedef V Value;
 		      typedef typename DGR::template NodeMap<Value> Parent;
@@ -2139,7 +2153,7 @@
 		    class ArcMap
 		      : public SubMapExtender<UndirectorBase<DGR>, ArcMapBase<V> >
+		    {
 		      : public SubMapExtender<UndirectorBase<DGR>, ArcMapBase<V> > {
 		      typedef SubMapExtender<UndirectorBase<DGR>, ArcMapBase<V> > Parent;
 		    public:
 		      typedef V Value;
 		      typedef SubMapExtender<Adaptor, ArcMapBase<V> > Parent;
@@ -2165,6 +2179,6 @@
 		    class EdgeMap : public Digraph::template ArcMap<V> {
 		      typedef typename Digraph::template ArcMap<V> Parent;
 		    public:
 		      typedef V Value;
 		      typedef typename Digraph::template ArcMap<V> Parent;
@@ -2240,2 +2254,3 @@
 		#endif
 		    typedef GraphAdaptorExtender<UndirectorBase<DGR> > Parent;
 		  public:
@@ -2243,3 +2258,2 @@
 		    typedef DGR Digraph;
 		    typedef GraphAdaptorExtender<UndirectorBase<DGR> > Parent;
 		  protected:
@@ -2451,6 +2465,6 @@
 		    class NodeMap : public GR::template NodeMap<V> {
 		      typedef typename GR::template NodeMap<V> Parent;
 		    public:
 		      typedef typename GR::template NodeMap<V> Parent;
 		      explicit NodeMap(const OrienterBase<GR, DM>& adapter)
@@ -2476,6 +2490,6 @@
 		    class ArcMap : public GR::template EdgeMap<V> {
 		      typedef typename Graph::template EdgeMap<V> Parent;
 		    public:
 		      typedef typename Graph::template EdgeMap<V> Parent;
 		      explicit ArcMap(const OrienterBase<GR, DM>& adapter)
@@ -2548,2 +2562,3 @@
 		#endif
 		    typedef DigraphAdaptorExtender<OrienterBase<GR, DM> > Parent;
 		  public:
@@ -2555,6 +2570,7 @@
 		    typedef DigraphAdaptorExtender<OrienterBase<GR, DM> > Parent;
 		    typedef typename Parent::Arc Arc;
 		  protected:
 		    Orienter() { }
 		  public:
@@ -2868,2 +2884,4 @@
 		  class SplitNodesBase {
 		    typedef DigraphAdaptorBase<const DGR> Parent;
 		  public:
@@ -2871,3 +2889,2 @@
 		    typedef DGR Digraph;
 		    typedef DigraphAdaptorBase<const DGR> Parent;
 		    typedef SplitNodesBase Adaptor;
@@ -3230,7 +3247,7 @@
 		    class NodeMap
 		      : public SubMapExtender<SplitNodesBase<DGR>, NodeMapBase<V> >
+		    {
 		      : public SubMapExtender<SplitNodesBase<DGR>, NodeMapBase<V> > {
 		      typedef SubMapExtender<SplitNodesBase<DGR>, NodeMapBase<V> > Parent;
 		    public:
 		      typedef V Value;
 		      typedef SubMapExtender<SplitNodesBase<DGR>, NodeMapBase<Value> > Parent;
@@ -3256,7 +3273,7 @@
 		    class ArcMap
 		      : public SubMapExtender<SplitNodesBase<DGR>, ArcMapBase<V> >
+		    {
 		      : public SubMapExtender<SplitNodesBase<DGR>, ArcMapBase<V> > {
 		      typedef SubMapExtender<SplitNodesBase<DGR>, ArcMapBase<V> > Parent;
 		    public:
 		      typedef V Value;
 		      typedef SubMapExtender<SplitNodesBase<DGR>, ArcMapBase<Value> > Parent;
@@ -3326,5 +3343,6 @@
 		#endif
 		    typedef DigraphAdaptorExtender<SplitNodesBase<const DGR> > Parent;
 		  public:
 		    typedef DGR Digraph;
 		    typedef DigraphAdaptorExtender<SplitNodesBase<const DGR> > Parent;

lemon/bits/array_map.h

Show inline comments

@@ -49,3 +49,3 @@
 		    // The graph type.
-		    typedef _Graph Graph;
+		    typedef _Graph GraphType;
 		    // The item type.
@@ -65,2 +65,5 @@
 		    // The map type.
 		    typedef ArrayMap Map;
 		    // The notifier type.
@@ -68,2 +71,4 @@
 		  private:
 		    // The MapBase of the Map which imlements the core regisitry function.
@@ -71,3 +76,2 @@
 		  private:
 		    typedef std::allocator<Value> Allocator;
@@ -79,3 +83,3 @@
 		    // Graph initialized map constructor.
-		    explicit ArrayMap(const Graph& graph) {
+		    explicit ArrayMap(const GraphType& graph) {
 		      Parent::attach(graph.notifier(Item()));
@@ -93,3 +97,3 @@
 		    // It constructs a map and initialize all of the the map.
-		    ArrayMap(const Graph& graph, const Value& value) {
+		    ArrayMap(const GraphType& graph, const Value& value) {
 		      Parent::attach(graph.notifier(Item()));

lemon/bits/base_extender.h

Show inline comments

@@ -40,2 +40,3 @@
 		  class UndirDigraphExtender : public Base {
 		    typedef Base Parent;
@@ -43,3 +44,2 @@
 		    typedef Base Parent;
 		    typedef typename Parent::Arc Edge;
@@ -282,4 +282,5 @@
 		  class BidirBpGraphExtender : public Base {
 		    typedef Base Parent;
 		  public:
 		    typedef Base Parent;
 		    typedef BidirBpGraphExtender Digraph;

lemon/bits/default_map.h

Show inline comments

@@ -155,11 +155,12 @@
 		    : public DefaultMapSelector<_Graph, _Item, _Value>::Map {
 		    typedef typename DefaultMapSelector<_Graph, _Item, _Value>::Map Parent;
 		  public:
 		    typedef typename DefaultMapSelector<_Graph, _Item, _Value>::Map Parent;
 		    typedef DefaultMap<_Graph, _Item, _Value> Map;
-		    typedef typename Parent::Graph Graph;
+		    typedef typename Parent::GraphType GraphType;
 		    typedef typename Parent::Value Value;
 		    explicit DefaultMap(const Graph& graph) : Parent(graph) {}
 		    DefaultMap(const Graph& graph, const Value& value)
 		    explicit DefaultMap(const GraphType& graph) : Parent(graph) {}
 		    DefaultMap(const GraphType& graph, const Value& value)
 		      : Parent(graph, value) {}

lemon/bits/edge_set_extender.h

Show inline comments

@@ -36,5 +36,6 @@
 		  class ArcSetExtender : public Base {
 		    typedef Base Parent;
 		  public:
 		    typedef Base Parent;
 		    typedef ArcSetExtender Digraph;
@@ -220,6 +221,5 @@
 		      : public MapExtender<DefaultMap<Digraph, Arc, _Value> > {
 		    public:
 		      typedef ArcSetExtender Digraph;
 		      typedef MapExtender<DefaultMap<Digraph, Arc, _Value> > Parent;
 		    public:
 		      explicit ArcMap(const Digraph& _g)
@@ -276,2 +276,3 @@
 		  class EdgeSetExtender : public Base {
 		    typedef Base Parent;
@@ -279,4 +280,3 @@
 		    typedef Base Parent;
 		    typedef EdgeSetExtender Digraph;
 		    typedef EdgeSetExtender Graph;
@@ -286,3 +286,2 @@
 		    int maxId(Node) const {
@@ -352,3 +351,3 @@
 		    class NodeIt : public Node {
-		      const Digraph* digraph;
+		      const Graph* graph;
 		    public:
@@ -359,3 +358,3 @@
-		      explicit NodeIt(const Digraph& _graph) : digraph(&_graph) {
+		      explicit NodeIt(const Graph& _graph) : graph(&_graph) {
 			_graph.first(static_cast<Node&>(*this));
@@ -363,7 +362,7 @@
 		      NodeIt(const Digraph& _graph, const Node& node)
 			: Node(node), digraph(&_graph) {}
 		      NodeIt(const Graph& _graph, const Node& node)
 			: Node(node), graph(&_graph) {}
 		      NodeIt& operator++() {
-			digraph->next(*this);
+			graph->next(*this);
 			return *this;
@@ -375,3 +374,3 @@
 		    class ArcIt : public Arc {
-		      const Digraph* digraph;
+		      const Graph* graph;
 		    public:
@@ -382,3 +381,3 @@
-		      explicit ArcIt(const Digraph& _graph) : digraph(&_graph) {
+		      explicit ArcIt(const Graph& _graph) : graph(&_graph) {
 			_graph.first(static_cast<Arc&>(*this));
@@ -386,7 +385,7 @@
 		      ArcIt(const Digraph& _graph, const Arc& e) :
 			Arc(e), digraph(&_graph) { }
 		      ArcIt(const Graph& _graph, const Arc& e) :
 			Arc(e), graph(&_graph) { }
 		      ArcIt& operator++() {
-			digraph->next(*this);
+			graph->next(*this);
 			return *this;
@@ -398,3 +397,3 @@
 		    class OutArcIt : public Arc {
-		      const Digraph* digraph;
+		      const Graph* graph;
 		    public:
@@ -405,4 +404,4 @@
 		      OutArcIt(const Digraph& _graph, const Node& node)
 			: digraph(&_graph) {
 		      OutArcIt(const Graph& _graph, const Node& node)
 			: graph(&_graph) {
 			_graph.firstOut(*this, node);
@@ -410,7 +409,7 @@
 		      OutArcIt(const Digraph& _graph, const Arc& arc)
 			: Arc(arc), digraph(&_graph) {}
 		      OutArcIt(const Graph& _graph, const Arc& arc)
 			: Arc(arc), graph(&_graph) {}
 		      OutArcIt& operator++() {
-			digraph->nextOut(*this);
+			graph->nextOut(*this);
 			return *this;
@@ -422,3 +421,3 @@
 		    class InArcIt : public Arc {
-		      const Digraph* digraph;
+		      const Graph* graph;
 		    public:
@@ -429,4 +428,4 @@
 		      InArcIt(const Digraph& _graph, const Node& node)
 			: digraph(&_graph) {
 		      InArcIt(const Graph& _graph, const Node& node)
 			: graph(&_graph) {
 			_graph.firstIn(*this, node);
@@ -434,7 +433,7 @@
 		      InArcIt(const Digraph& _graph, const Arc& arc) :
 			Arc(arc), digraph(&_graph) {}
 		      InArcIt(const Graph& _graph, const Arc& arc) :
 			Arc(arc), graph(&_graph) {}
 		      InArcIt& operator++() {
-			digraph->nextIn(*this);
+			graph->nextIn(*this);
 			return *this;
@@ -446,3 +445,3 @@
 		    class EdgeIt : public Parent::Edge {
-		      const Digraph* digraph;
+		      const Graph* graph;
 		    public:
@@ -453,3 +452,3 @@
-		      explicit EdgeIt(const Digraph& _graph) : digraph(&_graph) {
+		      explicit EdgeIt(const Graph& _graph) : graph(&_graph) {
 			_graph.first(static_cast<Edge&>(*this));
@@ -457,7 +456,7 @@
 		      EdgeIt(const Digraph& _graph, const Edge& e) :
 			Edge(e), digraph(&_graph) { }
 		      EdgeIt(const Graph& _graph, const Edge& e) :
 			Edge(e), graph(&_graph) { }
 		      EdgeIt& operator++() {
-			digraph->next(*this);
+			graph->next(*this);
 			return *this;
@@ -469,3 +468,3 @@
 		      friend class EdgeSetExtender;
-		      const Digraph* digraph;
+		      const Graph* graph;
 		      bool direction;
@@ -477,3 +476,3 @@
-		      IncEdgeIt(const Digraph& _graph, const Node &n) : digraph(&_graph) {
+		      IncEdgeIt(const Graph& _graph, const Node &n) : graph(&_graph) {
 			_graph.firstInc(*this, direction, n);
@@ -481,4 +480,4 @@
 		      IncEdgeIt(const Digraph& _graph, const Edge &ue, const Node &n)
 			: digraph(&_graph), Edge(ue) {
 		      IncEdgeIt(const Graph& _graph, const Edge &ue, const Node &n)
 			: graph(&_graph), Edge(ue) {
 			direction = (_graph.source(ue) == n);
@@ -487,3 +486,3 @@
 		      IncEdgeIt& operator++() {
-			digraph->nextInc(*this, direction);
+			graph->nextInc(*this, direction);
 			return *this;
@@ -536,10 +535,9 @@
 		    class ArcMap
-		      : public MapExtender<DefaultMap<Digraph, Arc, _Value> > {
+		      : public MapExtender<DefaultMap<Graph, Arc, _Value> > {
 		      typedef MapExtender<DefaultMap<Graph, Arc, _Value> > Parent;
 		    public:
 		      typedef EdgeSetExtender Digraph;
 		      typedef MapExtender<DefaultMap<Digraph, Arc, _Value> > Parent;
 		      ArcMap(const Digraph& _g)
 		      ArcMap(const Graph& _g)
 			: Parent(_g) {}
-		      ArcMap(const Digraph& _g, const _Value& _v)
+		      ArcMap(const Graph& _g, const _Value& _v)
 			: Parent(_g, _v) {}
@@ -561,11 +559,10 @@
 		    class EdgeMap
-		      : public MapExtender<DefaultMap<Digraph, Edge, _Value> > {
+		      : public MapExtender<DefaultMap<Graph, Edge, _Value> > {
 		      typedef MapExtender<DefaultMap<Graph, Edge, _Value> > Parent;
 		    public:
 		      typedef EdgeSetExtender Digraph;
 		      typedef MapExtender<DefaultMap<Digraph, Edge, _Value> > Parent;
 		      EdgeMap(const Digraph& _g)
 		      EdgeMap(const Graph& _g)
 			: Parent(_g) {}
-		      EdgeMap(const Digraph& _g, const _Value& _v)
+		      EdgeMap(const Graph& _g, const _Value& _v)
 			: Parent(_g, _v) {}

lemon/bits/graph_adaptor_extender.h

Show inline comments

@@ -28,5 +28,6 @@
 		  class DigraphAdaptorExtender : public _Digraph {
 		    typedef _Digraph Parent;
 		  public:
 		    typedef _Digraph Parent;
 		    typedef _Digraph Digraph;
@@ -175,5 +176,6 @@
 		  class GraphAdaptorExtender : public _Graph {
 		    typedef _Graph Parent;
 		  public:
 		    typedef _Graph Parent;
 		    typedef _Graph Graph;

lemon/bits/graph_extender.h

Show inline comments

@@ -39,5 +39,6 @@
 		  class DigraphExtender : public Base {
 		    typedef Base Parent;
 		  public:
 		    typedef Base Parent;
 		    typedef DigraphExtender Digraph;
@@ -220,6 +221,5 @@
 		      : public MapExtender<DefaultMap<Digraph, Node, _Value> > {
 		    public:
 		      typedef DigraphExtender Digraph;
 		      typedef MapExtender<DefaultMap<Digraph, Node, _Value> > Parent;
 		    public:
 		      explicit NodeMap(const Digraph& digraph)
@@ -245,6 +245,5 @@
 		      : public MapExtender<DefaultMap<Digraph, Arc, _Value> > {
 		    public:
 		      typedef DigraphExtender Digraph;
 		      typedef MapExtender<DefaultMap<Digraph, Arc, _Value> > Parent;
 		    public:
 		      explicit ArcMap(const Digraph& digraph)
@@ -332,5 +331,6 @@
 		  class GraphExtender : public Base {
 		    typedef Base Parent;
 		  public:
 		    typedef Base Parent;
 		    typedef GraphExtender Graph;
@@ -603,6 +603,5 @@
 		      : public MapExtender<DefaultMap<Graph, Node, _Value> > {
 		    public:
 		      typedef GraphExtender Graph;
 		      typedef MapExtender<DefaultMap<Graph, Node, _Value> > Parent;
 		    public:
 		      NodeMap(const Graph& graph)
@@ -628,6 +627,5 @@
 		      : public MapExtender<DefaultMap<Graph, Arc, _Value> > {
 		    public:
 		      typedef GraphExtender Graph;
 		      typedef MapExtender<DefaultMap<Graph, Arc, _Value> > Parent;
 		    public:
 		      ArcMap(const Graph& graph)
@@ -653,6 +651,5 @@
 		      : public MapExtender<DefaultMap<Graph, Edge, _Value> > {
 		    public:
 		      typedef GraphExtender Graph;
 		      typedef MapExtender<DefaultMap<Graph, Edge, _Value> > Parent;
 		    public:
 		      EdgeMap(const Graph& graph)

lemon/bits/map_extender.h

Show inline comments

@@ -38,9 +38,8 @@
 		  class MapExtender : public _Map {
 		    typedef _Map Parent;
 		    typedef typename Parent::GraphType GraphType;
 		  public:
 		    typedef _Map Parent;
 		    typedef MapExtender Map;
 		    typedef typename Parent::Graph Graph;
 		    typedef typename Parent::Key Item;
@@ -60,6 +59,6 @@
-		    MapExtender(const Graph& graph)
+		    MapExtender(const GraphType& graph)
 		      : Parent(graph) {}
-		    MapExtender(const Graph& graph, const Value& value)
+		    MapExtender(const GraphType& graph, const Value& value)
 		      : Parent(graph, value) {}
@@ -79,5 +78,6 @@
 		    class MapIt : public Item {
 		      typedef Item Parent;
 		    public:
 		      typedef Item Parent;
 		      typedef typename Map::Value Value;
@@ -118,6 +118,6 @@
 		    class ConstMapIt : public Item {
 		      typedef Item Parent;
 		    public:
 		      typedef Item Parent;
 		      typedef typename Map::Value Value;
@@ -149,6 +149,6 @@
 		    class ItemIt : public Item {
 		      typedef Item Parent;
 		    public:
 		      typedef Item Parent;
 		      ItemIt() {}
@@ -180,9 +180,8 @@
 		  class SubMapExtender : public _Map {
 		    typedef _Map Parent;
 		    typedef _Graph GraphType;
 		  public:
 		    typedef _Map Parent;
 		    typedef SubMapExtender Map;
 		    typedef _Graph Graph;
 		    typedef typename Parent::Key Item;
@@ -202,6 +201,6 @@
-		    SubMapExtender(const Graph& _graph)
+		    SubMapExtender(const GraphType& _graph)
 		      : Parent(_graph), graph(_graph) {}
-		    SubMapExtender(const Graph& _graph, const Value& _value)
+		    SubMapExtender(const GraphType& _graph, const Value& _value)
 		      : Parent(_graph, _value), graph(_graph) {}
@@ -225,5 +224,5 @@
 		    class MapIt : public Item {
 		      typedef Item Parent;
 		    public:
 		      typedef Item Parent;
 		      typedef typename Map::Value Value;
@@ -264,6 +263,6 @@
 		    class ConstMapIt : public Item {
 		      typedef Item Parent;
 		    public:
 		      typedef Item Parent;
 		      typedef typename Map::Value Value;
@@ -295,6 +294,6 @@
 		    class ItemIt : public Item {
 		      typedef Item Parent;
 		    public:
 		      typedef Item Parent;
 		      ItemIt() {}
@@ -322,3 +321,3 @@
-		    const Graph& graph;
+		    const GraphType& graph;

lemon/bits/vector_map.h

Show inline comments

@@ -58,3 +58,3 @@
 		    // The graph type of the map.
-		    typedef _Graph Graph;
+		    typedef _Graph GraphType;
 		    // The item type of the map.
@@ -74,4 +74,2 @@
 		    typedef VectorMap Map;
 		    // The base class of the map.
 		    typedef typename Notifier::ObserverBase Parent;
@@ -82,2 +80,8 @@
 		  private:
 		    // The base class of the map.
 		    typedef typename Notifier::ObserverBase Parent;
 		  public:
@@ -87,3 +91,3 @@
 		    // It adds all the items of the graph to the map.
-		    VectorMap(const Graph& graph) {
+		    VectorMap(const GraphType& graph) {
 		      Parent::attach(graph.notifier(Item()));
@@ -96,3 +100,3 @@
 		    // It adds all the items of the graph to the map.
-		    VectorMap(const Graph& graph, const Value& value) {
+		    VectorMap(const GraphType& graph, const Value& value) {
 		      Parent::attach(graph.notifier(Item()));

lemon/concepts/graph_components.h

Show inline comments

@@ -182,2 +182,5 @@
 		    public:
 		      typedef BaseGraphComponent Graph;
 		      typedef BaseDigraphComponent::Node Node;
@@ -191,5 +194,5 @@
 		      class Edge : public GraphItem<'e'> {
 		      public:
 		        typedef GraphItem<'e'> Parent;
 		      public:
 		        /// \brief Default constructor.
@@ -993,8 +996,6 @@
 		    class GraphMap : public ReferenceMap<K, V, V&, const V&> {
 		      typedef ReferenceMap<K, V, V&, const V&> Parent;
 		    public:
 		      typedef ReadWriteMap<K, V> Parent;
 		      /// The graph type of the map.
 		      typedef GR Graph;
 		      /// The key type of the map.
@@ -1014,3 +1015,3 @@
 		      /// Construct a new map for the graph.
-		      explicit GraphMap(const Graph&) {}
+		      explicit GraphMap(const GR&) {}
 		      /// \brief Construct a new map with default value.
@@ -1018,3 +1019,3 @@
 		      /// Construct a new map for the graph and initalize the values.
-		      GraphMap(const Graph&, const Value&) {}
+		      GraphMap(const GR&, const Value&) {}
@@ -1059,3 +1060,3 @@
 		        const _Map &m;
-		        const Graph &g;
+		        const GR &g;
 		        const typename GraphMap::Value &t;
@@ -1087,5 +1088,5 @@
 		      class NodeMap : public GraphMap<MappableDigraphComponent, Node, V> {
 		      public:
 		        typedef GraphMap<MappableDigraphComponent, Node, V> Parent;
 		      public:
 		        /// \brief Construct a new map.
@@ -1125,5 +1126,5 @@
 		      class ArcMap : public GraphMap<MappableDigraphComponent, Arc, V> {
 		      public:
 		        typedef GraphMap<MappableDigraphComponent, Arc, V> Parent;
 		      public:
 		        /// \brief Construct a new map.
@@ -1223,5 +1224,5 @@
 		      class EdgeMap : public GraphMap<MappableGraphComponent, Edge, V> {
 		      public:
 		        typedef GraphMap<MappableGraphComponent, Edge, V> Parent;
 		      public:
 		        /// \brief Construct a new map.

lemon/core.h

Show inline comments

@@ -1038,9 +1038,8 @@
 		  class ConArcIt : public GR::Arc {
 		    typedef typename GR::Arc Parent;
 		  public:
 		    typedef GR Graph;
 		    typedef typename Graph::Arc Parent;
 		    typedef typename Graph::Arc Arc;
-		    typedef typename Graph::Node Node;
+		    typedef typename GR::Arc Arc;
 		    typedef typename GR::Node Node;
@@ -1050,3 +1049,3 @@
 		    /// connects nodes \c u and \c v.
-		    ConArcIt(const Graph& g, Node u, Node v) : _graph(g) {
+		    ConArcIt(const GR& g, Node u, Node v) : _graph(g) {
 		      Parent::operator=(findArc(_graph, u, v));
@@ -1057,3 +1056,3 @@
 		    /// Construct a new ConArcIt that continues the iterating from arc \c a.
-		    ConArcIt(const Graph& g, Arc a) : Parent(a), _graph(g) {}
+		    ConArcIt(const GR& g, Arc a) : Parent(a), _graph(g) {}
@@ -1068,3 +1067,3 @@
 		  private:
-		    const Graph& _graph;
+		    const GR& _graph;
 		  };
@@ -1161,9 +1160,8 @@
 		  class ConEdgeIt : public GR::Edge {
 		    typedef typename GR::Edge Parent;
 		  public:
 		    typedef GR Graph;
 		    typedef typename Graph::Edge Parent;
 		    typedef typename Graph::Edge Edge;
-		    typedef typename Graph::Node Node;
+		    typedef typename GR::Edge Edge;
 		    typedef typename GR::Node Node;
@@ -1173,3 +1171,3 @@
 		    /// connects nodes \c u and \c v.
-		    ConEdgeIt(const Graph& g, Node u, Node v) : _graph(g), _u(u), _v(v) {
+		    ConEdgeIt(const GR& g, Node u, Node v) : _graph(g), _u(u), _v(v) {
 		      Parent::operator=(findEdge(_graph, _u, _v));
@@ -1180,3 +1178,3 @@
 		    /// Construct a new ConEdgeIt that continues iterating from edge \c e.
-		    ConEdgeIt(const Graph& g, Edge e) : Parent(e), _graph(g) {}
+		    ConEdgeIt(const GR& g, Edge e) : Parent(e), _graph(g) {}
@@ -1190,3 +1188,3 @@
 		  private:
-		    const Graph& _graph;
+		    const GR& _graph;
 		    Node _u, _v;
@@ -1221,3 +1219,2 @@
+		  {
 		  public:
 		    typedef typename ItemSetTraits<GR, typename GR::Arc>
@@ -1226,2 +1223,6 @@
 		    TEMPLATE_DIGRAPH_TYPEDEFS(GR);
 		  public:
 		    /// The Digraph type
 		    typedef GR Digraph;
@@ -1231,6 +1232,6 @@
 		    class AutoNodeMap : public ItemSetTraits<GR, Node>::template Map<Arc>::Type {
 		      typedef typename ItemSetTraits<GR, Node>::template Map<Arc>::Type Parent;
 		    public:
 		      typedef typename ItemSetTraits<GR, Node>::template Map<Arc>::Type Parent;
 		      AutoNodeMap(const GR& digraph) : Parent(digraph, INVALID) {}
@@ -1259,8 +1260,2 @@
 		    const Digraph &_g;
 		    AutoNodeMap _head;
 		    typename Digraph::template ArcMap<Arc> _parent;
 		    typename Digraph::template ArcMap<Arc> _left;
 		    typename Digraph::template ArcMap<Arc> _right;
 		    class ArcLess {
@@ -1275,2 +1270,10 @@
 		  protected:
 		    const Digraph &_g;
 		    AutoNodeMap _head;
 		    typename Digraph::template ArcMap<Arc> _parent;
 		    typename Digraph::template ArcMap<Arc> _left;
 		    typename Digraph::template ArcMap<Arc> _right;
 		  public:
@@ -1632,4 +1635,7 @@
+		  {
 		    TEMPLATE_DIGRAPH_TYPEDEFS(GR);
 		  public:
-		    TEMPLATE_DIGRAPH_TYPEDEFS(GR);
 		    /// The Digraph type
 		    typedef GR Digraph;
@@ -1748,5 +1754,4 @@
 		    TEMPLATE_DIGRAPH_TYPEDEFS(GR);
 		    typedef GR Digraph;
-		    typename Digraph::template ArcMap<Arc> _next;
+		    typename GR::template ArcMap<Arc> _next;
@@ -1769,2 +1774,6 @@
 		  public:
 		    /// The Digraph type
 		    typedef GR Digraph;
 		    ///Constructor

lemon/edge_set.h

Show inline comments

@@ -35,3 +35,2 @@
 		    typedef GR Graph;
 		    typedef typename GR::Node Node;
@@ -210,6 +209,6 @@
 		    class NodeMap : public GR::template NodeMap<V> {
 		      typedef typename GR::template NodeMap<V> Parent;
 		    public:
 		      typedef typename GR::template NodeMap<V> Parent;
 		      explicit NodeMap(const ListArcSetBase<GR>& arcset)
@@ -261,2 +260,3 @@
 		  class ListArcSet : public ArcSetExtender<ListArcSetBase<GR> > {
 		    typedef ArcSetExtender<ListArcSetBase<GR> > Parent;
@@ -264,4 +264,2 @@
 		    typedef ArcSetExtender<ListArcSetBase<GR> > Parent;
 		    typedef typename Parent::Node Node;
@@ -269,5 +267,2 @@
 		    typedef GR Graph;
 		    typedef typename Parent::NodesImplBase NodesImplBase;
@@ -294,5 +289,5 @@
 		    class NodesImpl : public NodesImplBase {
 		    public:
 		      typedef NodesImplBase Parent;
 		    public:
 		      NodesImpl(const GR& graph, ListArcSet& arcset)
@@ -356,3 +351,2 @@
 		    typedef GR Graph;
 		    typedef typename GR::Node Node;
@@ -639,6 +633,6 @@
 		    class NodeMap : public GR::template NodeMap<V> {
 		      typedef typename GR::template NodeMap<V> Parent;
 		    public:
 		      typedef typename GR::template NodeMap<V> Parent;
 		      explicit NodeMap(const ListEdgeSetBase<GR>& arcset)
@@ -690,2 +684,3 @@
 		  class ListEdgeSet : public EdgeSetExtender<ListEdgeSetBase<GR> > {
 		    typedef EdgeSetExtender<ListEdgeSetBase<GR> > Parent;
@@ -693,4 +688,2 @@
 		    typedef EdgeSetExtender<ListEdgeSetBase<GR> > Parent;
 		    typedef typename Parent::Node Node;
@@ -699,5 +692,2 @@
 		    typedef GR Graph;
 		    typedef typename Parent::NodesImplBase NodesImplBase;
@@ -719,5 +709,5 @@
 		    class NodesImpl : public NodesImplBase {
 		    public:
 		      typedef NodesImplBase Parent;
 		    public:
 		      NodesImpl(const GR& graph, ListEdgeSet& arcset)
@@ -781,5 +771,4 @@
 		    typedef GR Graph;
 		    typedef typename Graph::Node Node;
-		    typedef typename Graph::NodeIt NodeIt;
+		    typedef typename GR::Node Node;
 		    typedef typename GR::NodeIt NodeIt;
@@ -902,6 +891,6 @@
 		    class NodeMap : public GR::template NodeMap<V> {
 		      typedef typename GR::template NodeMap<V> Parent;
 		    public:
 		      typedef typename GR::template NodeMap<V> Parent;
 		      explicit NodeMap(const SmartArcSetBase<GR>& arcset)
@@ -958,2 +947,3 @@
 		  class SmartArcSet : public ArcSetExtender<SmartArcSetBase<GR> > {
 		    typedef ArcSetExtender<SmartArcSetBase<GR> > Parent;
@@ -961,4 +951,2 @@
 		    typedef ArcSetExtender<SmartArcSetBase<GR> > Parent;
 		    typedef typename Parent::Node Node;
@@ -966,4 +954,2 @@
 		    typedef GR Graph;
 		  protected:
@@ -985,5 +971,5 @@
 		    class NodesImpl : public NodesImplBase {
 		    public:
 		      typedef NodesImplBase Parent;
 		    public:
 		      NodesImpl(const GR& graph, SmartArcSet& arcset)
@@ -1064,3 +1050,2 @@
 		    typedef GR Graph;
 		    typedef typename GR::Node Node;
@@ -1251,6 +1236,6 @@
 		    class NodeMap : public GR::template NodeMap<V> {
 		      typedef typename GR::template NodeMap<V> Parent;
 		    public:
 		      typedef typename GR::template NodeMap<V> Parent;
 		      explicit NodeMap(const SmartEdgeSetBase<GR>& arcset)
@@ -1306,2 +1291,3 @@
 		  class SmartEdgeSet : public EdgeSetExtender<SmartEdgeSetBase<GR> > {
 		    typedef EdgeSetExtender<SmartEdgeSetBase<GR> > Parent;
@@ -1309,4 +1295,2 @@
 		    typedef EdgeSetExtender<SmartEdgeSetBase<GR> > Parent;
 		    typedef typename Parent::Node Node;
@@ -1315,4 +1299,2 @@
 		    typedef GR Graph;
 		  protected:
@@ -1333,5 +1315,5 @@
 		    class NodesImpl : public NodesImplBase {
 		    public:
 		      typedef NodesImplBase Parent;
 		    public:
 		      NodesImpl(const GR& graph, SmartEdgeSet& arcset)

lemon/full_graph.h

Show inline comments

@@ -33,3 +33,3 @@
-		    typedef FullDigraphBase Graph;
+		    typedef FullDigraphBase Digraph;
@@ -171,6 +171,6 @@
 		  class FullDigraph : public ExtendedFullDigraphBase {
 		    typedef ExtendedFullDigraphBase Parent;
 		  public:
 		    typedef ExtendedFullDigraphBase Parent;
 		    /// \brief Constructor
@@ -228,4 +228,2 @@
 		  class FullGraphBase {
 		    int _node_num;
 		    int _edge_num;
 		  public:
@@ -240,2 +238,5 @@
 		    int _node_num;
 		    int _edge_num;
 		    FullGraphBase() {}
@@ -539,6 +540,6 @@
 		  class FullGraph : public ExtendedFullGraphBase {
 		    typedef ExtendedFullGraphBase Parent;
 		  public:
 		    typedef ExtendedFullGraphBase Parent;
 		    /// \brief Constructor

lemon/graph_to_eps.h

Show inline comments

@@ -71,2 +71,3 @@
 		  typedef GR Graph;
 		  typedef GR Digraph;
 		  typedef typename Graph::Node Node;
@@ -243,2 +244,3 @@
 		  typedef typename T::Graph Graph;
 		  typedef typename T::Digraph Digraph;
 		  typedef typename Graph::Node Node;

lemon/grid_graph.h

Show inline comments

@@ -501,6 +501,6 @@
 		  class GridGraph : public ExtendedGridGraphBase {
 		    typedef ExtendedGridGraphBase Parent;
 		  public:
 		    typedef ExtendedGridGraphBase Parent;
 		    /// \brief Map to get the indices of the nodes as dim2::Point<int>.

lemon/hypercube_graph.h

Show inline comments

@@ -296,6 +296,6 @@
 		  class HypercubeGraph : public ExtendedHypercubeGraphBase {
 		    typedef ExtendedHypercubeGraphBase Parent;
 		  public:
 		    typedef ExtendedHypercubeGraphBase Parent;
 		    /// \brief Constructs a hypercube graph with \c dim dimensions.

lemon/list_graph.h

Show inline comments

@@ -325,2 +325,4 @@
 		  class ListDigraph : public ExtendedListDigraphBase {
 		    typedef ExtendedListDigraphBase Parent;
 		  private:
@@ -339,4 +341,2 @@
 		    typedef ExtendedListDigraphBase Parent;
 		    /// Constructor
@@ -795,3 +795,3 @@
-		    typedef ListGraphBase Digraph;
+		    typedef ListGraphBase Graph;
@@ -1178,2 +1178,4 @@
 		  class ListGraph : public ExtendedListGraphBase {
 		    typedef ExtendedListGraphBase Parent;
 		  private:
@@ -1197,4 +1199,2 @@
 		    typedef ExtendedListGraphBase Parent;
 		    typedef Parent::OutArcIt IncEdgeIt;

lemon/maps.h

Show inline comments

@@ -1840,2 +1840,3 @@
 		    typedef GR Graph;
 		    typedef GR Digraph;
 		    /// The key type of IdMap (\c Node, \c Arc or \c Edge).
@@ -1931,2 +1932,3 @@
 		    typedef GR Graph;
 		    typedef GR Digraph;
 		    /// The key type of CrossRefMap (\c Node, \c Arc or \c Edge).
@@ -2134,2 +2136,3 @@
 		    typedef GR Graph;
 		    typedef GR Digraph;
 		    /// The key type of RangeIdMap (\c Node, \c Arc or \c Edge).
@@ -2496,3 +2499,4 @@
-		    /// The digraph type
+		    /// The graph type of InDegMap
 		    typedef GR Graph;
 		    typedef GR Digraph;
@@ -2625,3 +2629,4 @@
-		    /// The digraph type
+		    /// The graph type of OutDegMap
 		    typedef GR Graph;
 		    typedef GR Digraph;

lemon/smart_graph.h

Show inline comments

@@ -57,3 +57,3 @@
-		    typedef SmartDigraphBase Graph;
+		    typedef SmartDigraphBase Digraph;
@@ -197,4 +197,2 @@
 		  class SmartDigraph : public ExtendedSmartDigraphBase {
 		  public:
 		    typedef ExtendedSmartDigraphBase Parent;
@@ -422,3 +420,3 @@
-		    typedef SmartGraphBase Digraph;
+		    typedef SmartGraphBase Graph;
@@ -633,2 +631,4 @@
 		  class SmartGraph : public ExtendedSmartGraphBase {
 		    typedef ExtendedSmartGraphBase Parent;
 		  private:
@@ -650,4 +650,2 @@
 		    typedef ExtendedSmartGraphBase Parent;
 		    /// Constructor

0 comments (0 inline)

RhodeCode

Login to your account