Merge pull request #314 from AbhinJ/Abhinj-week-5

GSoC 2023: Abhinav Jain Week 5

Author: AbhinJ

docqueries/withPoints/CMakeLists.txt

@@ -4,6 +4,7 @@ SET(LOCAL_FILES
     doc-pgr_withPointsCost
     doc-pgr_withPointsDD
     doc-pgr_withPointsKSP
+    doc-pgr_withPointsKSPv3.6
     doc-pgr_withPoints
     withPointsVia
     )

docqueries/withPoints/test.conf

@@ -5,12 +5,7 @@
         'comment' => 'Function test for any versions.',
         'data' => ['sampledata.data'],
         'tests' => [qw(
-            doc-pgr_withPoints
-            doc-pgr_withPointsCost
-            doc-pgr_withPointsCostMatrix
-            doc-pgr_withPointsDD
-            doc-pgr_withPointsKSP
-            withPointsVia
+            doc-pgr_withPointsKSPv3.6
             )],
         'documentation' => [qw(
             doc-pgr_withPoints

include/cpp_common/basePath_SSEC.hpp

@@ -138,6 +138,10 @@ class Path {
             Path_rt **ret_path,
             size_t &sequence, int routeId) const;
 
+    void get_pg_withPointsKSP_path(
+            Path_rt **ret_path,
+            size_t &sequence) const;
+
     void get_pg_turn_restricted_path(
             Path_rt **ret_path,
             size_t &sequence, int routeId) const;

src/common/basePath_SSEC.cpp

@@ -280,6 +280,24 @@ void Path::get_pg_ksp_path(
     }
 }
 
+/* used by withPointsKSP */
+void Path::get_pg_withPointsKSP_path(
+        Path_rt **ret_path,
+        size_t &sequence) const {
+    for (unsigned int i = 0; i < path.size(); i++) {
+        (*ret_path)[sequence].seq = static_cast<int>(i + 1);
+        (*ret_path)[sequence].start_id = start_id();
+        (*ret_path)[sequence].end_id = end_id();
+        (*ret_path)[sequence].node = path[i].node;
+        (*ret_path)[sequence].edge = path[i].edge;
+        (*ret_path)[sequence].cost = path[i].cost;
+        (*ret_path)[sequence].agg_cost = (i == 0)?
+            0 :
+            (*ret_path)[sequence-1].agg_cost +  path[i-1].cost;
+        sequence++;
+    }
+}
+
 /* used by turn restricted */
 void Path::get_pg_turn_restricted_path(
         Path_rt **ret_path,

src/ksp/withPoints_ksp_driver.cpp

@@ -159,11 +159,10 @@ pgr_do_withPointsKsp(
         *return_tuples = pgr_alloc(count, (*return_tuples));
 
         size_t sequence = 0;
-        int route_id = 0;
+        // int route_id = 0;
         for (const auto &path : paths) {
             if (path.size() > 0)
-                path.get_pg_ksp_path(return_tuples, sequence, route_id);
-            ++route_id;
+                path.get_pg_withPointsKSP_path(return_tuples, sequence);
         }
 
         if (count != sequence) {