Merge pull request #460 from bipashabg/week-5-sloanordering

Week 5 sloan ordering

Author: bipashabg

doc/ordering/ordering-family.rst

@@ -22,7 +22,6 @@ Ordering - Family of functions
 .. official-start
 
 * :doc:`pgr_cuthillMckeeOrdering` - Return reverse Cuthill-McKee ordering of an undirected graph.
-* :doc:`pgr_sloanOrdering` - Return sloan ordering of an undirected graph.
 * :doc:`pgr_topologicalSort` - Linear ordering of the vertices for directed
   acyclic graph.
 
@@ -32,7 +31,6 @@ Ordering - Family of functions
     :hidden:
 
     pgr_cuthillMckeeOrdering
-    pgr_sloanOrdering
     pgr_topologicalSort
 
 See Also

docqueries/ordering/CMakeLists.txt

@@ -2,6 +2,7 @@
 SET(LOCAL_FILES
     cuthillMckeeOrdering
     topologicalSort
+    sloanOrdering
     )
 
 foreach (f ${LOCAL_FILES})

docqueries/ordering/sloanOrdering.pg

@@ -0,0 +1,7 @@
+-- CopyRight(c) pgRouting developers
+-- Creative Commons Attribution-Share Alike 3.0 License : https://creativecommons.org/licenses/by-sa/3.0/
+/* -- q1 */
+SELECT * FROM pgr_sloanOrdering(
+  'SELECT id, source, target, cost, reverse_cost FROM edges'
+  );
+/* -- q2 */

docqueries/ordering/sloanOrdering.result

@@ -5,6 +5,7 @@
         'files' => [qw(
             cuthillMckeeOrdering.pg
             topologicalSort.pg
+	    sloanOrdering.pg
             )]
     },
 

docqueries/ordering/test.conf

@@ -32,17 +32,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #pragma once
 
 #include <cstddef>
-#include <cstddef>
-using Edge_t = struct Edge_t;
-using II_t_rt = struct II_t_rt;
 #include <string>
 
 
 void
 do_ordering(
-        std::string, int64_t, int64_t,
+        std::string, int,
 
-        II_t_rt**,  size_t*,
+        int64_t**,  size_t*,
         char **, char **, char **);
 
 

include/drivers/ordering_driver.hpp

@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <vector>
 #include <limits>
 #include <iterator>
-
+#include <utility>
 
 #include <boost/config.hpp>
 #include <boost/graph/adjacency_list.hpp>
@@ -63,30 +63,27 @@ struct inf_plus {
 template <class G>
 std::vector<std::vector<int64_t>>
 sloan(G &graph) {
-    
     CHECK_FOR_INTERRUPTS();
 
-    std::pair<typename G::V, typename G::V> starting_nodes = 
-	    boost::sloan_starting_nodes(graph.graph);
+    std::pair<typename G::V, typename G::V> starting_nodes = boost::sloan_starting_nodes(graph.graph);
 
     std::vector<typename G::V> inv_perm(graph.num_vertices());
 
     boost::sloan_ordering(
             graph.graph,
             inv_perm.begin(),
             boost::get(boost::vertex_color_t(), graph.graph),
-	    boost::make_degree_map(graph.graph),
+            boost::make_degree_map(graph.graph),
             starting_nodes.first,
-	    starting_nodes.second
-	    );
+            starting_nodes.second);
 
     CHECK_FOR_INTERRUPTS();
 
     std::vector<int64_t> result;
     result.reserve(inv_perm.size());
 
     for (const auto& vertex_desc : inv_perm) {
-	    result.push_back(graph[vertex_desc].id);
+            result.push_back(graph[vertex_desc].id);
     }
 
     return result;

include/ordering/ordering.hpp renamed to include/ordering/sloanOrdering.hpp

@@ -28,23 +28,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #pragma once
 
 #ifdef __cplusplus
+#include <stdbool.h>
 #include <cstddef>
 #include <cstdint>
-#include <stdbool.h>
-using Edge_t = struct Edge_t;
-using II_t_rt = struct II_t_rt;
+#include <string>
+
 #else
 #include <stddef.h>
 #include <stdint.h>
-typedef struct Edge_t Edge_t;
-typedef struct II_t_rt II_t_rt;
 #endif
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void pgr_process_ordering(const char*, int16_t, II_t_rt **, size_t *);
+void pgr_process_ordering(const char*, int, int64_t**, size_t*);
 
 #ifdef __cplusplus
 }

include/process/ordering_process.h

@@ -19,16 +19,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  ********************************************************************PGR-GNU*/
 BEGIN;
 
-SELECT CASE WHEN min_version('4.0.0') THEN plan(1) ELSE plan(5) END;
+SELECT CASE WHEN min_version('4.0.0') THEN plan(5) ELSE plan(1) END;
 
 CREATE OR REPLACE FUNCTION types_check()
 RETURNS SETOF TEXT AS
 $BODY$
 BEGIN
 
   IF NOT min_version('4.0.0') THEN
-    RETURN QUERY
-    SELECT skip(1, 'Function is new on 4.0.0');
+    RETURN QUERY SELECT skip(1, 'Function is new on 4.0.0');
     RETURN;
   END IF;
 
@@ -38,11 +37,10 @@ BEGIN
 
   RETURN QUERY
   SELECT function_args_eq('pgr_sloanordering',
-    $$SELECT  '{"","seq","node"}'::TEXT[] $$
+    $$SELECT  '{"", seq, node}'::TEXT[] $$
   );
 
-  RETURN QUERY
-  SELECT function_types_eq('pgr_sloanordering',
+  RETURN QUERY SELECT function_types_eq('pgr_sloanordering',
     $$VALUES
     ('{text,int8,int8}'::TEXT[])
     $$

pgtap/ordering/sloan/types_check.pg

@@ -42,8 +42,6 @@ RETURNS SETOF RECORD AS
 'MODULE_PATHNAME'
 LANGUAGE C IMMUTABLE STRICT;
 
--- COMMENTS
-
 COMMENT ON FUNCTION _pgr_sloanOrdering(TEXT)
 IS 'pgRouting internal function';