(maxFlow) Preparing functions for the new process and driver

Author: cvvergara

include/c_common/enums.h

@@ -44,7 +44,9 @@ enum Which {
     PRIM = 510, PRIMDD, PRIMDFS, PRIMBFS,
     DFS = 520,
     BFS = 530,
-    DIJKSTRADD = 540
+    DIJKSTRADD = 540,
+    MAXFLOW, PUSHRELABEL, BOYKOV, EDMONDSKARP
+
 };
 
 #endif  // INCLUDE_C_COMMON_ENUMS_H_

include/cpp_common/combinations.hpp

@@ -62,6 +62,9 @@ get_combinations(const std::vector<II_t_rt>&);
 std::map<int64_t, std::set<int64_t>>
 get_combinations(const std::string&, ArrayType*, ArrayType*, bool, bool&);
 
+std::map<int64_t, std::set<int64_t>>
+get_combinations(const std::string&, ArrayType*, ArrayType*, bool);
+
 std::map<int64_t, std::set<int64_t>>
 get_combinations(const char*, ArrayType*, ArrayType*, bool);
 

include/cpp_common/to_postgres.hpp

@@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "c_types/routes_t.h"
 #include "c_types/path_rt.h"
 #include "c_types/mst_rt.h"
+#include "c_types/flow_t.h"
 
 #include "cpp_common/path.hpp"
 #include "cpp_common/base_graph.hpp"
@@ -68,6 +69,11 @@ size_t get_tuples(const std::deque<pgrouting::Path>&, Path_rt*&);
  */
 size_t get_tuples(const std::deque<pgrouting::Path>&, MST_rt*&);
 
+/*
+ * @brief get tuples for Flow_t
+ */
+size_t get_tuples(const std::vector<Flow_t>&, Flow_t*&);
+
 /*
  * @brief get tuples for spanning tree driver
  */

include/cpp_common/utilities.hpp

@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "c_common/enums.h"
 #include "c_types/mst_rt.h"
+#include "c_types/flow_t.h"
 
 namespace pgrouting {
 
@@ -42,6 +43,7 @@ std::string get_name(Which, bool, bool, bool);
 char estimate_drivingSide(char, Which);
 void get_new_queries(const std::string&, const std::string&, std::string&, std::string&);
 std::vector<MST_rt> only_root_result(const std::set<int64_t>&);
+std::vector<Flow_t> only_maxFlow_result(int64_t);
 
 }  //  namespace pgrouting
 

src/cpp_common/combinations.cpp

@@ -182,5 +182,13 @@ get_combinations(
     return result;
 }
 
+std::map<int64_t , std::set<int64_t>>
+get_combinations(
+        const std::string &combinations_sql,
+        ArrayType* startsArr, ArrayType* endsArr, bool normal) {
+    bool is_matrix = false;
+    return get_combinations(combinations_sql, startsArr, endsArr, normal, is_matrix);
+}
+
 }  // namespace utilities
 }  // namespace pgrouting

src/cpp_common/to_postgres.cpp

@@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "c_types/routes_t.h"
 #include "c_types/path_rt.h"
 #include "c_types/mst_rt.h"
+#include "c_types/flow_t.h"
 
 #include "cpp_common/path.hpp"
 #include "cpp_common/alloc.hpp"
@@ -242,6 +243,23 @@ get_tuples(
     return count;
 }
 
+size_t
+get_tuples(
+        const std::vector<Flow_t> &results,
+        Flow_t* &tuples) {
+    pgassert(!tuples);
+
+    auto count = results.size();
+    if (count == 0) return 0;
+
+    tuples = pgr_alloc(count, tuples);
+
+    for (size_t i = 0; i < count; i++) {
+        tuples[i] = results[i];
+    }
+    return count;
+}
+
 
 size_t
 get_tuples(

src/cpp_common/utilities.cpp

@@ -92,6 +92,18 @@ get_name(Which which) {
         case DIJKSTRADD:
             return "pgr_drivingDistance";
             break;
+        case MAXFLOW:
+            return "pgr_maxFlow";
+            break;
+        case PUSHRELABEL:
+            return "pgr_pushRelabel";
+            break;
+        case BOYKOV:
+            return "pgr_boykovKolmogorov";
+            break;
+        case EDMONDSKARP:
+            return "pgr_edmondsKarp";
+            break;
         default:
             return "unknown";
             break;
@@ -213,4 +225,11 @@ only_root_result(const std::set<int64_t> &vids) {
     return results;
 }
 
+std::vector<Flow_t>
+only_maxFlow_result(int64_t maxFlow) {
+    std::vector<Flow_t> results;
+    results.push_back({-1, -1, -1, maxFlow, -1, 0, 0});
+    return results;
+}
+
 }  // namespace pgrouting