Ticket #325: stl-iterators-adaptors-72900babc6c2.patch

contrib/stlit_test/stlit_test.cc

@@ -14 +14 @@
 #include <lemon/maps.h>
 //#include <lemon/matching.h>
 #include <lemon/glpk.h>
+#include <lemon/adaptors.h>
 
 
 using namespace std;
@@ -69 +70 @@
   for(auto u: g.nodes())
     cout<<g.id(u)<<endl;
 
+
   /*//Test postincrement
   for(auto it=g.nodes().begin(); it!=g.nodes().end(); it++) {
     auto u=*it;
@@ -90 +92 @@
 
   cout<<endl;
 
+  ReverseDigraph<ListDigraph> gr(g);
+  for(auto u: gr.nodes()) {
+    //cout<<":"<<g.id(u)<<endl;
+    for(auto v: gr.outArcs(u))
+      cout<<g.id(u)<<":"<<g.id(v)<<endl;
+  }
+  cout<<endl;
+
+  Undirector<ListDigraph> gu(g);
+  for(auto u: gu.nodes()) {
+    //cout<<":"<<g.id(u)<<endl;
+    for(auto v: gu.incEdges(u))
+      cout<<g.id(u)<<"::"<<g.id(v)<<endl;
+  }
+  cout<<endl;
+
 
   LemonItWrapper<ListDigraph::NodeIt> st1 = g.nodes().begin();
   //auto st1 = g.nodes().begin();

lemon/bits/graph_adaptor_extender.h

@@ -85 +85 @@
 
     };
 
+    LemonRangeWrapper1<NodeIt, Adaptor> nodes() {
+      return LemonRangeWrapper1<NodeIt, Adaptor>(*this);
+    }
 
     class ArcIt : public Arc {
       const Adaptor* _adaptor;
@@ -108 +111 @@
 
     };
 
+    LemonRangeWrapper1<ArcIt, Adaptor> arcs() {
+      return LemonRangeWrapper1<ArcIt, Adaptor>(*this);
+    }
+
 
     class OutArcIt : public Arc {
       const Adaptor* _adaptor;
@@ -132 +139 @@
 
     };
 
+    LemonRangeWrapper2<OutArcIt, Adaptor, Node> outArcs(const Node& u) const {
+      return LemonRangeWrapper2<OutArcIt, Adaptor, Node>(*this, u);
+    }
+
 
     class InArcIt : public Arc {
       const Adaptor* _adaptor;
@@ -156 +167 @@
 
     };
 
+    LemonRangeWrapper2<InArcIt, Adaptor, Node> inArcs(const Node& u) const {
+      return LemonRangeWrapper2<InArcIt, Adaptor, Node>(*this, u);
+    }
+
     Node baseNode(const OutArcIt &e) const {
       return Parent::source(e);
     }
@@ -254 +269 @@
 
     };
 
+    LemonRangeWrapper1<NodeIt, Adaptor> nodes() {
+      return LemonRangeWrapper1<NodeIt, Adaptor>(*this);
+    }
+
 
     class ArcIt : public Arc {
       const Adaptor* _adaptor;
@@ -277 +296 @@
 
     };
 
+    LemonRangeWrapper1<ArcIt, Adaptor> arcs() {
+      return LemonRangeWrapper1<ArcIt, Adaptor>(*this);
+    }
+
 
     class OutArcIt : public Arc {
       const Adaptor* _adaptor;
@@ -301 +324 @@
 
     };
 
+    LemonRangeWrapper2<OutArcIt, Adaptor, Node> outArcs(const Node& u) const {
+      return LemonRangeWrapper2<OutArcIt, Adaptor, Node>(*this, u);
+    }
+
 
     class InArcIt : public Arc {
       const Adaptor* _adaptor;
@@ -325 +352 @@
 
     };
 
+    LemonRangeWrapper2<InArcIt, Adaptor, Node> inArcs(const Node& u) const {
+      return LemonRangeWrapper2<InArcIt, Adaptor, Node>(*this, u);
+    }
+
     class EdgeIt : public Parent::Edge {
       const Adaptor* _adaptor;
     public:
@@ -347 +378 @@
 
     };
 
+    LemonRangeWrapper1<EdgeIt, Adaptor> edges() {
+      return LemonRangeWrapper1<EdgeIt, Adaptor>(*this);
+    }
+
+
     class IncEdgeIt : public Edge {
       friend class GraphAdaptorExtender;
       const Adaptor* _adaptor;
@@ -372 +408 @@
       }
     };
 
+    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);
     }