Ticket #325: stl-iterators-Bellman-Ford-79271f3a7b98.patch

contrib/stlit_test/stlit_test.cc

@@ -8 +8 @@
 #include <lemon/smart_graph.h>
 #include <lemon/path.h>
 #include <lemon/bfs.h>
+#include <lemon/bellman_ford.h>
+#include <lemon/euler.h>
 
 
 using namespace std;
@@ -141 +143 @@
       cout<<g4.id(g4.target(a))<<endl;
   }
 
+//  cout<<endl;
+
+//  {
+//    SmartDigraph g;
+//    auto u=g.addNode(), v=g.addNode();
+//    g.addArc(u,v); g.addArc(u,v);
+//    int c=0;
+//    for(auto a: conArcs(g,u,v))
+//    //for(ConArcIt<SmartDigraph> a(g,u,v); a!=INVALID; ++a)
+//      c++;
+//    cout<<c<<endl;
+//  }
+
+//  {
+//    SmartDigraph g;
+//    auto u=g.addNode(), v=g.addNode();
+//    g.addArc(u,v);  g.addArc(v,u);
+//    //for(auto a: diEulerTour(g,u))
+//    //for(auto a=diEulerTour(g,u).begin(); a!=INVALID; ++a)
+//    //  cout<<g.id(g.target(a))<<endl;
+//    auto t = diEulerTour(g,u);
+//    auto a = t.begin();
+//  }
+
+
+
   return 0;
 }
+
+
+void checkBellmanFordCompile()
+{
+  typedef int Value;
+  typedef concepts::Digraph Digraph;
+  typedef concepts::ReadMap<Digraph::Arc,Value> LengthMap;
+  typedef BellmanFord<Digraph, LengthMap> BF;
+
+  Digraph gr;
+  LengthMap length;
+
+  {
+    BF bf_test(gr,length);
+    const BF& const_bf_test = bf_test;
+
+    for (BF::ActiveIt it(const_bf_test); it != INVALID; ++it) {}
+    for (BF::ActiveIt it(bf_test); it != INVALID; ++it) {}
+  }
+}

lemon/bellman_ford.h

@@ -690 +690 @@
       int _index;
     };
 
+    /// \brief Gets the collection of the active nodes.
+    ///
+    /// This function can be used for iterating on the active nodes of the
+    /// Bellman-Ford algorithm after the last phase.
+    /// These nodes should be checked in the next phase to
+    /// find augmenting arcs outgoing from them.
+    /// It returns a wrapped ActiveIt, which looks
+    /// like an STL container (by having begin() and end())
+    /// which you can use in range-based for loops, stl algorithms, etc.
+    LemonRangeWrapper1<ActiveIt, BellmanFord>
+        activeNodes(const BellmanFord& algorithm) const {
+      return LemonRangeWrapper1<ActiveIt, BellmanFord>(algorithm);
+    }
+
+
     /// \name Query Functions
     /// The result of the Bellman-Ford algorithm can be obtained using these
     /// functions.\n