1.1 --- a/lemon/bits/static_map.h Thu Jan 26 06:44:22 2006 +0000
1.2 +++ b/lemon/bits/static_map.h Thu Jan 26 15:42:13 2006 +0000
1.3 @@ -305,37 +305,37 @@
1.4
1.5 /// \e
1.6 template <typename _Base>
1.7 - class StaticMappableUndirGraphExtender :
1.8 + class StaticMappableUGraphExtender :
1.9 public StaticMappableGraphExtender<_Base> {
1.10 public:
1.11
1.12 - typedef StaticMappableUndirGraphExtender Graph;
1.13 + typedef StaticMappableUGraphExtender Graph;
1.14 typedef StaticMappableGraphExtender<_Base> Parent;
1.15
1.16 - typedef typename Parent::UndirEdge UndirEdge;
1.17 + typedef typename Parent::UEdge UEdge;
1.18
1.19 template <typename _Value>
1.20 - class UndirEdgeMap
1.21 - : public IterableMapExtender<StaticMap<Graph, UndirEdge, _Value> > {
1.22 + class UEdgeMap
1.23 + : public IterableMapExtender<StaticMap<Graph, UEdge, _Value> > {
1.24 public:
1.25 - typedef StaticMappableUndirGraphExtender Graph;
1.26 + typedef StaticMappableUGraphExtender Graph;
1.27 typedef IterableMapExtender<
1.28 - StaticMap<Graph, UndirEdge, _Value> > Parent;
1.29 + StaticMap<Graph, UEdge, _Value> > Parent;
1.30
1.31 - UndirEdgeMap(const Graph& _g)
1.32 + UEdgeMap(const Graph& _g)
1.33 : Parent(_g) {}
1.34 - UndirEdgeMap(const Graph& _g, const _Value& _v)
1.35 + UEdgeMap(const Graph& _g, const _Value& _v)
1.36 : Parent(_g, _v) {}
1.37
1.38 - UndirEdgeMap& operator=(const UndirEdgeMap& cmap) {
1.39 - return operator=<UndirEdgeMap>(cmap);
1.40 + UEdgeMap& operator=(const UEdgeMap& cmap) {
1.41 + return operator=<UEdgeMap>(cmap);
1.42 }
1.43
1.44 template <typename CMap>
1.45 - UndirEdgeMap& operator=(const CMap& cmap) {
1.46 - checkConcept<concept::ReadMap<UndirEdge, _Value>, CMap>();
1.47 + UEdgeMap& operator=(const CMap& cmap) {
1.48 + checkConcept<concept::ReadMap<UEdge, _Value>, CMap>();
1.49 const typename Parent::Graph* graph = Parent::getGraph();
1.50 - UndirEdge it;
1.51 + UEdge it;
1.52 for (graph->first(it); it != INVALID; graph->next(it)) {
1.53 Parent::set(it, cmap[it]);
1.54 }
1.55 @@ -346,23 +346,23 @@
1.56 };
1.57
1.58 template <typename _Base>
1.59 - class StaticMappableUndirBipartiteGraphExtender : public _Base {
1.60 + class StaticMappableUBipartiteGraphExtender : public _Base {
1.61 public:
1.62
1.63 typedef _Base Parent;
1.64 - typedef StaticMappableUndirBipartiteGraphExtender Graph;
1.65 + typedef StaticMappableUBipartiteGraphExtender Graph;
1.66
1.67 typedef typename Parent::Node Node;
1.68 typedef typename Parent::UpperNode UpperNode;
1.69 typedef typename Parent::LowerNode LowerNode;
1.70 typedef typename Parent::Edge Edge;
1.71 - typedef typename Parent::UndirEdge UndirEdge;
1.72 + typedef typename Parent::UEdge UEdge;
1.73
1.74 template <typename _Value>
1.75 class UpperNodeMap
1.76 : public IterableMapExtender<StaticMap<Graph, UpperNode, _Value> > {
1.77 public:
1.78 - typedef StaticMappableUndirBipartiteGraphExtender Graph;
1.79 + typedef StaticMappableUBipartiteGraphExtender Graph;
1.80 typedef IterableMapExtender<StaticMap<Graph, UpperNode, _Value> >
1.81 Parent;
1.82
1.83 @@ -399,7 +399,7 @@
1.84 class LowerNodeMap
1.85 : public IterableMapExtender<StaticMap<Graph, LowerNode, _Value> > {
1.86 public:
1.87 - typedef StaticMappableUndirBipartiteGraphExtender Graph;
1.88 + typedef StaticMappableUBipartiteGraphExtender Graph;
1.89 typedef IterableMapExtender<StaticMap<Graph, LowerNode, _Value> >
1.90 Parent;
1.91
1.92 @@ -437,7 +437,7 @@
1.93 template <typename _Value>
1.94 class NodeMapBase : public Parent::NodeNotifier::ObserverBase {
1.95 public:
1.96 - typedef StaticMappableUndirBipartiteGraphExtender Graph;
1.97 + typedef StaticMappableUBipartiteGraphExtender Graph;
1.98
1.99 typedef Node Key;
1.100 typedef _Value Value;
1.101 @@ -517,7 +517,7 @@
1.102 class NodeMap
1.103 : public IterableMapExtender<NodeMapBase<_Value> > {
1.104 public:
1.105 - typedef StaticMappableUndirBipartiteGraphExtender Graph;
1.106 + typedef StaticMappableUBipartiteGraphExtender Graph;
1.107 typedef IterableMapExtender< NodeMapBase<_Value> > Parent;
1.108
1.109 NodeMap(const Graph& _g)
1.110 @@ -555,7 +555,7 @@
1.111 class EdgeMap
1.112 : public IterableMapExtender<StaticMap<Graph, Edge, _Value> > {
1.113 public:
1.114 - typedef StaticMappableUndirBipartiteGraphExtender Graph;
1.115 + typedef StaticMappableUBipartiteGraphExtender Graph;
1.116 typedef IterableMapExtender<StaticMap<Graph, Edge, _Value> > Parent;
1.117
1.118 EdgeMap(const Graph& _g)
1.119 @@ -580,27 +580,27 @@
1.120 };
1.121
1.122 template <typename _Value>
1.123 - class UndirEdgeMap
1.124 - : public IterableMapExtender<StaticMap<Graph, UndirEdge, _Value> > {
1.125 + class UEdgeMap
1.126 + : public IterableMapExtender<StaticMap<Graph, UEdge, _Value> > {
1.127 public:
1.128 - typedef StaticMappableUndirBipartiteGraphExtender Graph;
1.129 - typedef IterableMapExtender<StaticMap<Graph, UndirEdge, _Value> >
1.130 + typedef StaticMappableUBipartiteGraphExtender Graph;
1.131 + typedef IterableMapExtender<StaticMap<Graph, UEdge, _Value> >
1.132 Parent;
1.133
1.134 - UndirEdgeMap(const Graph& _g)
1.135 + UEdgeMap(const Graph& _g)
1.136 : Parent(_g) {}
1.137 - UndirEdgeMap(const Graph& _g, const _Value& _v)
1.138 + UEdgeMap(const Graph& _g, const _Value& _v)
1.139 : Parent(_g, _v) {}
1.140
1.141 - UndirEdgeMap& operator=(const UndirEdgeMap& cmap) {
1.142 - return operator=<UndirEdgeMap>(cmap);
1.143 + UEdgeMap& operator=(const UEdgeMap& cmap) {
1.144 + return operator=<UEdgeMap>(cmap);
1.145 }
1.146
1.147 template <typename CMap>
1.148 - UndirEdgeMap& operator=(const CMap& cmap) {
1.149 - checkConcept<concept::ReadMap<UndirEdge, _Value>, CMap>();
1.150 + UEdgeMap& operator=(const CMap& cmap) {
1.151 + checkConcept<concept::ReadMap<UEdge, _Value>, CMap>();
1.152 const typename Parent::Graph* graph = Parent::getGraph();
1.153 - UndirEdge it;
1.154 + UEdge it;
1.155 for (graph->first(it); it != INVALID; graph->next(it)) {
1.156 Parent::set(it, cmap[it]);
1.157 }