diff --git a/doc/ordering/ordering-family.rst b/doc/ordering/ordering-family.rst index 29c4606ff8..99d58aba83 100644 --- a/doc/ordering/ordering-family.rst +++ b/doc/ordering/ordering-family.rst @@ -22,7 +22,7 @@ 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_sloanOrdering` - Return sloanordering of an undirected graph. * :doc:`pgr_topologicalSort` - Linear ordering of the vertices for directed acyclic graph. diff --git a/include/process/ordering_process.h b/include/process/ordering_process.h index 08307b1b07..e0b97ac1d8 100644 --- a/include/process/ordering_process.h +++ b/include/process/ordering_process.h @@ -44,7 +44,7 @@ typedef struct II_t_rt II_t_rt; extern "C" { #endif -void pgr_process_ordering(const Edge_t*, size_t, int64_t, int64_t, II_t_rt **, size_t *); +void pgr_process_ordering(const char*, int16_t, II_t_rt **, size_t *); #ifdef __cplusplus } diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index 0f793d7000..66adddff66 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-06-14 12:05+0000\n" +"POT-Creation-Date: 2025-06-09 15:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3420,6 +3420,9 @@ msgid "" "of an undirected graph." msgstr "" +msgid ":doc:`pgr_sloanOrdering` - Return sloan ordering of an undirected graph." +msgstr "" + msgid "" ":doc:`pgr_topologicalSort` - Linear ordering of the vertices for directed" " acyclic graph." @@ -3968,12 +3971,6 @@ msgstr "" msgid "Signatures promoted to official" msgstr "" -msgid "`#2718 `__" -msgstr "" - -msgid "Make official the Combinations signature on the official functions" -msgstr "" - msgid "pgr_aStar(Combinations)" msgstr "" @@ -4013,22 +4010,7 @@ msgstr "" msgid "pgr_pushRelabel(Combinations)" msgstr "" -msgid "SQL signatures and output standardization" -msgstr "" - -msgid "" -"`#2904 `__ " -"Standardize output columns of functions with different output columns " -"within overloads" -msgstr "" - -msgid "Official functions" -msgstr "" - -msgid "`#2905 `__" -msgstr "" - -msgid "pgr_withPoints" +msgid "SQL signatures modification on functions" msgstr "" msgid "" @@ -4039,21 +4021,6 @@ msgstr "" msgid "Combinations signature promoted to official." msgstr "" -msgid "" -"`#2907 `__ " -"pgr_bellmanFord" -msgstr "" - -msgid "" -"`#2910 `__ " -"pgr_edwardMoore" -msgstr "" - -msgid "" -"`#2913 `__ " -"pgr_DAGshortestPath" -msgstr "" - msgid "Removal of SQL deprecated signatures" msgstr "" @@ -4280,16 +4247,6 @@ msgid "" "precision,double precision,boolean)" msgstr "" -msgid "" -"`#2913 `__ " -"_pgr_dagshortestpath(text,text,boolean,boolean)" -msgstr "" - -msgid "" -"`#2913 `__ " -"_pgr_dagshortestpath(text,anyarray,anyarray,boolean,boolean)" -msgstr "" - msgid "" "`#2861 `__: Remove " "unused internal functions" @@ -4373,11 +4330,6 @@ msgstr "" msgid "Internal C/C++ functions in legacy" msgstr "" -msgid "" -"`#2913 `__ " -"_pgr_dagshortestpath" -msgstr "" - msgid "All releases" msgstr "" @@ -4487,15 +4439,6 @@ msgstr "" msgid ":doc:`pgr_bdDijkstra` [1]_" msgstr "" -msgid ":doc:`pgr_bellmanFord` [3]_" -msgstr "" - -msgid ":doc:`pgr_dagShortestPath` [3]_" -msgstr "" - -msgid ":doc:`pgr_edwardMoore` [3]_" -msgstr "" - msgid ":doc:`pgr_withPoints` [2]_" msgstr "" @@ -4514,9 +4457,6 @@ msgstr "" msgid "Official function in v4.0.0" msgstr "" -msgid "Experimental or proposed in v4.0.0" -msgstr "" - msgid "Migration of cost functions" msgstr "" @@ -4653,34 +4593,22 @@ msgid "" "functions` are |short-generic-result|" msgstr "" -msgid "``pgr_dijkstra``" -msgstr "" - -msgid "v < 3.5" -msgstr "" - -msgid "|old-generic-result|" -msgstr "" - msgid "``pgr_aStar``" msgstr "" msgid "v < 3.6" msgstr "" -msgid "``pgr_bdDijkstra``" -msgstr "" - -msgid "``pgr_bellmanFord``" +msgid "|old-generic-result|" msgstr "" -msgid "``pgr_dagShortestPath``" +msgid "``pgr_dijkstra``" msgstr "" -msgid "|result-1-1|" +msgid "v < 3.5" msgstr "" -msgid "``pgr_edwardMoore``" +msgid "``pgr_bdDijkstra``" msgstr "" msgid "``pgr_withPoints``" @@ -4758,18 +4686,6 @@ msgid "" "example." msgstr "" -msgid "Using ``pgr_DAGshortestPath``" -msgstr "" - -msgid "" -"Migrating `this v3.8 " -"`__ example." -msgstr "" - -msgid "This applies to all signatures of ``pgr_DAGshortestPath``" -msgstr "" - msgid "Examples for One to Many with one route result" msgstr "" @@ -7606,17 +7522,17 @@ msgstr "" msgid "" "Aasheesh Tiwari, Abhinav Jain, Aditya Pratap Singh, Adrien Berchet, Akio " "Takubo, Andrea Nardelli, Anthony Tasca, Anton Patrushev, Aryan Gupta, " -"Ashraf Hossain, Ashish Kumar, Aurélie Bousquet, Cayetano Benavent, " -"Christian Gonzalez, Daniel Kastl, Dapeng Wang, Dave Potts, David Techer, " -"Denis Rykov, Ema Miyawaki, Esteban Zimanyi, Florian Thurkow, Frederic " -"Junod, Gerald Fenoy, Gudesa Venkata Sai Akhil, Hang Wu, Himanshu Raj, " -"Imre Samu, Jay Mahadeokar, Jinfu Leng, Kai Behncke, Kishore Kumar, Ko " -"Nagase, Mahmoud Sakr, Manikata Kondeti, Mario Basa, Martin Wiesenhaan, " -"Maxim Dubinin, Maoguang Wang, Mohamed Bakli, Mohamed Zia, Mukul Priya, " -"Nitish Chauhan, Rajat Shinde, Razequl Islam, Regina Obe, Rohith Reddy, " -"Sarthak Agarwal, Shobhit Chaurasia, Sourabh Garg, Stephen Woodbridge, " -"Swapnil Joshi, Sylvain Housseman, Sylvain Pasche, Veenit Kumar, Vidhan " -"Jain, Virginia Vergara, Yige Huang" +"Ashraf Hossain, Ashish Kumar, Aurélie Bousquet, Bipasha Gayary, Cayetano " +"Benavent, Christian Gonzalez, Daniel Kastl, Dapeng Wang, Dave Potts, " +"David Techer, Denis Rykov, Ema Miyawaki, Esteban Zimanyi, Florian " +"Thurkow, Frederic Junod, Gerald Fenoy, Gudesa Venkata Sai Akhil, Hang Wu," +" Himanshu Raj, Imre Samu, Jay Mahadeokar, Jinfu Leng, Kai Behncke, " +"Kishore Kumar, Ko Nagase, Mahmoud Sakr, Manikata Kondeti, Mario Basa, " +"Martin Wiesenhaan, Maxim Dubinin, Maoguang Wang, Mohamed Bakli, Mohamed " +"Zia, Mukul Priya, Nitish Chauhan, Rajat Shinde, Razequl Islam, Regina " +"Obe, Rohith Reddy, Sarthak Agarwal, Shobhit Chaurasia, Sourabh Garg, " +"Stephen Woodbridge, Swapnil Joshi, Sylvain Housseman, Sylvain Pasche, " +"Veenit Kumar, Vidhan Jain, Virginia Vergara, Yige Huang" msgstr "" msgid "Corporate Sponsors (in alphabetical order)" @@ -8777,6 +8693,18 @@ msgstr "" msgid "pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" +msgid "Returns set of |result-1-1|" +msgstr "" + +msgid "Returns set of |result-1-m|" +msgstr "" + +msgid "Returns set of |result-m-1|" +msgstr "" + +msgid "Using a combinations table on an **undirected** graph." +msgstr "" + msgid "" "`Boost: Bellman Ford " "`__" @@ -9007,15 +8935,6 @@ msgid "" "(i.e :math:`1``)" msgstr "" -msgid "Returns set of |result-1-1|" -msgstr "" - -msgid "Returns set of |result-1-m|" -msgstr "" - -msgid "Returns set of |result-m-1|" -msgstr "" - msgid "" "`Boost: Breadth First Search " "`__" @@ -10469,9 +10388,6 @@ msgstr "" msgid "pgr_dagShortestPath(Combinations)" msgstr "" -msgid "..rubric:: Version 3.0.0" -msgstr "" - msgid "" "Shortest Path for Directed Acyclic Graph(DAG) is a graph search algorithm" " that solves the shortest path problem for weighted directed acyclic " @@ -11895,7 +11811,10 @@ msgstr "" msgid "pgr_edwardMoore(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" -msgid "Using a combinations table on an **undirected** graph." +#, python-brace-format +msgid "" +"From vertex :math:`6` to vertices :math:`\\{ 10, 17\\}` on a **directed**" +" graph" msgstr "" msgid "https://en.wikipedia.org/wiki/Shortest_Path_Faster_Algorithm" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index e2de53d4a3..6359aca50b 100644 --- a/locale/pot/pgrouting_doc_strings.pot +++ b/locale/pot/pgrouting_doc_strings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-06-14 12:05+0000\n" +"POT-Creation-Date: 2025-06-09 15:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3097,6 +3097,9 @@ msgstr "" msgid ":doc:`pgr_cuthillMckeeOrdering` - Return reverse Cuthill-McKee ordering of an undirected graph." msgstr "" +msgid ":doc:`pgr_sloanOrdering` - Return sloan ordering of an undirected graph." +msgstr "" + msgid ":doc:`pgr_topologicalSort` - Linear ordering of the vertices for directed acyclic graph." msgstr "" @@ -3559,12 +3562,6 @@ msgstr "" msgid "Signatures promoted to official" msgstr "" -msgid "`#2718 `__" -msgstr "" - -msgid "Make official the Combinations signature on the official functions" -msgstr "" - msgid "pgr_aStar(Combinations)" msgstr "" @@ -3604,19 +3601,7 @@ msgstr "" msgid "pgr_pushRelabel(Combinations)" msgstr "" -msgid "SQL signatures and output standardization" -msgstr "" - -msgid "`#2904 `__ Standardize output columns of functions with different output columns within overloads" -msgstr "" - -msgid "Official functions" -msgstr "" - -msgid "`#2905 `__" -msgstr "" - -msgid "pgr_withPoints" +msgid "SQL signatures modification on functions" msgstr "" msgid "`#2906 `__ pgr_bdDijkstra" @@ -3625,15 +3610,6 @@ msgstr "" msgid "Combinations signature promoted to official." msgstr "" -msgid "`#2907 `__ pgr_bellmanFord" -msgstr "" - -msgid "`#2910 `__ pgr_edwardMoore" -msgstr "" - -msgid "`#2913 `__ pgr_DAGshortestPath" -msgstr "" - msgid "Removal of SQL deprecated signatures" msgstr "" @@ -3808,12 +3784,6 @@ msgstr "" msgid "_pgr_tsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)" msgstr "" -msgid "`#2913 `__ _pgr_dagshortestpath(text,text,boolean,boolean)" -msgstr "" - -msgid "`#2913 `__ _pgr_dagshortestpath(text,anyarray,anyarray,boolean,boolean)" -msgstr "" - msgid "`#2861 `__: Remove unused internal functions" msgstr "" @@ -3895,9 +3865,6 @@ msgstr "" msgid "Internal C/C++ functions in legacy" msgstr "" -msgid "`#2913 `__ _pgr_dagshortestpath" -msgstr "" - msgid "All releases" msgstr "" @@ -4000,15 +3967,6 @@ msgstr "" msgid ":doc:`pgr_bdDijkstra` [1]_" msgstr "" -msgid ":doc:`pgr_bellmanFord` [3]_" -msgstr "" - -msgid ":doc:`pgr_dagShortestPath` [3]_" -msgstr "" - -msgid ":doc:`pgr_edwardMoore` [3]_" -msgstr "" - msgid ":doc:`pgr_withPoints` [2]_" msgstr "" @@ -4027,9 +3985,6 @@ msgstr "" msgid "Official function in v4.0.0" msgstr "" -msgid "Experimental or proposed in v4.0.0" -msgstr "" - msgid "Migration of cost functions" msgstr "" @@ -4141,34 +4096,22 @@ msgstr "" msgid "THe standardized :ref:`pgRouting-concepts:Result columns for single path functions` are |short-generic-result|" msgstr "" -msgid "``pgr_dijkstra``" -msgstr "" - -msgid "v < 3.5" -msgstr "" - -msgid "|old-generic-result|" -msgstr "" - msgid "``pgr_aStar``" msgstr "" msgid "v < 3.6" msgstr "" -msgid "``pgr_bdDijkstra``" -msgstr "" - -msgid "``pgr_bellmanFord``" +msgid "|old-generic-result|" msgstr "" -msgid "``pgr_dagShortestPath``" +msgid "``pgr_dijkstra``" msgstr "" -msgid "|result-1-1|" +msgid "v < 3.5" msgstr "" -msgid "``pgr_edwardMoore``" +msgid "``pgr_bdDijkstra``" msgstr "" msgid "``pgr_withPoints``" @@ -4237,15 +4180,6 @@ msgstr "" msgid "Migrating `this v3.8 `__ example." msgstr "" -msgid "Using ``pgr_DAGshortestPath``" -msgstr "" - -msgid "Migrating `this v3.8 `__ example." -msgstr "" - -msgid "This applies to all signatures of ``pgr_DAGshortestPath``" -msgstr "" - msgid "Examples for One to Many with one route result" msgstr "" @@ -6631,7 +6565,7 @@ msgstr "" msgid "Individuals (in alphabetical order)" msgstr "" -msgid "Aasheesh Tiwari, Abhinav Jain, Aditya Pratap Singh, Adrien Berchet, Akio Takubo, Andrea Nardelli, Anthony Tasca, Anton Patrushev, Aryan Gupta, Ashraf Hossain, Ashish Kumar, Aurélie Bousquet, Cayetano Benavent, Christian Gonzalez, Daniel Kastl, Dapeng Wang, Dave Potts, David Techer, Denis Rykov, Ema Miyawaki, Esteban Zimanyi, Florian Thurkow, Frederic Junod, Gerald Fenoy, Gudesa Venkata Sai Akhil, Hang Wu, Himanshu Raj, Imre Samu, Jay Mahadeokar, Jinfu Leng, Kai Behncke, Kishore Kumar, Ko Nagase, Mahmoud Sakr, Manikata Kondeti, Mario Basa, Martin Wiesenhaan, Maxim Dubinin, Maoguang Wang, Mohamed Bakli, Mohamed Zia, Mukul Priya, Nitish Chauhan, Rajat Shinde, Razequl Islam, Regina Obe, Rohith Reddy, Sarthak Agarwal, Shobhit Chaurasia, Sourabh Garg, Stephen Woodbridge, Swapnil Joshi, Sylvain Housseman, Sylvain Pasche, Veenit Kumar, Vidhan Jain, Virginia Vergara, Yige Huang" +msgid "Aasheesh Tiwari, Abhinav Jain, Aditya Pratap Singh, Adrien Berchet, Akio Takubo, Andrea Nardelli, Anthony Tasca, Anton Patrushev, Aryan Gupta, Ashraf Hossain, Ashish Kumar, Aurélie Bousquet, Bipasha Gayary, Cayetano Benavent, Christian Gonzalez, Daniel Kastl, Dapeng Wang, Dave Potts, David Techer, Denis Rykov, Ema Miyawaki, Esteban Zimanyi, Florian Thurkow, Frederic Junod, Gerald Fenoy, Gudesa Venkata Sai Akhil, Hang Wu, Himanshu Raj, Imre Samu, Jay Mahadeokar, Jinfu Leng, Kai Behncke, Kishore Kumar, Ko Nagase, Mahmoud Sakr, Manikata Kondeti, Mario Basa, Martin Wiesenhaan, Maxim Dubinin, Maoguang Wang, Mohamed Bakli, Mohamed Zia, Mukul Priya, Nitish Chauhan, Rajat Shinde, Razequl Islam, Regina Obe, Rohith Reddy, Sarthak Agarwal, Shobhit Chaurasia, Sourabh Garg, Stephen Woodbridge, Swapnil Joshi, Sylvain Housseman, Sylvain Pasche, Veenit Kumar, Vidhan Jain, Virginia Vergara, Yige Huang" msgstr "" msgid "Corporate Sponsors (in alphabetical order)" @@ -7609,6 +7543,18 @@ msgstr "" msgid "pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" +msgid "Returns set of |result-1-1|" +msgstr "" + +msgid "Returns set of |result-1-m|" +msgstr "" + +msgid "Returns set of |result-m-1|" +msgstr "" + +msgid "Using a combinations table on an **undirected** graph." +msgstr "" + msgid "`Boost: Bellman Ford `__" msgstr "" @@ -7774,15 +7720,6 @@ msgstr "" msgid "**Note:** Using the :doc:`sampledata` Network as all weights are same (i.e :math:`1``)" msgstr "" -msgid "Returns set of |result-1-1|" -msgstr "" - -msgid "Returns set of |result-1-m|" -msgstr "" - -msgid "Returns set of |result-m-1|" -msgstr "" - msgid "`Boost: Breadth First Search `__" msgstr "" @@ -8956,9 +8893,6 @@ msgstr "" msgid "pgr_dagShortestPath(Combinations)" msgstr "" -msgid "..rubric:: Version 3.0.0" -msgstr "" - msgid "Shortest Path for Directed Acyclic Graph(DAG) is a graph search algorithm that solves the shortest path problem for weighted directed acyclic graph, producing a shortest path from a starting vertex (``start_vid``) to an ending vertex (``end_vid``)." msgstr "" @@ -10132,7 +10066,7 @@ msgstr "" msgid "pgr_edwardMoore(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" -msgid "Using a combinations table on an **undirected** graph." +msgid "From vertex :math:`6` to vertices :math:`\\{ 10, 17\\}` on a **directed** graph" msgstr "" msgid "https://en.wikipedia.org/wiki/Shortest_Path_Faster_Algorithm" diff --git a/sql/ordering/_sloanOrdering.sql b/sql/ordering/_sloanOrdering.sql index aca7899a93..9969a7c265 100644 --- a/sql/ordering/_sloanOrdering.sql +++ b/sql/ordering/_sloanOrdering.sql @@ -7,7 +7,7 @@ Mail: project@pgrouting.org Function's developer: Copyright (c) 2025 Bipasha Gayary -Mail: bipashagayary@gmail.com +Mail: bipashagayary at gmail.com ------ @@ -33,9 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --v4.0.0 CREATE FUNCTION _pgr_sloanOrdering( - edges_sql TEXT, - start_vid BIGINT DEFAULT 0, - end_vid BIGINT DEFAULT 0, + TEXT, OUT seq BIGINT, OUT node BIGINT ) @@ -46,6 +44,6 @@ LANGUAGE C IMMUTABLE STRICT; -- COMMENTS -COMMENT ON FUNCTION _pgr_sloanOrdering(TEXT, BIGINT, BIGINT) +COMMENT ON FUNCTION _pgr_sloanOrdering(TEXT) IS 'pgRouting internal function'; diff --git a/sql/ordering/sloanOrdering.sql b/sql/ordering/sloanOrdering.sql index 7ecdad545c..a1986b543b 100644 --- a/sql/ordering/sloanOrdering.sql +++ b/sql/ordering/sloanOrdering.sql @@ -7,7 +7,7 @@ Mail: project@pgrouting.org Function's developer: Copyright (c) 2025 Bipasha Gayary -Mail: bipashagayary@gmail.com +Mail: bipashagayary at gmail.com ------ @@ -34,14 +34,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --v4.0.0 CREATE FUNCTION pgr_sloanOrdering( TEXT, -- edges_sql (required) - BIGINT, --start_vid (optional) - BIGINT, --end_vid (optional) OUT seq BIGINT, OUT node BIGINT) RETURNS SETOF RECORD AS $BODY$ SELECT seq, node - FROM _pgr_sloanOrdering(_pgr_get_statement($1), $2, $3); + FROM _pgr_sloanOrdering(_pgr_get_statement($1)); $BODY$ LANGUAGE SQL VOLATILE STRICT; @@ -52,8 +50,6 @@ IS 'pgr_sloanOrdering - EXPERIMENTAL - Parameters: - Edges SQL with columns: id, source, target, cost [,reverse_cost] - - start_vid: Starting vertex id for sloan ordering - - end_vid: End/goal vertex id - Documentation: - ${PROJECT_DOC_LINK}/pgr_sloanOrdering.html diff --git a/src/ordering/ordering_process.cpp b/src/ordering/ordering_process.cpp index 527f394669..dd2c0129b1 100644 --- a/src/ordering/ordering_process.cpp +++ b/src/ordering/ordering_process.cpp @@ -43,16 +43,12 @@ extern "C" { /** which = 0 -> sloan which = 1 -> cuthillmckee - which = 2 -> mindegree - which = 3 -> king This is c++ code, linked as C code, because pgr_process_foo is called from C code */ void pgr_process_ordering( - const Edge_t* edges_sql, - size_t total_edges, - int64_t start_vid, - int64_t end_vid, + const char* edges_sql, + int which, II_t_rt **result_tuples, size_t *result_count) { pgassert(edges_sql); @@ -66,24 +62,18 @@ void pgr_process_ordering( clock_t start_t = clock(); do_ordering( edges_sql, - total_edges, - start_vid, - end_vid, + which, result_tuples, result_count, - &log_msg, &err_msg); + &log_msg , ¬ice_msg, &err_msg); if (which == 0) { time_msg(std::string(" processing pgr_sloanOrdering").c_str(), start_t, clock()); - } else if ( which == 1) { + + } else { time_msg(std::string(" processing pgr_cuthillMckeeOrdering").c_str(), start_t, clock()); - } else if ( which == 2) { - time_msg(std::string(" processing pgr_minimumDegreeOrdering").c_str(), start_t, clock()); - } else { - - time_msg(std::string(" processing pgr_kingOrdering").c_str(), start_t, clock()); - } + } if (err_msg && (*result_tuples)) { diff --git a/src/ordering/sloanOrdering.c b/src/ordering/sloanOrdering.c index e3adbc1213..d0d75b29ba 100644 --- a/src/ordering/sloanOrdering.c +++ b/src/ordering/sloanOrdering.c @@ -7,7 +7,7 @@ Mail: project@pgrouting.org Developer: Copyright (c) 2025 Bipasha Gayary -Mail: bipashagayary@gmail.com +Mail: bipashagayary at gmail.com ------ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -87,20 +87,16 @@ _pgr_sloanordering(PG_FUNCTION_ARGS) { II_t_rt *result_tuples = NULL; size_t result_count = 0; - size_t total_edges = 0; if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - - Edge_t *edges_sql = NULL; + pgr_process_ordering( - edges_sql, - total_edges, - PG_GETARG_INT64(1), - PG_GETARG_INT64(2), + text_to_cstring(PG_GETARG_TEXT_P(0)), + 0, /* Sloan */ &result_tuples, &result_count);