1.1 --- a/lemon/concepts/graph_components.h Thu Dec 01 09:05:47 2011 +0100
1.2 +++ b/lemon/concepts/graph_components.h Wed Jan 11 22:21:07 2012 +0100
1.3 @@ -1206,12 +1206,12 @@
1.4 /// \brief This iterator goes through each red node.
1.5 ///
1.6 /// This iterator goes through each red node.
1.7 - typedef GraphItemIt<BpGraph, RedNode> RedIt;
1.8 + typedef GraphItemIt<BpGraph, RedNode> RedNodeIt;
1.9
1.10 /// \brief This iterator goes through each blue node.
1.11 ///
1.12 /// This iterator goes through each blue node.
1.13 - typedef GraphItemIt<BpGraph, BlueNode> BlueIt;
1.14 + typedef GraphItemIt<BpGraph, BlueNode> BlueNodeIt;
1.15
1.16 /// @}
1.17
1.18 @@ -1228,9 +1228,9 @@
1.19 bpgraph.next(bn);
1.20
1.21 checkConcept<GraphItemIt<_BpGraph, typename _BpGraph::RedNode>,
1.22 - typename _BpGraph::RedIt>();
1.23 + typename _BpGraph::RedNodeIt>();
1.24 checkConcept<GraphItemIt<_BpGraph, typename _BpGraph::BlueNode>,
1.25 - typename _BpGraph::BlueIt>();
1.26 + typename _BpGraph::BlueNodeIt>();
1.27 }
1.28
1.29 const _BpGraph& bpgraph;
1.30 @@ -1715,7 +1715,8 @@
1.31 /// This class describes the interface of mappable undirected
1.32 /// bipartite graphs. It extends \ref MappableGraphComponent with
1.33 /// the standard graph map class for red and blue nodes (\c
1.34 - /// RedMap and BlueMap). This concept is part of the BpGraph concept.
1.35 + /// RedNodeMap and BlueNodeMap). This concept is part of the
1.36 + /// BpGraph concept.
1.37 template <typename BAS = BaseBpGraphComponent>
1.38 class MappableBpGraphComponent : public MappableGraphComponent<BAS> {
1.39 public:
1.40 @@ -1730,33 +1731,33 @@
1.41 /// Standard graph map for the red nodes.
1.42 /// It conforms to the ReferenceMap concept.
1.43 template <typename V>
1.44 - class RedMap : public GraphMap<MappableBpGraphComponent, Node, V> {
1.45 + class RedNodeMap : public GraphMap<MappableBpGraphComponent, Node, V> {
1.46 typedef GraphMap<MappableBpGraphComponent, Node, V> Parent;
1.47
1.48 public:
1.49 /// \brief Construct a new map.
1.50 ///
1.51 /// Construct a new map for the graph.
1.52 - explicit RedMap(const MappableBpGraphComponent& graph)
1.53 + explicit RedNodeMap(const MappableBpGraphComponent& graph)
1.54 : Parent(graph) {}
1.55
1.56 /// \brief Construct a new map with default value.
1.57 ///
1.58 /// Construct a new map for the graph and initalize the values.
1.59 - RedMap(const MappableBpGraphComponent& graph, const V& value)
1.60 + RedNodeMap(const MappableBpGraphComponent& graph, const V& value)
1.61 : Parent(graph, value) {}
1.62
1.63 private:
1.64 /// \brief Copy constructor.
1.65 ///
1.66 /// Copy Constructor.
1.67 - RedMap(const RedMap& nm) : Parent(nm) {}
1.68 + RedNodeMap(const RedNodeMap& nm) : Parent(nm) {}
1.69
1.70 /// \brief Assignment operator.
1.71 ///
1.72 /// Assignment operator.
1.73 template <typename CMap>
1.74 - RedMap& operator=(const CMap&) {
1.75 + RedNodeMap& operator=(const CMap&) {
1.76 checkConcept<ReadMap<Node, V>, CMap>();
1.77 return *this;
1.78 }
1.79 @@ -1768,33 +1769,33 @@
1.80 /// Standard graph map for the blue nodes.
1.81 /// It conforms to the ReferenceMap concept.
1.82 template <typename V>
1.83 - class BlueMap : public GraphMap<MappableBpGraphComponent, Node, V> {
1.84 + class BlueNodeMap : public GraphMap<MappableBpGraphComponent, Node, V> {
1.85 typedef GraphMap<MappableBpGraphComponent, Node, V> Parent;
1.86
1.87 public:
1.88 /// \brief Construct a new map.
1.89 ///
1.90 /// Construct a new map for the graph.
1.91 - explicit BlueMap(const MappableBpGraphComponent& graph)
1.92 + explicit BlueNodeMap(const MappableBpGraphComponent& graph)
1.93 : Parent(graph) {}
1.94
1.95 /// \brief Construct a new map with default value.
1.96 ///
1.97 /// Construct a new map for the graph and initalize the values.
1.98 - BlueMap(const MappableBpGraphComponent& graph, const V& value)
1.99 + BlueNodeMap(const MappableBpGraphComponent& graph, const V& value)
1.100 : Parent(graph, value) {}
1.101
1.102 private:
1.103 /// \brief Copy constructor.
1.104 ///
1.105 /// Copy Constructor.
1.106 - BlueMap(const BlueMap& nm) : Parent(nm) {}
1.107 + BlueNodeMap(const BlueNodeMap& nm) : Parent(nm) {}
1.108
1.109 /// \brief Assignment operator.
1.110 ///
1.111 /// Assignment operator.
1.112 template <typename CMap>
1.113 - BlueMap& operator=(const CMap&) {
1.114 + BlueNodeMap& operator=(const CMap&) {
1.115 checkConcept<ReadMap<Node, V>, CMap>();
1.116 return *this;
1.117 }
1.118 @@ -1815,31 +1816,37 @@
1.119 checkConcept<MappableGraphComponent<Base>, _BpGraph>();
1.120
1.121 { // int map test
1.122 - typedef typename _BpGraph::template RedMap<int> IntRedMap;
1.123 + typedef typename _BpGraph::template RedNodeMap<int>
1.124 + IntRedNodeMap;
1.125 checkConcept<GraphMap<_BpGraph, typename _BpGraph::RedNode, int>,
1.126 - IntRedMap >();
1.127 + IntRedNodeMap >();
1.128 } { // bool map test
1.129 - typedef typename _BpGraph::template RedMap<bool> BoolRedMap;
1.130 + typedef typename _BpGraph::template RedNodeMap<bool>
1.131 + BoolRedNodeMap;
1.132 checkConcept<GraphMap<_BpGraph, typename _BpGraph::RedNode, bool>,
1.133 - BoolRedMap >();
1.134 + BoolRedNodeMap >();
1.135 } { // Dummy map test
1.136 - typedef typename _BpGraph::template RedMap<Dummy> DummyRedMap;
1.137 + typedef typename _BpGraph::template RedNodeMap<Dummy>
1.138 + DummyRedNodeMap;
1.139 checkConcept<GraphMap<_BpGraph, typename _BpGraph::RedNode, Dummy>,
1.140 - DummyRedMap >();
1.141 + DummyRedNodeMap >();
1.142 }
1.143
1.144 { // int map test
1.145 - typedef typename _BpGraph::template BlueMap<int> IntBlueMap;
1.146 + typedef typename _BpGraph::template BlueNodeMap<int>
1.147 + IntBlueNodeMap;
1.148 checkConcept<GraphMap<_BpGraph, typename _BpGraph::BlueNode, int>,
1.149 - IntBlueMap >();
1.150 + IntBlueNodeMap >();
1.151 } { // bool map test
1.152 - typedef typename _BpGraph::template BlueMap<bool> BoolBlueMap;
1.153 + typedef typename _BpGraph::template BlueNodeMap<bool>
1.154 + BoolBlueNodeMap;
1.155 checkConcept<GraphMap<_BpGraph, typename _BpGraph::BlueNode, bool>,
1.156 - BoolBlueMap >();
1.157 + BoolBlueNodeMap >();
1.158 } { // Dummy map test
1.159 - typedef typename _BpGraph::template BlueMap<Dummy> DummyBlueMap;
1.160 + typedef typename _BpGraph::template BlueNodeMap<Dummy>
1.161 + DummyBlueNodeMap;
1.162 checkConcept<GraphMap<_BpGraph, typename _BpGraph::BlueNode, Dummy>,
1.163 - DummyBlueMap >();
1.164 + DummyBlueNodeMap >();
1.165 }
1.166 }
1.167