1.1 --- a/lemon/bits/graph_extender.h Thu Feb 28 16:41:56 2008 +0100
1.2 +++ b/lemon/bits/graph_extender.h Thu Feb 28 17:06:02 2008 +0100
1.3 @@ -64,11 +64,11 @@
1.4 return Parent::arcFromId(id);
1.5 }
1.6
1.7 - Node oppositeNode(const Node &n, const Arc &e) const {
1.8 - if (n == Parent::source(e))
1.9 - return Parent::target(e);
1.10 - else if(n==Parent::target(e))
1.11 - return Parent::source(e);
1.12 + Node oppositeNode(const Node &node, const Arc &arc) const {
1.13 + if (node == Parent::source(arc))
1.14 + return Parent::target(arc);
1.15 + else if(node == Parent::target(arc))
1.16 + return Parent::source(arc);
1.17 else
1.18 return INVALID;
1.19 }
1.20 @@ -95,22 +95,22 @@
1.21 }
1.22
1.23 class NodeIt : public Node {
1.24 - const Digraph* digraph;
1.25 + const Digraph* _digraph;
1.26 public:
1.27
1.28 NodeIt() {}
1.29
1.30 NodeIt(Invalid i) : Node(i) { }
1.31
1.32 - explicit NodeIt(const Digraph& _digraph) : digraph(&_digraph) {
1.33 - _digraph.first(static_cast<Node&>(*this));
1.34 + explicit NodeIt(const Digraph& digraph) : _digraph(&digraph) {
1.35 + _digraph->first(static_cast<Node&>(*this));
1.36 }
1.37
1.38 - NodeIt(const Digraph& _digraph, const Node& node)
1.39 - : Node(node), digraph(&_digraph) {}
1.40 + NodeIt(const Digraph& digraph, const Node& node)
1.41 + : Node(node), _digraph(&digraph) {}
1.42
1.43 NodeIt& operator++() {
1.44 - digraph->next(*this);
1.45 + _digraph->next(*this);
1.46 return *this;
1.47 }
1.48
1.49 @@ -118,22 +118,22 @@
1.50
1.51
1.52 class ArcIt : public Arc {
1.53 - const Digraph* digraph;
1.54 + const Digraph* _digraph;
1.55 public:
1.56
1.57 ArcIt() { }
1.58
1.59 ArcIt(Invalid i) : Arc(i) { }
1.60
1.61 - explicit ArcIt(const Digraph& _digraph) : digraph(&_digraph) {
1.62 - _digraph.first(static_cast<Arc&>(*this));
1.63 + explicit ArcIt(const Digraph& digraph) : _digraph(&digraph) {
1.64 + _digraph->first(static_cast<Arc&>(*this));
1.65 }
1.66
1.67 - ArcIt(const Digraph& _digraph, const Arc& e) :
1.68 - Arc(e), digraph(&_digraph) { }
1.69 + ArcIt(const Digraph& digraph, const Arc& arc) :
1.70 + Arc(arc), _digraph(&digraph) { }
1.71
1.72 ArcIt& operator++() {
1.73 - digraph->next(*this);
1.74 + _digraph->next(*this);
1.75 return *this;
1.76 }
1.77
1.78 @@ -141,23 +141,23 @@
1.79
1.80
1.81 class OutArcIt : public Arc {
1.82 - const Digraph* digraph;
1.83 + const Digraph* _digraph;
1.84 public:
1.85
1.86 OutArcIt() { }
1.87
1.88 OutArcIt(Invalid i) : Arc(i) { }
1.89
1.90 - OutArcIt(const Digraph& _digraph, const Node& node)
1.91 - : digraph(&_digraph) {
1.92 - _digraph.firstOut(*this, node);
1.93 + OutArcIt(const Digraph& digraph, const Node& node)
1.94 + : _digraph(&digraph) {
1.95 + _digraph->firstOut(*this, node);
1.96 }
1.97
1.98 - OutArcIt(const Digraph& _digraph, const Arc& arc)
1.99 - : Arc(arc), digraph(&_digraph) {}
1.100 + OutArcIt(const Digraph& digraph, const Arc& arc)
1.101 + : Arc(arc), _digraph(&digraph) {}
1.102
1.103 OutArcIt& operator++() {
1.104 - digraph->nextOut(*this);
1.105 + _digraph->nextOut(*this);
1.106 return *this;
1.107 }
1.108
1.109 @@ -165,23 +165,23 @@
1.110
1.111
1.112 class InArcIt : public Arc {
1.113 - const Digraph* digraph;
1.114 + const Digraph* _digraph;
1.115 public:
1.116
1.117 InArcIt() { }
1.118
1.119 InArcIt(Invalid i) : Arc(i) { }
1.120
1.121 - InArcIt(const Digraph& _digraph, const Node& node)
1.122 - : digraph(&_digraph) {
1.123 - _digraph.firstIn(*this, node);
1.124 + InArcIt(const Digraph& digraph, const Node& node)
1.125 + : _digraph(&digraph) {
1.126 + _digraph->firstIn(*this, node);
1.127 }
1.128
1.129 - InArcIt(const Digraph& _digraph, const Arc& arc) :
1.130 - Arc(arc), digraph(&_digraph) {}
1.131 + InArcIt(const Digraph& digraph, const Arc& arc) :
1.132 + Arc(arc), _digraph(&digraph) {}
1.133
1.134 InArcIt& operator++() {
1.135 - digraph->nextIn(*this);
1.136 + _digraph->nextIn(*this);
1.137 return *this;
1.138 }
1.139
1.140 @@ -190,29 +190,29 @@
1.141 /// \brief Base node of the iterator
1.142 ///
1.143 /// Returns the base node (i.e. the source in this case) of the iterator
1.144 - Node baseNode(const OutArcIt &e) const {
1.145 - return Parent::source(e);
1.146 + Node baseNode(const OutArcIt &arc) const {
1.147 + return Parent::source(arc);
1.148 }
1.149 /// \brief Running node of the iterator
1.150 ///
1.151 /// Returns the running node (i.e. the target in this case) of the
1.152 /// iterator
1.153 - Node runningNode(const OutArcIt &e) const {
1.154 - return Parent::target(e);
1.155 + Node runningNode(const OutArcIt &arc) const {
1.156 + return Parent::target(arc);
1.157 }
1.158
1.159 /// \brief Base node of the iterator
1.160 ///
1.161 /// Returns the base node (i.e. the target in this case) of the iterator
1.162 - Node baseNode(const InArcIt &e) const {
1.163 - return Parent::target(e);
1.164 + Node baseNode(const InArcIt &arc) const {
1.165 + return Parent::target(arc);
1.166 }
1.167 /// \brief Running node of the iterator
1.168 ///
1.169 /// Returns the running node (i.e. the source in this case) of the
1.170 /// iterator
1.171 - Node runningNode(const InArcIt &e) const {
1.172 - return Parent::source(e);
1.173 + Node runningNode(const InArcIt &arc) const {
1.174 + return Parent::source(arc);
1.175 }
1.176
1.177
1.178 @@ -324,7 +324,7 @@
1.179 }
1.180 };
1.181
1.182 - /// \ingroup graphbits
1.183 + /// \ingroup _graphbits
1.184 ///
1.185 /// \brief Extender for the Graphs
1.186 template <typename Base>
1.187 @@ -332,7 +332,7 @@
1.188 public:
1.189
1.190 typedef Base Parent;
1.191 - typedef GraphExtender Digraph;
1.192 + typedef GraphExtender Graph;
1.193
1.194 typedef True UndirectedTag;
1.195
1.196 @@ -375,13 +375,13 @@
1.197 return INVALID;
1.198 }
1.199
1.200 - Arc oppositeArc(const Arc &e) const {
1.201 - return Parent::direct(e, !Parent::direction(e));
1.202 + Arc oppositeArc(const Arc &arc) const {
1.203 + return Parent::direct(arc, !Parent::direction(arc));
1.204 }
1.205
1.206 using Parent::direct;
1.207 - Arc direct(const Edge &ue, const Node &s) const {
1.208 - return Parent::direct(ue, Parent::source(ue) == s);
1.209 + Arc direct(const Edge &edge, const Node &node) const {
1.210 + return Parent::direct(edge, Parent::source(edge) == node);
1.211 }
1.212
1.213 // Alterable extension
1.214 @@ -414,22 +414,22 @@
1.215
1.216
1.217 class NodeIt : public Node {
1.218 - const Digraph* digraph;
1.219 + const Graph* _graph;
1.220 public:
1.221
1.222 NodeIt() {}
1.223
1.224 NodeIt(Invalid i) : Node(i) { }
1.225
1.226 - explicit NodeIt(const Digraph& _digraph) : digraph(&_digraph) {
1.227 - _digraph.first(static_cast<Node&>(*this));
1.228 + explicit NodeIt(const Graph& graph) : _graph(&graph) {
1.229 + _graph->first(static_cast<Node&>(*this));
1.230 }
1.231
1.232 - NodeIt(const Digraph& _digraph, const Node& node)
1.233 - : Node(node), digraph(&_digraph) {}
1.234 + NodeIt(const Graph& graph, const Node& node)
1.235 + : Node(node), _graph(&graph) {}
1.236
1.237 NodeIt& operator++() {
1.238 - digraph->next(*this);
1.239 + _graph->next(*this);
1.240 return *this;
1.241 }
1.242
1.243 @@ -437,22 +437,22 @@
1.244
1.245
1.246 class ArcIt : public Arc {
1.247 - const Digraph* digraph;
1.248 + const Graph* _graph;
1.249 public:
1.250
1.251 ArcIt() { }
1.252
1.253 ArcIt(Invalid i) : Arc(i) { }
1.254
1.255 - explicit ArcIt(const Digraph& _digraph) : digraph(&_digraph) {
1.256 - _digraph.first(static_cast<Arc&>(*this));
1.257 + explicit ArcIt(const Graph& graph) : _graph(&graph) {
1.258 + _graph->first(static_cast<Arc&>(*this));
1.259 }
1.260
1.261 - ArcIt(const Digraph& _digraph, const Arc& e) :
1.262 - Arc(e), digraph(&_digraph) { }
1.263 + ArcIt(const Graph& graph, const Arc& arc) :
1.264 + Arc(arc), _graph(&graph) { }
1.265
1.266 ArcIt& operator++() {
1.267 - digraph->next(*this);
1.268 + _graph->next(*this);
1.269 return *this;
1.270 }
1.271
1.272 @@ -460,23 +460,23 @@
1.273
1.274
1.275 class OutArcIt : public Arc {
1.276 - const Digraph* digraph;
1.277 + const Graph* _graph;
1.278 public:
1.279
1.280 OutArcIt() { }
1.281
1.282 OutArcIt(Invalid i) : Arc(i) { }
1.283
1.284 - OutArcIt(const Digraph& _digraph, const Node& node)
1.285 - : digraph(&_digraph) {
1.286 - _digraph.firstOut(*this, node);
1.287 + OutArcIt(const Graph& graph, const Node& node)
1.288 + : _graph(&graph) {
1.289 + _graph->firstOut(*this, node);
1.290 }
1.291
1.292 - OutArcIt(const Digraph& _digraph, const Arc& arc)
1.293 - : Arc(arc), digraph(&_digraph) {}
1.294 + OutArcIt(const Graph& graph, const Arc& arc)
1.295 + : Arc(arc), _graph(&graph) {}
1.296
1.297 OutArcIt& operator++() {
1.298 - digraph->nextOut(*this);
1.299 + _graph->nextOut(*this);
1.300 return *this;
1.301 }
1.302
1.303 @@ -484,23 +484,23 @@
1.304
1.305
1.306 class InArcIt : public Arc {
1.307 - const Digraph* digraph;
1.308 + const Graph* _graph;
1.309 public:
1.310
1.311 InArcIt() { }
1.312
1.313 InArcIt(Invalid i) : Arc(i) { }
1.314
1.315 - InArcIt(const Digraph& _digraph, const Node& node)
1.316 - : digraph(&_digraph) {
1.317 - _digraph.firstIn(*this, node);
1.318 + InArcIt(const Graph& graph, const Node& node)
1.319 + : _graph(&graph) {
1.320 + _graph->firstIn(*this, node);
1.321 }
1.322
1.323 - InArcIt(const Digraph& _digraph, const Arc& arc) :
1.324 - Arc(arc), digraph(&_digraph) {}
1.325 + InArcIt(const Graph& graph, const Arc& arc) :
1.326 + Arc(arc), _graph(&graph) {}
1.327
1.328 InArcIt& operator++() {
1.329 - digraph->nextIn(*this);
1.330 + _graph->nextIn(*this);
1.331 return *this;
1.332 }
1.333
1.334 @@ -508,48 +508,48 @@
1.335
1.336
1.337 class EdgeIt : public Parent::Edge {
1.338 - const Digraph* digraph;
1.339 + const Graph* _graph;
1.340 public:
1.341
1.342 EdgeIt() { }
1.343
1.344 EdgeIt(Invalid i) : Edge(i) { }
1.345
1.346 - explicit EdgeIt(const Digraph& _digraph) : digraph(&_digraph) {
1.347 - _digraph.first(static_cast<Edge&>(*this));
1.348 + explicit EdgeIt(const Graph& graph) : _graph(&graph) {
1.349 + _graph->first(static_cast<Edge&>(*this));
1.350 }
1.351
1.352 - EdgeIt(const Digraph& _digraph, const Edge& e) :
1.353 - Edge(e), digraph(&_digraph) { }
1.354 + EdgeIt(const Graph& graph, const Edge& edge) :
1.355 + Edge(edge), _graph(&graph) { }
1.356
1.357 EdgeIt& operator++() {
1.358 - digraph->next(*this);
1.359 + _graph->next(*this);
1.360 return *this;
1.361 }
1.362
1.363 };
1.364
1.365 - class IncArcIt : public Parent::Edge {
1.366 + class IncEdgeIt : public Parent::Edge {
1.367 friend class GraphExtender;
1.368 - const Digraph* digraph;
1.369 - bool direction;
1.370 + const Graph* _graph;
1.371 + bool _direction;
1.372 public:
1.373
1.374 - IncArcIt() { }
1.375 + IncEdgeIt() { }
1.376
1.377 - IncArcIt(Invalid i) : Edge(i), direction(false) { }
1.378 + IncEdgeIt(Invalid i) : Edge(i), _direction(false) { }
1.379
1.380 - IncArcIt(const Digraph& _digraph, const Node &n) : digraph(&_digraph) {
1.381 - _digraph.firstInc(*this, direction, n);
1.382 + IncEdgeIt(const Graph& graph, const Node &node) : _graph(&graph) {
1.383 + _graph->firstInc(*this, _direction, node);
1.384 }
1.385
1.386 - IncArcIt(const Digraph& _digraph, const Edge &ue, const Node &n)
1.387 - : digraph(&_digraph), Edge(ue) {
1.388 - direction = (_digraph.source(ue) == n);
1.389 + IncEdgeIt(const Graph& graph, const Edge &edge, const Node &node)
1.390 + : _graph(&graph), Edge(edge) {
1.391 + _direction = (_graph->source(edge) == node);
1.392 }
1.393
1.394 - IncArcIt& operator++() {
1.395 - digraph->nextInc(*this, direction);
1.396 + IncEdgeIt& operator++() {
1.397 + _graph->nextInc(*this, _direction);
1.398 return *this;
1.399 }
1.400 };
1.401 @@ -557,57 +557,57 @@
1.402 /// \brief Base node of the iterator
1.403 ///
1.404 /// Returns the base node (ie. the source in this case) of the iterator
1.405 - Node baseNode(const OutArcIt &e) const {
1.406 - return Parent::source(static_cast<const Arc&>(e));
1.407 + Node baseNode(const OutArcIt &arc) const {
1.408 + return Parent::source(static_cast<const Arc&>(arc));
1.409 }
1.410 /// \brief Running node of the iterator
1.411 ///
1.412 /// Returns the running node (ie. the target in this case) of the
1.413 /// iterator
1.414 - Node runningNode(const OutArcIt &e) const {
1.415 - return Parent::target(static_cast<const Arc&>(e));
1.416 + Node runningNode(const OutArcIt &arc) const {
1.417 + return Parent::target(static_cast<const Arc&>(arc));
1.418 }
1.419
1.420 /// \brief Base node of the iterator
1.421 ///
1.422 /// Returns the base node (ie. the target in this case) of the iterator
1.423 - Node baseNode(const InArcIt &e) const {
1.424 - return Parent::target(static_cast<const Arc&>(e));
1.425 + Node baseNode(const InArcIt &arc) const {
1.426 + return Parent::target(static_cast<const Arc&>(arc));
1.427 }
1.428 /// \brief Running node of the iterator
1.429 ///
1.430 /// Returns the running node (ie. the source in this case) of the
1.431 /// iterator
1.432 - Node runningNode(const InArcIt &e) const {
1.433 - return Parent::source(static_cast<const Arc&>(e));
1.434 + Node runningNode(const InArcIt &arc) const {
1.435 + return Parent::source(static_cast<const Arc&>(arc));
1.436 }
1.437
1.438 /// Base node of the iterator
1.439 ///
1.440 /// Returns the base node of the iterator
1.441 - Node baseNode(const IncArcIt &e) const {
1.442 - return e.direction ? source(e) : target(e);
1.443 + Node baseNode(const IncEdgeIt &edge) const {
1.444 + return edge._direction ? source(edge) : target(edge);
1.445 }
1.446 /// Running node of the iterator
1.447 ///
1.448 /// Returns the running node of the iterator
1.449 - Node runningNode(const IncArcIt &e) const {
1.450 - return e.direction ? target(e) : source(e);
1.451 + Node runningNode(const IncEdgeIt &edge) const {
1.452 + return edge._direction ? target(edge) : source(edge);
1.453 }
1.454
1.455 // Mappable extension
1.456
1.457 template <typename _Value>
1.458 class NodeMap
1.459 - : public MapExtender<DefaultMap<Digraph, Node, _Value> > {
1.460 + : public MapExtender<DefaultMap<Graph, Node, _Value> > {
1.461 public:
1.462 - typedef GraphExtender Digraph;
1.463 - typedef MapExtender<DefaultMap<Digraph, Node, _Value> > Parent;
1.464 + typedef GraphExtender Graph;
1.465 + typedef MapExtender<DefaultMap<Graph, Node, _Value> > Parent;
1.466
1.467 - NodeMap(const Digraph& digraph)
1.468 - : Parent(digraph) {}
1.469 - NodeMap(const Digraph& digraph, const _Value& value)
1.470 - : Parent(digraph, value) {}
1.471 + NodeMap(const Graph& graph)
1.472 + : Parent(graph) {}
1.473 + NodeMap(const Graph& graph, const _Value& value)
1.474 + : Parent(graph, value) {}
1.475
1.476 NodeMap& operator=(const NodeMap& cmap) {
1.477 return operator=<NodeMap>(cmap);
1.478 @@ -623,15 +623,15 @@
1.479
1.480 template <typename _Value>
1.481 class ArcMap
1.482 - : public MapExtender<DefaultMap<Digraph, Arc, _Value> > {
1.483 + : public MapExtender<DefaultMap<Graph, Arc, _Value> > {
1.484 public:
1.485 - typedef GraphExtender Digraph;
1.486 - typedef MapExtender<DefaultMap<Digraph, Arc, _Value> > Parent;
1.487 + typedef GraphExtender Graph;
1.488 + typedef MapExtender<DefaultMap<Graph, Arc, _Value> > Parent;
1.489
1.490 - ArcMap(const Digraph& digraph)
1.491 - : Parent(digraph) {}
1.492 - ArcMap(const Digraph& digraph, const _Value& value)
1.493 - : Parent(digraph, value) {}
1.494 + ArcMap(const Graph& graph)
1.495 + : Parent(graph) {}
1.496 + ArcMap(const Graph& graph, const _Value& value)
1.497 + : Parent(graph, value) {}
1.498
1.499 ArcMap& operator=(const ArcMap& cmap) {
1.500 return operator=<ArcMap>(cmap);
1.501 @@ -647,16 +647,16 @@
1.502
1.503 template <typename _Value>
1.504 class EdgeMap
1.505 - : public MapExtender<DefaultMap<Digraph, Edge, _Value> > {
1.506 + : public MapExtender<DefaultMap<Graph, Edge, _Value> > {
1.507 public:
1.508 - typedef GraphExtender Digraph;
1.509 - typedef MapExtender<DefaultMap<Digraph, Edge, _Value> > Parent;
1.510 + typedef GraphExtender Graph;
1.511 + typedef MapExtender<DefaultMap<Graph, Edge, _Value> > Parent;
1.512
1.513 - EdgeMap(const Digraph& digraph)
1.514 - : Parent(digraph) {}
1.515 + EdgeMap(const Graph& graph)
1.516 + : Parent(graph) {}
1.517
1.518 - EdgeMap(const Digraph& digraph, const _Value& value)
1.519 - : Parent(digraph, value) {}
1.520 + EdgeMap(const Graph& graph, const _Value& value)
1.521 + : Parent(graph, value) {}
1.522
1.523 EdgeMap& operator=(const EdgeMap& cmap) {
1.524 return operator=<EdgeMap>(cmap);
1.525 @@ -695,10 +695,10 @@
1.526 Parent::clear();
1.527 }
1.528
1.529 - template <typename Digraph, typename NodeRefMap, typename EdgeRefMap>
1.530 - void build(const Digraph& digraph, NodeRefMap& nodeRef,
1.531 + template <typename Graph, typename NodeRefMap, typename EdgeRefMap>
1.532 + void build(const Graph& graph, NodeRefMap& nodeRef,
1.533 EdgeRefMap& edgeRef) {
1.534 - Parent::build(digraph, nodeRef, edgeRef);
1.535 + Parent::build(graph, nodeRef, edgeRef);
1.536 notifier(Node()).build();
1.537 notifier(Edge()).build();
1.538 notifier(Arc()).build();
1.539 @@ -723,10 +723,10 @@
1.540 }
1.541
1.542 void erase(const Edge& edge) {
1.543 - std::vector<Arc> ev;
1.544 - ev.push_back(Parent::direct(edge, true));
1.545 - ev.push_back(Parent::direct(edge, false));
1.546 - notifier(Arc()).erase(ev);
1.547 + std::vector<Arc> av;
1.548 + av.push_back(Parent::direct(edge, true));
1.549 + av.push_back(Parent::direct(edge, false));
1.550 + notifier(Arc()).erase(av);
1.551 notifier(Edge()).erase(edge);
1.552 Parent::erase(edge);
1.553 }
2.1 --- a/lemon/concepts/graph.h Thu Feb 28 16:41:56 2008 +0100
2.2 +++ b/lemon/concepts/graph.h Thu Feb 28 17:06:02 2008 +0100
2.3 @@ -63,7 +63,7 @@
2.4 /// The EdgeIt is an iterator for the edges. We can use
2.5 /// the EdgeMap to map values for the edges. The InArcIt and
2.6 /// OutArcIt iterates on the same edges but with opposite
2.7 - /// direction. The IncArcIt iterates also on the same edges
2.8 + /// direction. The IncEdgeIt iterates also on the same edges
2.9 /// as the OutArcIt and InArcIt but it is not convertible to Arc just
2.10 /// to Edge.
2.11 class Graph {
2.12 @@ -270,41 +270,41 @@
2.13 ///
2.14 ///\code
2.15 /// int count=0;
2.16 - /// for(Graph::IncArcIt e(g, n); e!=INVALID; ++e) ++count;
2.17 + /// for(Graph::IncEdgeIt e(g, n); e!=INVALID; ++e) ++count;
2.18 ///\endcode
2.19 - class IncArcIt : public Edge {
2.20 + class IncEdgeIt : public Edge {
2.21 public:
2.22 /// Default constructor
2.23
2.24 /// @warning The default constructor sets the iterator
2.25 /// to an undefined value.
2.26 - IncArcIt() { }
2.27 + IncEdgeIt() { }
2.28 /// Copy constructor.
2.29
2.30 /// Copy constructor.
2.31 ///
2.32 - IncArcIt(const IncArcIt& e) : Edge(e) { }
2.33 + IncEdgeIt(const IncEdgeIt& e) : Edge(e) { }
2.34 /// Initialize the iterator to be invalid.
2.35
2.36 /// Initialize the iterator to be invalid.
2.37 ///
2.38 - IncArcIt(Invalid) { }
2.39 + IncEdgeIt(Invalid) { }
2.40 /// This constructor sets the iterator to first incident arc.
2.41
2.42 /// This constructor set the iterator to the first incident arc of
2.43 /// the node.
2.44 - IncArcIt(const Graph&, const Node&) { }
2.45 - /// Edge -> IncArcIt conversion
2.46 + IncEdgeIt(const Graph&, const Node&) { }
2.47 + /// Edge -> IncEdgeIt conversion
2.48
2.49 /// Sets the iterator to the value of the trivial iterator \c e.
2.50 /// This feature necessitates that each time we
2.51 /// iterate the arc-set, the iteration order is the same.
2.52 - IncArcIt(const Graph&, const Edge&) { }
2.53 + IncEdgeIt(const Graph&, const Edge&) { }
2.54 /// Next incident arc
2.55
2.56 /// Assign the iterator to the next incident arc
2.57 /// of the corresponding node.
2.58 - IncArcIt& operator++() { return *this; }
2.59 + IncEdgeIt& operator++() { return *this; }
2.60 };
2.61
2.62 /// The directed arc type.
2.63 @@ -720,14 +720,14 @@
2.64 /// \brief Base node of the iterator
2.65 ///
2.66 /// Returns the base node of the iterator
2.67 - Node baseNode(IncArcIt) const {
2.68 + Node baseNode(IncEdgeIt) const {
2.69 return INVALID;
2.70 }
2.71
2.72 /// \brief Running node of the iterator
2.73 ///
2.74 /// Returns the running node of the iterator
2.75 - Node runningNode(IncArcIt) const {
2.76 + Node runningNode(IncEdgeIt) const {
2.77 return INVALID;
2.78 }
2.79
3.1 --- a/lemon/concepts/graph_components.h Thu Feb 28 16:41:56 2008 +0100
3.2 +++ b/lemon/concepts/graph_components.h Thu Feb 28 17:06:02 2008 +0100
3.3 @@ -828,16 +828,16 @@
3.4 ///
3.5 /// This iterator goes trough the incident arcs of a certain
3.6 /// node of a graph.
3.7 - typedef GraphIncIt<Graph, Edge, Node, 'u'> IncArcIt;
3.8 + typedef GraphIncIt<Graph, Edge, Node, 'u'> IncEdgeIt;
3.9 /// \brief The base node of the iterator.
3.10 ///
3.11 /// Gives back the base node of the iterator.
3.12 - Node baseNode(const IncArcIt&) const { return INVALID; }
3.13 + Node baseNode(const IncEdgeIt&) const { return INVALID; }
3.14
3.15 /// \brief The running node of the iterator.
3.16 ///
3.17 /// Gives back the running node of the iterator.
3.18 - Node runningNode(const IncArcIt&) const { return INVALID; }
3.19 + Node runningNode(const IncEdgeIt&) const { return INVALID; }
3.20
3.21 /// @}
3.22
3.23 @@ -865,10 +865,10 @@
3.24 checkConcept<GraphItemIt<_Graph, typename _Graph::Edge>,
3.25 typename _Graph::EdgeIt >();
3.26 checkConcept<GraphIncIt<_Graph, typename _Graph::Edge,
3.27 - typename _Graph::Node, 'u'>, typename _Graph::IncArcIt>();
3.28 + typename _Graph::Node, 'u'>, typename _Graph::IncEdgeIt>();
3.29
3.30 typename _Graph::Node n;
3.31 - typename _Graph::IncArcIt ueit(INVALID);
3.32 + typename _Graph::IncEdgeIt ueit(INVALID);
3.33 n = graph.baseNode(ueit);
3.34 n = graph.runningNode(ueit);
3.35 }