slipping a conversion to vector

Author: cvvergara

include/components/components.hpp

@@ -43,7 +43,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "cpp_common/base_graph.hpp"
 #include "cpp_common/identifiers.hpp"
-#include "components/componentsResult.hpp"
 
 namespace pgrouting {
 namespace algorithms {
@@ -55,11 +54,11 @@ std::vector<std::vector<int64_t>>
 pgr_connectedComponents(pgrouting::UndirectedGraph &graph);
 
 //! Strongly Connected Components Vertex Version
-std::vector<II_t_rt>
+std::vector<std::vector<int64_t>>
 strongComponents(pgrouting::DirectedGraph &graph);
 
 //! Biconnected Components (for undirected)
-std::vector<II_t_rt>
+std::vector<std::vector<int64_t>>
 biconnectedComponents(pgrouting::UndirectedGraph &graph);
 
 //! Articulation Points

src/coloring/coloring_driver.cpp

@@ -108,7 +108,7 @@ void do_coloring(
             digraph.insert_edges(edges);
             switch (which) {
                 case STRONGCOMPONENTS:
-                    results = strongComponents(digraph);
+                    component_results = strongComponents(digraph);
                     break;
                 default:
                     err << __FILE_NAME__ << ": Unknown function with name '" << get_name(which)
@@ -129,7 +129,7 @@ void do_coloring(
                     results = sequentialVertexColoring(undigraph);
                     break;
                 case BICONNECTEDCOMPONENTS:
-                    results = biconnectedComponents(undigraph);
+                    component_results = biconnectedComponents(undigraph);
                     break;
                 case MAKECONNECTED:
                     {

src/components/CMakeLists.txt

@@ -9,6 +9,5 @@ ADD_LIBRARY(components OBJECT
     bridges.c
     makeConnected.c
 
-    componentsResult.cpp
     components.cpp
 )

src/components/components.cpp

@@ -48,10 +48,10 @@ std::vector<std::vector<int64_t>>
 pgr_connectedComponents(pgrouting::UndirectedGraph &graph) {
     if (boost::num_vertices(graph.graph) == 0) return {};
     typedef pgrouting::UndirectedGraph::V V;
-    // perform the algorithm
+
     std::vector<V> components(boost::num_vertices(graph.graph));
     size_t num_comps = 0;
-    /* abort in case of an interruption occurs (e.g. the query is being cancelled) */
+
     CHECK_FOR_INTERRUPTS();
     try {
         num_comps = boost::connected_components(graph.graph, components.data());
@@ -69,13 +69,14 @@ pgr_connectedComponents(pgrouting::UndirectedGraph &graph) {
 }
 
 //! Strongly Connected Components Vertex Version
-std::vector<II_t_rt> strongComponents(pgrouting::DirectedGraph &graph) {
+std::vector<std::vector<int64_t>>
+strongComponents(pgrouting::DirectedGraph &graph) {
   typedef pgrouting::UndirectedGraph::V V;
-  // perform the algorithm
+
   std::vector<V> components(num_vertices(graph.graph));
   size_t num_comps = 0;
-  /* abort in case of an interruption occurs (e.g. the query is being cancelled)
-   */
+
+
   CHECK_FOR_INTERRUPTS();
   try {
     num_comps = boost::strong_components(
@@ -86,22 +87,23 @@ std::vector<II_t_rt> strongComponents(pgrouting::DirectedGraph &graph) {
     throw;
   }
 
-  // get the results
+
   std::vector<std::vector<int64_t>> results(num_comps);
   for (auto vd : boost::make_iterator_range(vertices(graph.graph))) {
     results[components[vd]].push_back(graph[vd].id);
   }
 
-  return detail::componentsResult(results);
+  return results;
 }
 
 //! Biconnected Components
-std::vector<II_t_rt> biconnectedComponents(pgrouting::UndirectedGraph &graph) {
+std::vector<std::vector<int64_t>>
+biconnectedComponents(pgrouting::UndirectedGraph &graph) {
   using G = pgrouting::UndirectedGraph;
   using E = G::E;
   using Edge_map = std::map<E, size_t>;
 
-  // perform the algorithm
+
   Edge_map bicmp_map;
   boost::associative_property_map<Edge_map> bimap(bicmp_map);
   size_t num_comps = 0;
@@ -117,17 +119,15 @@ std::vector<II_t_rt> biconnectedComponents(pgrouting::UndirectedGraph &graph) {
     results[bimap[ed]].push_back(graph[ed].id);
   }
 
-  return detail::componentsResult(results);
+  return results;
 }
 
 Identifiers<int64_t> articulationPoints(pgrouting::UndirectedGraph &graph) {
   using G = pgrouting::UndirectedGraph;
   using V = G::V;
-  /* abort in case of an interruption occurs (e.g. the query is being cancelled)
-   */
+
   CHECK_FOR_INTERRUPTS();
 
-  // perform the algorithm
   std::vector<V> art_points;
   try {
 #ifndef __clang_analyzer__
@@ -167,14 +167,14 @@ Identifiers<int64_t> bridges(pgrouting::UndirectedGraph &graph) {
     if (boost::num_vertices(graph.graph) == 0) return bridge_edges;
     std::vector<V> components(boost::num_vertices(graph.graph));
     size_t ini_comps = 0;
-    /* abort in case of an interruption occurs (e.g. the query is being cancelled) */
+
     CHECK_FOR_INTERRUPTS();
     try {
         ini_comps = boost::connected_components(graph.graph, components.data());
     } catch (...) {
         throw;
     }
-    /* abort in case of an interruption occurs (e.g. the query is being cancelled) */
+
     CHECK_FOR_INTERRUPTS();
     std::vector<V> art_points;
     try {