Changeset 1130:0759d974de81 in lemon-main for lemon/bits/graph_adaptor_extender.h

Timestamp:

01/05/14 22:24:56 (10 years ago)

Author:

Gabor Gevay <ggab90@…>

Branch:

default

Phase:

public

Message:

STL style iterators (#325)

For

• graph types,
• graph adaptors,
• paths,
• iterable maps,
• LP rows/cols and
• active nodes is BellmanFord?

File:

• lemon/bits/graph_adaptor_extender.h (modified) (10 diffs)

lemon/bits/graph_adaptor_extender.h

@@ -86 +86 @@
     };
 
+    LemonRangeWrapper1<NodeIt, Adaptor> nodes() {
+      return LemonRangeWrapper1<NodeIt, Adaptor>(*this);
+    }
 
     class ArcIt : public Arc {
@@ -108 +111 @@
 
     };
+
+    LemonRangeWrapper1<ArcIt, Adaptor> arcs() {
+      return LemonRangeWrapper1<ArcIt, Adaptor>(*this);
+    }
 
 
@@ -133 +140 @@
     };
 
+    LemonRangeWrapper2<OutArcIt, Adaptor, Node> outArcs(const Node& u) const {
+      return LemonRangeWrapper2<OutArcIt, Adaptor, Node>(*this, u);
+    }
+
 
     class InArcIt : public Arc {
@@ -156 +167 @@
 
     };
+
+    LemonRangeWrapper2<InArcIt, Adaptor, Node> inArcs(const Node& u) const {
+      return LemonRangeWrapper2<InArcIt, Adaptor, Node>(*this, u);
+    }
 
     Node baseNode(const OutArcIt &e) const {
@@ -255 +270 @@
     };
 
+    LemonRangeWrapper1<NodeIt, Adaptor> nodes() {
+      return LemonRangeWrapper1<NodeIt, Adaptor>(*this);
+    }
+
 
     class ArcIt : public Arc {
@@ -277 +296 @@
 
     };
+
+    LemonRangeWrapper1<ArcIt, Adaptor> arcs() {
+      return LemonRangeWrapper1<ArcIt, Adaptor>(*this);
+    }
 
 
@@ -302 +325 @@
     };
 
+    LemonRangeWrapper2<OutArcIt, Adaptor, Node> outArcs(const Node& u) const {
+      return LemonRangeWrapper2<OutArcIt, Adaptor, Node>(*this, u);
+    }
+
 
     class InArcIt : public Arc {
@@ -326 +353 @@
     };
 
+    LemonRangeWrapper2<InArcIt, Adaptor, Node> inArcs(const Node& u) const {
+      return LemonRangeWrapper2<InArcIt, Adaptor, Node>(*this, u);
+    }
+
     class EdgeIt : public Parent::Edge {
       const Adaptor* _adaptor;
@@ -347 +378 @@
 
     };
+
+    LemonRangeWrapper1<EdgeIt, Adaptor> edges() {
+      return LemonRangeWrapper1<EdgeIt, Adaptor>(*this);
+    }
+
 
     class IncEdgeIt : public Edge {
@@ -373 +409 @@
     };
 
+    LemonRangeWrapper2<IncEdgeIt, Adaptor, Node> incEdges(const Node& u) const {
+      return LemonRangeWrapper2<IncEdgeIt, Adaptor, Node>(*this, u);
+    }
+
+
     Node baseNode(const OutArcIt &a) const {
       return Parent::source(a);