Merge pull request pgRouting#469 from bipashabg/week-7-sloanordering

Week 7 sloanordering

Author: bipashabg

docqueries/ordering/sloanOrdering.pg

@@ -2,6 +2,30 @@
 -- 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 WHERE id < 2'
+  'SELECT id, source, target, cost, reverse_cost FROM edges'
   );
 /* -- q2 */
+
+CREATE TABLE expected_result (
+   seq BIGINT,
+   node BIGINT);
+
+INSERT INTO expected_result (seq, node) VALUES
+(1,13),
+(2,14),
+(3,2),
+(4,4),
+(5,9),
+(6,1),
+(7,8),
+(8,3),
+(9,12),
+(10,7),
+(11,5),
+(12,17),
+(13,11),
+(14,6),
+(15,16),
+(16,10),
+(17,15);
+

docqueries/ordering/sloanOrdering.result

@@ -4,13 +4,52 @@ SET client_min_messages TO NOTICE;
 SET
 /* -- q1 */
 SELECT * FROM pgr_sloanOrdering(
-  'SELECT id, source, target, cost, reverse_cost FROM edges WHERE id < 2'
+  'SELECT id, source, target, cost, reverse_cost FROM edges'
   );
  seq | node
 -----+------
    1 |    1
-(1 row)
+   2 |    3
+   3 |    6
+   4 |    5
+   5 |   10
+   6 |    7
+   7 |    9
+   8 |   15
+   9 |    8
+  10 |   11
+  11 |   16
+  12 |   12
+  13 |   17
+  14 |    1
+  15 |    1
+  16 |    1
+  17 |    1
+(17 rows)
 
 /* -- q2 */
+CREATE TABLE expected_result (
+   seq BIGINT,
+   node BIGINT);
+CREATE TABLE
+INSERT INTO expected_result (seq, node) VALUES
+(1,13),
+(2,14),
+(3,2),
+(4,4),
+(5,9),
+(6,1),
+(7,8),
+(8,3),
+(9,12),
+(10,7),
+(11,5),
+(12,17),
+(13,11),
+(14,6),
+(15,16),
+(16,10),
+(17,15);
+INSERT 0 17
 ROLLBACK;
 ROLLBACK

include/ordering/sloanOrdering.hpp

@@ -35,7 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <vector>
 #include <map>
 #include <cstdint>
-#include <iterator>
 
 #include <boost/property_map/property_map.hpp>
 #include <boost/graph/graph_traits.hpp>
@@ -49,39 +48,63 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "cpp_common/messages.hpp"
 
 namespace pgrouting {
+namespace functions {
 
 template <class G>
-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;
-
-        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);
-
-        std::vector<Vertex> inv_perm(boost::num_vertices(graph.graph));
-
-        CHECK_FOR_INTERRUPTS();
-
-             boost::sloan_ordering(graph.graph, inv_perm.rbegin(), color_map, degree_map, priority_map, i_map);
-
-         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 results;
-     }
-
+class SloanOrdering : public Pgr_messages {
+ public:
+         typedef typename G::V V;
+         typedef typename G::E E;
+         typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::undirectedS> Graph;
+         typedef boost::graph_traits<Graph>::vertices_size_type size_type;
+         typedef boost::graph_traits<Graph>::vertex_descriptor Vertex;
+
+           std::vector<int64_t>
+           sloanOrdering(G &graph) {
+           std::vector<int64_t>results;
+
+           auto i_map = boost::get(boost::vertex_index, graph.graph);
+           std::vector<Vertex> inv_perm(boost::num_vertices(graph.graph));
+           std::vector <boost::default_color_type> colors(boost::num_vertices(graph.graph));
+           auto color_map = boost::make_iterator_property_map(&colors[0], i_map, colors[0]);
+           auto out_deg = boost::make_out_degree_map(graph.graph);
+           std::vector<int> priorities(boost::num_vertices(graph.graph));
+           auto priority_map = boost::make_iterator_property_map(&priorities[0], i_map, priorities[0]);
+
+            CHECK_FOR_INTERRUPTS();
+
+            try {
+                boost::sloan_ordering(graph.graph, inv_perm.begin(), color_map, out_deg, priority_map);
+            } catch (boost::exception const& ex) {
+                (void)ex;
+                throw;
+            } catch (std::exception &e) {
+                (void)e;
+                throw;
+            } catch (...) {
+                throw;
+            }
+
+            results = get_results(inv_perm, graph);
+
+            return results;
+        }
+
+ private:
+        std::vector <int64_t> get_results(
+                std::vector <size_type> & inv_perm,
+                const G &graph) {
+                std::vector <int64_t> results;
+           for (std::vector<Vertex>::const_iterator i = inv_perm.begin();
+                i != inv_perm.end(); ++i) {
+                log << inv_perm[*i] << " ";
+                results.push_back(static_cast<int64_t>(graph.graph[*i].id));
+           }
+
+           return results;
+}
+};
+}  // namespace functions
 }  // namespace pgrouting
 
 #endif  // INCLUDE_ORDERING_SLOANORDERING_HPP_

src/ordering/ordering_driver.cpp

@@ -40,7 +40,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "ordering/sloanOrdering.hpp"
 
-
+namespace {
+template <class G>
+std::vector <int64_t>
+sloanOrdering(G &graph) {
+        pgrouting::functions::SloanOrdering <G> fn_sloanOrdering;
+        auto results = fn_sloanOrdering.sloanOrdering(graph);
+        return results;
+}
+}
 
 void
 do_ordering(
@@ -70,12 +78,6 @@ do_ordering(
         pgassert(!(*return_tuples));
         pgassert(*return_count == 0);
 
-#if 0
-        using pgrouting::sloan;
-#endif
-
-#if 0
-
         hint = edges_sql;
         auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, true);
         if (edges.empty()) {
@@ -86,13 +88,12 @@ do_ordering(
         log << "Processing Undirected graph\n";
 
         std::vector<int64_t> results;
+
         pgrouting::UndirectedGraph undigraph;
         undigraph.insert_edges(edges);
 
-        std::vector<II_t_rt> results;
-
         if (which == 0) {
-                results = sloan(undigraph);
+                results = sloanOrdering(undigraph);
         }
 
 
@@ -108,7 +109,7 @@ do_ordering(
 
         (*return_tuples) = pgr_alloc(count, (*return_tuples));
 
-        for (size_t i = 0; i < count; ++1) {
+        for (size_t i = 0; i < count; ++i) {
               (*return_tuples)[i] = results[i];
         }
 
@@ -117,7 +118,6 @@ do_ordering(
         pgassert(*err_msg == NULL);
         *log_msg = to_pg_msg(log);
         *notice_msg = to_pg_msg(notice);
-#endif
     } catch (AssertFailedException &except) {
         (*return_tuples) = pgr_free(*return_tuples);
         (*return_count) = 0;

src/ordering/sloanOrdering.c

@@ -58,12 +58,6 @@ _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)