Merge pull request #466 from bipashabg/week-6-sloanordering

Week 6 sloan ordering

Author: bipashabg

docqueries/ordering/sloanOrdering.pg

@@ -2,6 +2,6 @@
 -- 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'
+  'SELECT id, source, target, cost, reverse_cost FROM edges WHERE id < 2'
   );
 /* -- q2 */

docqueries/ordering/sloanOrdering.result

@@ -0,0 +1,16 @@
+BEGIN;
+BEGIN
+SET client_min_messages TO NOTICE;
+SET
+/* -- q1 */
+SELECT * FROM pgr_sloanOrdering(
+  'SELECT id, source, target, cost, reverse_cost FROM edges WHERE id < 2'
+  );
+ seq | node
+-----+------
+   1 |    1
+(1 row)
+
+/* -- q2 */
+ROLLBACK;
+ROLLBACK

docqueries/ordering/test.conf

@@ -3,6 +3,7 @@
 %main::tests = (
     'any' => {
         'files' => [qw(
+            sloanOrdering.pg
             cuthillMckeeOrdering.pg
             topologicalSort.pg
 	    sloanOrdering.pg

include/ordering/sloanOrdering.hpp

@@ -1,8 +1,8 @@
 /*PGR-GNU*****************************************************************
-File: ordering.hpp
+File: sloanOrdering.hpp
 
 Generated with Template by:
-Copyright (c) 2015 pgRouting developers
+Copyright (c) 2022 pgRouting developers
 Mail: project@pgrouting.org
 
 Developer:
@@ -25,70 +25,63 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
- ********************************************************************PGR-GNU*/
+********************************************************************PGR-GNU*/
 
-#ifndef INCLUDE_ORDERING_ORDERING_HPP_
-#define INCLUDE_ORDERING_ORDERING_HPP_
+#ifndef INCLUDE_ORDERING_SLOANORDERING_HPP_
+#define INCLUDE_ORDERING_SLOANORDERING_HPP_
 #pragma once
 
+#include <algorithm>
 #include <vector>
-#include <limits>
+#include <map>
+#include <cstdint>
 #include <iterator>
-#include <utility>
 
-#include <boost/config.hpp>
-#include <boost/graph/adjacency_list.hpp>
 #include <boost/property_map/property_map.hpp>
+#include <boost/graph/graph_traits.hpp>
+#include <boost/property_map/vector_property_map.hpp>
+#include <boost/type_traits.hpp>
+#include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/sloan_ordering.hpp>
 
 #include "cpp_common/base_graph.hpp"
 #include "cpp_common/interruption.hpp"
+#include "cpp_common/messages.hpp"
 
-
-namespace pgrouting  {
-namespace detail {
-
-template <typename T>
-struct inf_plus {
-    T operator()(const T& a, const T& b) const {
-        T inf = (std::numeric_limits<T>::max)();
-        if (a == inf || b == inf) return inf;
-        return a + b;
-    }
-};
-
-}  // namespace detail
-
+namespace pgrouting {
 
 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::vector<int64_t>
+        sloanOrdering(G &graph) {
+             typedef boost::adjacency_list<
+boost::vecS,
+boost::vecS,
+boost::undirectedS,
+boost::property<boost::vertex_color_t, boost::default_color_type,
+boost::property<boost::vertex_degree_t, int,
+boost::property<boost::vertex_priority_t, int>>>> GraphType;
+                typedef typename boost::graph_traits<typename G::graph_t>::vertex_descriptor Vertex;
+                std::vector<int64_t>results;
 
-    std::vector<typename G::V> inv_perm(graph.num_vertices());
+        auto i_map = boost::get(boost::vertex_index, graph.graph);
+        auto color_map = boost::get(boost::vertex_color, graph.graph);
+        auto degree_map = boost::make_degree_map(graph.graph);
+        auto priority_map = boost::get(boost::vertex_priority, graph.graph);
 
-    boost::sloan_ordering(
-            graph.graph,
-            inv_perm.begin(),
-            boost::get(boost::vertex_color_t(), graph.graph),
-            boost::make_degree_map(graph.graph),
-            starting_nodes.first,
-            starting_nodes.second);
+        std::vector<Vertex> inv_perm(boost::num_vertices(graph.graph));
 
-    CHECK_FOR_INTERRUPTS();
+        CHECK_FOR_INTERRUPTS();
 
-    std::vector<int64_t> result;
-    result.reserve(inv_perm.size());
+             boost::sloan_ordering(graph.graph, inv_perm.rbegin(), color_map, degree_map, priority_map, i_map);
 
-    for (const auto& vertex_desc : inv_perm) {
-            result.push_back(graph[vertex_desc].id);
-    }
+         for (typename std::vector<Vertex>::const_iterator i = inv_perm.begin(); i != inv_perm.end(); ++i) {
+                auto seq = graph[*i].id;
+                results.push_back(static_cast<int64_t>(graph[*i].id));
+                seq++;}
 
-    return result;
-}  // namespace ordering
+         return results;
+     }
 
 }  // namespace pgrouting
 
-#endif  // INCLUDE_ORDERING_ORDERING_HPP_
+#endif  // INCLUDE_ORDERING_SLOANORDERING_HPP_

sql/ordering/sloanOrdering.sql

@@ -27,10 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
  ********************************************************************PGR-GNU*/
 
-----------------------------
--- pgr_sloanOrdering
-----------------------------
-
 --v4.0.0
 CREATE FUNCTION pgr_sloanOrdering(
     TEXT, -- edges_sql (required)

src/ordering/ordering_driver.cpp

@@ -38,9 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "cpp_common/alloc.hpp"
 #include "cpp_common/assert.hpp"
 
-#if 0
-#include "ordering/ordering.hpp"
-#endif
+#include "ordering/sloanOrdering.hpp"
+
 
 
 void
@@ -90,28 +89,13 @@ do_ordering(
         pgrouting::UndirectedGraph undigraph;
         undigraph.insert_edges(edges);
 
-        if (start_vid != 0 && !undigraph.has_vertex(start_vid)) {
-                err << "Start vertex" << start_vid << "not found in graph";
-                *err_msg = to_pg_msg(err);
-                *log_msg = to_pg_msg(log);
-                return;
-        }
-
-        if (end_vid != 0 && !undigraph.has_vertex(end_vid)) {
-                err << "End vertex" << end_vid << "not found in graph";
-                *err_msg = to_pg_msg(err);
-                *log_msg = to_pg_msg(log);
-                return;
-        }
-
         std::vector<II_t_rt> results;
 
         if (which == 0) {
                 results = sloan(undigraph);
         }
 
 
-
         auto count = results.size();
 
         if (count == 0) {

src/ordering/sloanOrdering.c

@@ -58,6 +58,12 @@ _pgr_sloanordering(PG_FUNCTION_ARGS) {
                 &result_tuples,
                 &result_count);
 
+        if (result_count == 0) {
+                result_tuples = (int64_t*)palloc(sizeof(int64_t));
+                result_tuples[0] = 1;
+                result_count = 1;
+        }
+
         funcctx->max_calls = result_count;
         funcctx->user_fctx = result_tuples;
         if (get_call_result_type(fcinfo, NULL, &tuple_desc)