Merge pull request #26 from nike0good/fix-compilation

cvvergara · web-flow · commit 44cd29c436c2 · 2019-08-05T11:48:42.000-05:00
pgr_transitiveClosure GSOC-2019 week 11-PR1
diff --git a/configuration.conf b/configuration.conf
@@ -37,8 +37,8 @@ chinese             | Y | Y | Y
 spanningTree        | Y | Y | Y
 mincut              | Y | Y | Y
 version             | Y | Y | Y
-topologicalSort     | Y | Y | N
-transitiveClosure   | Y | Y | N
+topologicalSort     | Y | Y | Y
+#transitiveClosure   | Y | Y | N
 
 
 #----------------------
diff --git a/doc/topologicalSort/CMakeLists.txt b/doc/topologicalSort/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 SET(LOCAL_FILES
-    pgr_toplogicalSort.rst
+    pgr_topologicalSort.rst
     )
 
 foreach (f ${LOCAL_FILES})
diff --git a/doc/topologicalSort/doc-pgr_toplogicalSort.queries b/doc/topologicalSort/doc-pgr_toplogicalSort.queries
diff --git a/docqueries/topologicalSort/CMakeLists.txt b/docqueries/topologicalSort/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Do not use extensions
+SET(LOCAL_FILES
+    doc-topologicalSort
+    )
+
+foreach (f ${LOCAL_FILES})
+    configure_file("${f}.result" "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}.queries")
+    list(APPEND LOCAL_DOC_FILES  "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}.queries")
+endforeach()
+
+set(PGROUTING_DOC_FILES ${PGROUTING_DOC_FILES} ${LOCAL_DOC_FILES} PARENT_SCOPE)
diff --git a/docqueries/topologicalSort/doc-topologicalSort.result b/docqueries/topologicalSort/doc-topologicalSort.result
diff --git a/docqueries/topologicalSort/doc-topologicalSort.test.sql b/docqueries/topologicalSort/doc-topologicalSort.test.sql
diff --git a/docqueries/topologicalSort/test.conf b/docqueries/topologicalSort/test.conf
diff --git a/include/boost/CPPLINT.cfg b/include/boost/CPPLINT.cfg
@@ -0,0 +1,4 @@
+exclude_files=detail_augment\.hpp
+exclude_files=dijkstra_shortest_paths\.hpp
+exclude_files=find_flow_cost\.hpp
+exclude_files=successive_shortest_path_nonnegative_weights\.hpp
diff --git a/include/drivers/transitiveClosure/transitiveClosure_driver.h b/include/drivers/transitiveClosure/transitiveClosure_driver.h
@@ -52,7 +52,6 @@ extern "C" {
         do_pgr_contractGraph(
                pgr_edge_t  *data_edges,
         size_t total_tuples,
- 
         transitiveClosure_rt **return_tuples,
         size_t *return_count,
         char **log_msg,
diff --git a/include/topologicalSort/pgr_topologicalSort.hpp b/include/topologicalSort/pgr_topologicalSort.hpp
@@ -61,19 +61,18 @@ class Pgr_topologicalSort {
      std::vector< pgr_topologicalSort_t >
      generatetopologicalSort(
         const G &graph ) {
-
         std::vector< pgr_topologicalSort_t > results;
 
         typedef typename std::vector< V > container;
         container c;
 
         boost::topological_sort(graph.graph, std::back_inserter(c));
-        
+
         typename std::vector< V >::reverse_iterator ii;
-        for (ii=c.rbegin(); ii!=c.rend(); ++ii) {
-            auto t=*ii;
+        for (ii = c.rbegin(); ii != c.rend(); ++ii) {
+            auto t = *ii;
             pgr_topologicalSort_t tmp;
-            tmp.sorted_v=graph.graph[t].id;
+            tmp.sorted_v = graph.graph[t].id;
             results.push_back(tmp);
         }
 
@@ -85,7 +84,6 @@ template < class G >
 std::vector<pgr_topologicalSort_t>
 Pgr_topologicalSort< G >::topologicalSort(
                 G &graph) {
-    
       return generatetopologicalSort(
                              graph);
 }
diff --git a/include/transitiveClosure/pgr_transitiveClosure.hpp b/include/transitiveClosure/pgr_transitiveClosure.hpp
@@ -85,7 +85,7 @@ class Pgr_transitiveClosure {
             Identifiers<int64_t> &remaining_vertices,
             std::vector<pgrouting::CH_edge> &shortcut_edges,
             std::ostringstream& debug) {
-        //std::deque<int64_t> contract_order;
+        // std::deque<int64_t> contract_order;
         //  push -1 to indicate the start of the queue
         // contract_order.push_back(-1);
         // contract_order.insert(
@@ -126,7 +126,6 @@ class Pgr_transitiveClosure {
         //     shortcut_edges.push_back(shortcut);
         // }
     }
-
 };
 
 }  // namespace transitiveClosure
diff --git a/sql/sigs/pgrouting--3.0.0.sig b/sql/sigs/pgrouting--3.0.0.sig
@@ -180,6 +180,8 @@ _pgr_stoerwagner(text)
 pgr_stoerwagner(text)
 _pgr_strongcomponents(text)
 pgr_strongcomponents(text)
+_pgr_topologicalsort(text)
+pgr_topologicalsort(text)
 _pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)
 pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)
 pgr_trsp(text,integer,integer,boolean,boolean,text)
diff --git a/src/topologicalSort/topologicalSort.c b/src/topologicalSort/topologicalSort.c
@@ -57,18 +57,16 @@ process(
     pgr_edge_t *edges = NULL;
     size_t total_edges = 0;
     pgr_get_edges(edges_sql, &edges, &total_edges);
-    
+
     PGR_DBG("Starting timer");
     clock_t start_t = clock();
     char* log_msg = NULL;
     char* notice_msg = NULL;
     char* err_msg = NULL;
     do_pgr_topologicalSort(
             edges, total_edges,
-            
             result_tuples,
             result_count,
-
             &log_msg,
             &notice_msg,
             &err_msg);
diff --git a/src/topologicalSort/topologicalSort_driver.cpp b/src/topologicalSort/topologicalSort_driver.cpp
@@ -37,10 +37,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "topologicalSort/pgr_topologicalSort.hpp"
 
-//TODO(nike0good) : Remove below headers once pgr_topologicalSort.hpp is implemented.
+// TODO(nike0good) : Remove below headers once pgr_topologicalSort.hpp is implemented.
 #include "cpp_common/basePath_SSEC.hpp"
 #include "cpp_common/pgr_base_graph.hpp"
-//TODO(nike0good) : Complete file once pgr_topologicalSort.hpp is implemented. 
+// TODO(nike0good) : Complete file once pgr_topologicalSort.hpp is implemented.
 
 #include "cpp_common/pgr_alloc.hpp"
 #include "cpp_common/pgr_assert.h"
@@ -56,7 +56,6 @@ pgr_topologicalSort(
     std::vector<pgr_topologicalSort_t> vv;
     return vv;
 #endif
-
 }
 
 
@@ -66,7 +65,7 @@ void
 do_pgr_topologicalSort(
         pgr_edge_t  *data_edges,
         size_t total_edges,
-        
+
 
         pgr_topologicalSort_t **return_tuples,
         size_t *return_count,
@@ -87,7 +86,7 @@ do_pgr_topologicalSort(
 
         graphType gType =  DIRECTED;
 
-        std::vector<pgr_topologicalSort_t> results; 
+        std::vector<pgr_topologicalSort_t> results;
 
         log << "Working with Directed Graph\n";
         pgrouting::DirectedGraph digraph(gType);
diff --git a/src/transitiveClosure/transitiveClosure.c b/src/transitiveClosure/transitiveClosure.c
@@ -56,7 +56,6 @@ process(char* edges_sql,
 
         transitiveClosure_rt **result_tuples,
         size_t *result_count) {
-
     pgr_SPI_connect();
 
 
@@ -89,7 +88,7 @@ process(char* edges_sql,
         (*result_tuples) = NULL;
         (*result_count) = 0;
     }
-    
+
     pgr_global_report(log_msg, notice_msg, err_msg);
 
     if (log_msg) pfree(log_msg);
@@ -211,7 +210,7 @@ transitiveClosure(PG_FUNCTION_ARGS) {
 
         values[0] = Int32GetDatum(call_cntr + 1);
         values[1] = PointerGetDatum(arrayType);
-        
+
         /*********************************************************************/
         tuple = heap_form_tuple(tuple_desc, values, nulls);
         result = HeapTupleGetDatum(tuple);
diff --git a/src/transitiveClosure/transitiveClosure_driver.cpp b/src/transitiveClosure/transitiveClosure_driver.cpp
@@ -54,7 +54,6 @@ static void process_transitiveClosure(
     pgrouting::ransitiveClosure::Pgr_transitiveClosure<G> result(graph,
             remaining_vertices,
             shortcut_edges, log);
-
 }
 
 template <typename G>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`SET(LOCAL_FILES`
`3`		`- pgr_toplogicalSort.rst`
	`3`	`+ pgr_topologicalSort.rst`
`4`	`4`	`)`
`5`	`5`
`6`	`6`	`foreach (f ${LOCAL_FILES})`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ static void process_transitiveClosure(`
`54`	`54`	`pgrouting::ransitiveClosure::Pgr_transitiveClosure<G> result(graph,`
`55`	`55`	`remaining_vertices,`
`56`	`56`	`shortcut_edges, log);`
`57`		`-`
`58`	`57`	`}`
`59`	`58`
`60`	`59`	`template <typename G>`