Fixing some issues from rabbit

Author: cvvergara

NEWS.md

@@ -19,7 +19,7 @@ To see all issues & pull requests closed by this release see the
 * [#3055](https://github.com/pgRouting/pgrouting/issues/3055): bdDijkstra: use the shortest_path process and driver
 * [#3056](https://github.com/pgRouting/pgrouting/issues/3056): edwardMoore: use the shortest_path process and driver
 * [#3060](https://github.com/pgRouting/pgrouting/issues/3060): dagShortestPath: use the shortest_path process and driver
-* [#3064](https://github.com/pgRouting/pgrouting/issues/3064): Astar: create an use a process & driverAstar
+* [#3064](https://github.com/pgRouting/pgrouting/issues/3064): Astar: create and use a process and driver for Astar
 
 ## pgRouting 4.0
 

doc/src/release_notes.rst

@@ -44,7 +44,7 @@ To see all issues & pull requests closed by this release see the
 * :issue:`3055`: bdDijkstra: use the shortest_path process and driver
 * :issue:`3056`: edwardMoore: use the shortest_path process and driver
 * :issue:`3060`: dagShortestPath: use the shortest_path process and driver
-* :issue:`3064`: Astar: create an use a process & driverAstar
+* :issue:`3064`: Astar: create and use a process and driver for Astar
 
 pgRouting 4.0
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

include/c_common/enums.h

@@ -37,7 +37,7 @@ enum Which {
     FLOYD = 31, JOHNSON,
     /** metrics **/
     BANDWIDTH,
-    /* with edges that have x y*/
+    /** with edges that have x y */
     ASTAR = 400, BDASTAR
 };
 

src/astar/astar_driver.cpp

@@ -104,7 +104,6 @@ void do_astar(
         hint = combinations_sql;
         auto combinations = get_combinations(combinations_sql, starts, ends, normal, is_matrix);
         hint = "";
-        log << "is matrix" << is_matrix;
 
         if (combinations.empty() && !combinations_sql.empty()) {
             notice << "No (source, target) pairs found";

src/astar/astar_process.cpp

@@ -92,8 +92,6 @@ void pgr_process_astar(
     time_msg(name.c_str(), start_t, clock());
 
     if (!err.str().empty() && (*result_tuples)) {
-        if (*result_tuples) pfree(*result_tuples);
-        (*result_tuples) = nullptr;
         (*result_count) = 0;
     }
 

src/cpp_common/combinations.cpp

@@ -158,8 +158,12 @@ get_combinations(
     using pgrouting::pgget::get_combinations;
     std::map<int64_t, std::set<int64_t>> result;
 
-    auto starts = startsArr? (normal? get_intSet(startsArr) : get_intSet(endsArr))   : std::set<int64_t>();
-    auto ends =     endsArr? (normal? get_intSet(endsArr)   : get_intSet(startsArr)) : std::set<int64_t>();
+    std::set<int64_t> starts;
+    std::set<int64_t> end;
+    if (startsArr && endsArr) {
+        starts = normal? get_intSet(startsArr) : get_intSet(endsArr);
+        ends   = normal? get_intSet(endsArr)   : get_intSet(startsArr);
+    }
 
     /* TODO Read query storing like std::map<int64_t , std::set<int64_t>> */
     /* queries are stored in vectors */

src/cpp_common/utilities.cpp

@@ -75,7 +75,7 @@ get_name(Which which, bool is_only_cost, bool is_near, bool is_matrix) {
             break;
         case BDDIJKSTRA :
             base = "pgr_bdDijkstra";
-            suffix = std::string(is_only_cost? "Cost" : "") + (is_matrix? "Matrix" : "");
+            suffix = std::string(is_only_cost? "Cost" : "") + (is_only_cost && is_matrix? "Matrix" : "");
             break;
         case EDWARDMOORE:
             base = "pgr_edwardMoore";
@@ -86,7 +86,7 @@ get_name(Which which, bool is_only_cost, bool is_near, bool is_matrix) {
         case OLD_WITHPOINTS:
         case WITHPOINTS:
             base = "pgr_withPoints";
-            suffix = std::string(is_only_cost? "Cost" : "") + (is_matrix? "Matrix" : "");
+            suffix = std::string(is_only_cost? "Cost" : "") + (is_only_cost && is_matrix? "Matrix" : "");
             break;
         default : base = "unknown";
     }
@@ -106,7 +106,7 @@ get_name(Which which, bool is_only_cost, bool is_matrix) {
             break;
         case BDASTAR :
             base = "pgr_bdAstar";
-            suffix = std::string(is_only_cost? "Cost" : "") + (is_matrix? "Matrix" : "");
+            suffix = std::string(is_only_cost? "Cost" : "") + (is_only_cost && is_matrix? "Matrix" : "");
             break;
         default : base = "unknown";
     }