Merge pull request #1081 from codeSG/dag_bellman_parallel

Implemented functions for GSoC'18
pgRouting · Aug 1, 2018 · 28d3cf5 · 28d3cf5
2 parents 3daf896 + de802aa
commit 28d3cf5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/include/dagShortestPath/pgr_dagShortestPath.hpp b/include/dagShortestPath/pgr_dagShortestPath.hpp
@@ -91,11 +91,10 @@ class Pgr_dag {
              G &graph,
              int64_t start_vertex,
              const std::vector< int64_t > &end_vertex,
-             bool only_cost,
-             size_t n_goals = std::numeric_limits<size_t>::max()) {
+             bool only_cost) {
          // adjust predecessors and distances vectors
          clear();
-
+         size_t n_goals = std::numeric_limits<size_t>::max();
          predecessors.resize(graph.num_vertices());
          distances.resize(
                  graph.num_vertices(),
@@ -156,16 +155,15 @@ class Pgr_dag {
              G &graph,
              const std::vector< int64_t > &start_vertex,
              const std::vector< int64_t > &end_vertex,
-             bool only_cost,
-             size_t n_goals = std::numeric_limits<size_t>::max()) {
+             bool only_cost) {
          // a call to 1 to many is faster for each of the sources
          std::deque<Path> paths;
 
          for (const auto &start : start_vertex) {
              auto r_paths = dag(
                      graph,
                      start, end_vertex,
-                     only_cost, n_goals);
+                     only_cost);
              paths.insert(paths.begin(), r_paths.begin(), r_paths.end());
          }
 
@@ -193,7 +191,7 @@ class Pgr_dag {
                      boost::predecessor_map(&predecessors[0])
                      .weight_map(get(&G::G_T_E::cost, graph.graph))
                      .distance_map(&distances[0])
-                     );
+                     .visitor(dijkstra_one_goal_visitor(target)));
          } catch(found_goals &) {
              return true;
          } catch (boost::exception const& ex) {
@@ -220,7 +218,7 @@ class Pgr_dag {
                      .weight_map(get(&G::G_T_E::cost, graph.graph))
                      .distance_map(&distances[0])
                      .distance_inf(std::numeric_limits<double>::infinity())
-                     );
+                     .visitor(dijkstra_many_goal_visitor(targets, n_goals)));
          } catch(found_goals &) {
              return true;
          } catch (boost::exception const& ex) {
@@ -273,7 +271,7 @@ class Pgr_dag {
      std::ostringstream log;
      //@}
 
-     /*
+
      //! @name Stopping classes
      //@{
      //! class for stopping when 1 target is found
@@ -317,7 +315,7 @@ class Pgr_dag {
           std::set< V > m_goals;
           size_t m_n_goals;
      };
-     */
+
 };
 
 #endif  // INCLUDE_DIJKSTRA_PGR_DIJKSTRA_HPP_
diff --git a/...agShortestPath/doc-dagShortestPath.result → ...ortestPath/doc-pgr_dagShortestPath.result b/...agShortestPath/doc-dagShortestPath.result → ...ortestPath/doc-pgr_dagShortestPath.result
@@ -1,5 +1,7 @@
 BEGIN;
 BEGIN
+SET client_min_messages TO NOTICE;
+SET
 -- q1
 SELECT * FROM pgr_dagShortestPath(
     'SELECT id, source, target, cost FROM edge_table',
@@ -46,8 +48,8 @@ SELECT * FROM pgr_dagShortestPath(
 
 -- q4
 SELECT * FROM pgr_dagShortestPath(
-'SELECT id, source, target, cost FROM edge_table2',
-ARRAY[1, 4],ARRAY[12,6]
+    'SELECT id, source, target, cost FROM edge_table',
+    ARRAY[1, 4],ARRAY[12,6]
 );
  seq | path_seq | node | edge | cost | agg_cost
 -----+----------+------+------+------+----------

diff --git a/...ShortestPath/doc-dagShortestPath.test.sql → ...testPath/doc-pgr_dagShortestPath.test.sql b/...ShortestPath/doc-dagShortestPath.test.sql → ...testPath/doc-pgr_dagShortestPath.test.sql
@@ -7,7 +7,7 @@ SELECT * FROM pgr_dagShortestPath(
 
 \echo -- q2
 SELECT * FROM pgr_dagShortestPath(
-    'SELECT id, source, target, costt FROM edge_table',
+    'SELECT id, source, target, cost FROM edge_table',
     1, ARRAY[5,6]
 );
 \echo -- q3

diff --git a/test/dagShortestPath/test.conf b/test/dagShortestPath/test.conf
@@ -2,13 +2,13 @@
 
 %main::tests = (
     'any' => {
-        'comment' => 'Dijkstra test for any versions.',
+        'comment' => 'pgr_dagShortestPath',
         'data' => [ ],
         'tests' => [qw(
-            doc-dagShortestPath
+            doc-pgr_dagShortestPath
             )],
         'documentation' => [qw(
-            doc-dagShortestPath
+            doc-pgr_dagShortestPath
             )]
     },