From 0aedb0467af50ae7253cd635411c3d0aa19924c2 Mon Sep 17 00:00:00 2001 From: Squarege <1263174378@qq.com> Date: Sat, 1 Jul 2023 20:12:15 +0800 Subject: [PATCH] fixing style-check --- src/driving_distance/v4withPointsDD.c | 3 +-- .../v4withPoints_dd_driver.cpp | 25 ++++++++----------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/driving_distance/v4withPointsDD.c b/src/driving_distance/v4withPointsDD.c index 3156ebbcca..6e19e98942 100644 --- a/src/driving_distance/v4withPointsDD.c +++ b/src/driving_distance/v4withPointsDD.c @@ -57,9 +57,8 @@ void process( bool details, bool equicost, - MST_rt **result_tuples, + MST_rt **result_tuples, size_t *result_count) { - pgr_SPI_connect(); char* log_msg = NULL; char* notice_msg = NULL; diff --git a/src/driving_distance/v4withPoints_dd_driver.cpp b/src/driving_distance/v4withPoints_dd_driver.cpp index 7c6b09d1d7..efe9fde227 100644 --- a/src/driving_distance/v4withPoints_dd_driver.cpp +++ b/src/driving_distance/v4withPoints_dd_driver.cpp @@ -32,6 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "drivers/driving_distance/withPoints_dd_driver.h" +#include "c_types/mst_rt.h" + #include #include #include @@ -41,28 +43,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "withPoints/pgr_withPoints.hpp" #include "driving_distance/withPointsDD.hpp" -#include "c_types/mst_rt.h" - #include "cpp_common/pgr_alloc.hpp" char -estimate_drivingSide_dd(char driving_side, bool directed, char** err_msg){ +estimate_drivingSide_dd(char driving_side, bool directed, char** err_msg) { using pgrouting::pgr_msg; try { char d_side = static_cast(tolower(driving_side)); if (strchr("rlb", d_side) == NULL) { throw std::string("Invalid driving side specified!"); - } - else if (directed && d_side == 'b') { + } else if (directed && d_side == 'b') { throw std::string("Cannot use 'b' driving side with directed graph!"); - } - else{ + } else { return d_side; } } catch (const std::string &ex) { *err_msg = pgr_msg(ex.c_str()); - return '\0'; // Or some other appropriate default value + return '\0'; } catch(...) { *err_msg = pgr_msg("Caught unknown exception!"); return '\0'; @@ -161,9 +159,8 @@ do_withPointsDD( paths = pgr_drivingDistance( digraph, start_vids, distance, equiCost, log); - - pgrouting::functions::ShortestPath_tree spt; - results = spt.get_depths(digraph, paths, details); + pgrouting::functions::ShortestPath_tree spt; + results = spt.get_depths(digraph, paths, details); } else { pgrouting::UndirectedGraph undigraph(gType); undigraph.insert_edges(edges, total_edges); @@ -172,8 +169,8 @@ do_withPointsDD( paths = pgr_drivingDistance( undigraph, start_vids, distance, equiCost, log); - pgrouting::functions::ShortestPath_tree spt; - results = spt.get_depths(undigraph, paths, details); + pgrouting::functions::ShortestPath_tree spt; + results = spt.get_depths(undigraph, paths, details); } size_t count(results.size()); @@ -184,7 +181,7 @@ do_withPointsDD( return; } *return_tuples = pgr_alloc(count, (*return_tuples)); - for (size_t i = 0; i < count; i++) { + for (size_t i = 0; i < count; i++) { *((*return_tuples) + i) = results[i]; } (*return_count) = count;