Changeset 2335:27aa03cd3121 in lemon-0.x for lemon/suurballe.h

Timestamp:

01/08/07 11:39:59 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3123

Message:

New path concept and path structures

TODO: BellmanFord::negativeCycle()

File:

• lemon/suurballe.h (modified) (5 diffs)

lemon/suurballe.h

@@ -27 +27 @@
 #include <lemon/maps.h>
 #include <vector>
+#include <lemon/path.h>
 #include <lemon/ssp_min_cost_flow.h>
 
@@ -83 +84 @@
 
     //Container to store found paths
-    std::vector< std::vector<Edge> > paths;
+    std::vector<SimplePath<Graph> > paths;
 
   public :
@@ -135 +136 @@
           }
           n = G.target(e);
-          paths[j].push_back(e);
+          paths[j].addBack(e);
           reversed[e] = 1-reversed[e];
         }
@@ -171 +172 @@
     }
 
+    typedef SimplePath<Graph> Path; 
+
     /// \brief Read the found paths.
     ///
@@ -182 +185 @@
     /// (\c j can be 0 as well).
     ///
-    /// \param Path The type of the path structure to put the result
-    /// to (must meet lemon path concept).
-    /// \param p The path to put the result to.
     /// \param j Which path you want to get from the found paths (in a
     /// real application you would get the found paths iteratively).
-    template<typename Path>
-    void getPath(Path& p, size_t j){
-
-      p.clear();
-      if (j>paths.size()-1){
-        return;
-      }
-      typename Path::Builder B(p);
-      for(typename std::vector<Edge>::iterator i=paths[j].begin(); 
-          i!=paths[j].end(); ++i ){
-        B.pushBack(*i);
-      }
-
-      B.commit();
+    Path path(int j) const {
+      return paths[j];
+    }
+
+    /// \brief Gives back the number of the paths.
+    ///
+    /// Gives back the number of the constructed paths.
+    int pathNum() const {
+      return paths.size();
     }