lemon-1.2: comparison lemon/concepts/graph

equal deleted inserted replaced

-:db14092094c7
+:7ae9bc586e4b
 /// It extends the interface of \ref BaseDigraphComponent with an
 /// \c Edge type and functions to get the end nodes of edges,
 /// to convert from arcs to edges and to get both direction of edges.
 class BaseGraphComponent : public BaseDigraphComponent {
 public:
+typedef BaseGraphComponent Graph;
 typedef BaseDigraphComponent::Node Node;
 typedef BaseDigraphComponent::Arc Arc;
 /// \brief Undirected edge class of the graph.
 ///
 /// This class represents the undirected edges of the graph.
 /// Undirected graphs can be used as directed graphs, each edge is
 /// represented by two opposite directed arcs.
 class Edge : public GraphItem<'e'> {
+typedef GraphItem<'e'> Parent;
 public:
-typedef GraphItem<'e'> Parent;
 /// \brief Default constructor.
 ///
 /// Default constructor.
 /// \warning The default constructor is not required to set
 /// the item to some well-defined value. So you should consider it
 /// the \c NodeMap, \c ArcMap and \c EdgeMap subtypes of digraph and
 /// graph types, which can be used for associating data to graph items.
 /// The standard graph maps must conform to the ReferenceMap concept.
 template <typename GR, typename K, typename V>
 class GraphMap : public ReferenceMap<K, V, V&, const V&> {
-public:
+typedef ReferenceMap<K, V, V&, const V&> Parent;
-typedef ReadWriteMap<K, V> Parent;
+public:
-/// The graph type of the map.
-typedef GR Graph;
 /// The key type of the map.
 typedef K Key;
 /// The value type of the map.
 typedef V Value;
 /// The reference type of the map.
 typedef True ReferenceMapTag;
 /// \brief Construct a new map.
 ///
 /// Construct a new map for the graph.
-explicit GraphMap(const Graph&) {}
+explicit GraphMap(const GR&) {}
 /// \brief Construct a new map with default value.
 ///
 /// Construct a new map for the graph and initalize the values.
-GraphMap(const Graph&, const Value&) {}
+GraphMap(const GR&, const Value&) {}
 private:
 /// \brief Copy constructor.
 ///
 /// Copy Constructor.
 ignore_unused_variable_warning(m2);
 // ignore_unused_variable_warning(m3);
 }
 const _Map &m;
-const Graph &g;
+const GR &g;
 const typename GraphMap::Value &t;
 };
 };
 ///
 /// Standard graph map for the nodes.
 /// It conforms to the ReferenceMap concept.
 template <typename V>
 class NodeMap : public GraphMap<MappableDigraphComponent, Node, V> {
+typedef GraphMap<MappableDigraphComponent, Node, V> Parent;
 public:
-typedef GraphMap<MappableDigraphComponent, Node, V> Parent;
 /// \brief Construct a new map.
 ///
 /// Construct a new map for the digraph.
 explicit NodeMap(const MappableDigraphComponent& digraph)
 : Parent(digraph) {}
 ///
 /// Standard graph map for the arcs.
 /// It conforms to the ReferenceMap concept.
 template <typename V>
 class ArcMap : public GraphMap<MappableDigraphComponent, Arc, V> {
+typedef GraphMap<MappableDigraphComponent, Arc, V> Parent;
 public:
-typedef GraphMap<MappableDigraphComponent, Arc, V> Parent;
 /// \brief Construct a new map.
 ///
 /// Construct a new map for the digraph.
 explicit ArcMap(const MappableDigraphComponent& digraph)
 : Parent(digraph) {}
 ///
 /// Standard graph map for the edges.
 /// It conforms to the ReferenceMap concept.
 template <typename V>
 class EdgeMap : public GraphMap<MappableGraphComponent, Edge, V> {
+typedef GraphMap<MappableGraphComponent, Edge, V> Parent;
 public:
-typedef GraphMap<MappableGraphComponent, Edge, V> Parent;
 /// \brief Construct a new map.
 ///
 /// Construct a new map for the graph.
 explicit EdgeMap(const MappableGraphComponent& graph)
 : Parent(graph) {}

changeset 656	cb38ccedd2c1
parent 584	33c6b6e755cd
child 666	1993af615e68