Changeset 1131:4add05447ca0 in lemon-main for lemon
- Timestamp:
- 04/14/15 08:39:40 (9 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- lemon
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/bellman_ford.h
r1130 r1131 702 702 /// which you can use in range-based for loops, STL algorithms, etc. 703 703 LemonRangeWrapper1<ActiveIt, BellmanFord> 704 activeNodes(const BellmanFord& algorithm) const {705 return LemonRangeWrapper1<ActiveIt, BellmanFord>( algorithm);704 activeNodes() const { 705 return LemonRangeWrapper1<ActiveIt, BellmanFord>(*this); 706 706 } 707 707 -
lemon/bits/edge_set_extender.h
r1092 r1131 114 114 }; 115 115 116 LemonRangeWrapper1<NodeIt, Digraph> nodes() const { 117 return LemonRangeWrapper1<NodeIt, Digraph>(*this); 118 } 116 119 117 120 class ArcIt : public Arc { … … 137 140 }; 138 141 142 LemonRangeWrapper1<ArcIt, Digraph> arcs() const { 143 return LemonRangeWrapper1<ArcIt, Digraph>(*this); 144 } 139 145 140 146 class OutArcIt : public Arc { … … 161 167 }; 162 168 169 LemonRangeWrapper2<OutArcIt, Digraph, Node> outArcs(const Node& u) const { 170 return LemonRangeWrapper2<OutArcIt, Digraph, Node>(*this, u); 171 } 163 172 164 173 class InArcIt : public Arc { … … 184 193 185 194 }; 195 196 LemonRangeWrapper2<InArcIt, Digraph, Node> inArcs(const Node& u) const { 197 return LemonRangeWrapper2<InArcIt, Digraph, Node>(*this, u); 198 } 186 199 187 200 // \brief Base node of the iterator … … 373 386 }; 374 387 388 LemonRangeWrapper1<NodeIt, Graph> nodes() const { 389 return LemonRangeWrapper1<NodeIt, Graph>(*this); 390 } 375 391 376 392 class ArcIt : public Arc { … … 396 412 }; 397 413 414 LemonRangeWrapper1<ArcIt, Graph> arcs() const { 415 return LemonRangeWrapper1<ArcIt, Graph>(*this); 416 } 398 417 399 418 class OutArcIt : public Arc { … … 420 439 }; 421 440 441 LemonRangeWrapper2<OutArcIt, Graph, Node> outArcs(const Node& u) const { 442 return LemonRangeWrapper2<OutArcIt, Graph, Node>(*this, u); 443 } 422 444 423 445 class InArcIt : public Arc { … … 444 466 }; 445 467 468 LemonRangeWrapper2<InArcIt, Graph, Node> inArcs(const Node& u) const { 469 return LemonRangeWrapper2<InArcIt, Graph, Node>(*this, u); 470 } 446 471 447 472 class EdgeIt : public Parent::Edge { … … 466 491 467 492 }; 493 494 LemonRangeWrapper1<EdgeIt, Graph> edges() const { 495 return LemonRangeWrapper1<EdgeIt, Graph>(*this); 496 } 468 497 469 498 class IncEdgeIt : public Parent::Edge { … … 491 520 } 492 521 }; 522 523 LemonRangeWrapper2<IncEdgeIt, Graph, Node> incEdges(const Node& u) const { 524 return LemonRangeWrapper2<IncEdgeIt, Graph, Node>(*this, u); 525 } 493 526 494 527 // \brief Base node of the iterator -
lemon/bits/graph_adaptor_extender.h
r1130 r1131 86 86 }; 87 87 88 LemonRangeWrapper1<NodeIt, Adaptor> nodes() {88 LemonRangeWrapper1<NodeIt, Adaptor> nodes() const { 89 89 return LemonRangeWrapper1<NodeIt, Adaptor>(*this); 90 90 } … … 112 112 }; 113 113 114 LemonRangeWrapper1<ArcIt, Adaptor> arcs() {114 LemonRangeWrapper1<ArcIt, Adaptor> arcs() const { 115 115 return LemonRangeWrapper1<ArcIt, Adaptor>(*this); 116 116 } … … 270 270 }; 271 271 272 LemonRangeWrapper1<NodeIt, Adaptor> nodes() {272 LemonRangeWrapper1<NodeIt, Adaptor> nodes() const { 273 273 return LemonRangeWrapper1<NodeIt, Adaptor>(*this); 274 274 } … … 297 297 }; 298 298 299 LemonRangeWrapper1<ArcIt, Adaptor> arcs() {299 LemonRangeWrapper1<ArcIt, Adaptor> arcs() const { 300 300 return LemonRangeWrapper1<ArcIt, Adaptor>(*this); 301 301 } … … 379 379 }; 380 380 381 LemonRangeWrapper1<EdgeIt, Adaptor> edges() {381 LemonRangeWrapper1<EdgeIt, Adaptor> edges() const { 382 382 return LemonRangeWrapper1<EdgeIt, Adaptor>(*this); 383 383 } -
lemon/config.h.in
r1108 r1131 1 1 #define LEMON_VERSION "@PROJECT_VERSION@" 2 2 #cmakedefine LEMON_HAVE_LONG_LONG 1 3 4 #cmakedefine LEMON_CXX11 1 3 5 4 6 #cmakedefine LEMON_HAVE_LP 1 -
lemon/list_graph.h
r1130 r1131 1210 1210 ListGraph() {} 1211 1211 1212 typedef Parent:: OutArcIt IncEdgeIt;1212 typedef Parent::IncEdgeIt IncEdgeIt; 1213 1213 1214 1214 /// \brief Add a new node to the graph. … … 2137 2137 ListBpGraph() {} 2138 2138 2139 typedef Parent:: OutArcIt IncEdgeIt;2139 typedef Parent::IncEdgeIt IncEdgeIt; 2140 2140 2141 2141 /// \brief Add a new red node to the graph.
Note: See TracChangeset
for help on using the changeset viewer.