Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/_static/page_history.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ var titles = [


var newpages = [
{v: '4.0', pages: ['pgr_kingOrdering', 'pgr_minDegreeOrdering']},

{v: '3.8', pages: ['pgr_contractionDeadEnd', 'pgr_contractionLinear', 'pgr_separateCrossing',
'pgr_separateTouching']},

Expand Down
2 changes: 2 additions & 0 deletions doc/ordering/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ SET(LOCAL_FILES
ordering-family.rst
pgr_cuthillMckeeOrdering.rst
pgr_topologicalSort.rst
pgr_kingOrdering.rst
pgr_minDegreeOrdering.rst
)

foreach (f ${LOCAL_FILES})
Expand Down
4 changes: 4 additions & 0 deletions doc/ordering/ordering-family.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ Ordering - Family of functions

* :doc:`pgr_cuthillMckeeOrdering` - Return reverse Cuthill-McKee ordering of an undirected graph.
* :doc:`pgr_topologicalSort` - Linear ordering of the vertices for directed
* :doc:`pgr_kingOrdering` - Returns the King ordering of an undirected graphs
* :doc:`pgr_minDegreeOrdering` - Returns the Minimum Degree ordering of an undirected graphs
acyclic graph.

.. official-end
Expand All @@ -32,6 +34,8 @@ Ordering - Family of functions

pgr_cuthillMckeeOrdering
pgr_topologicalSort
pgr_kingOrdering
pgr_minDegreeOrdering

See Also
-------------------------------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions doc/ordering/pgr_cuthillMckeeOrdering.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ Edges SQL
Result columns
-------------------------------------------------------------------------------

.. node_ordering_start

Returns set of ``(seq, node)``

=============== =========== ======================================
Expand All @@ -103,6 +105,8 @@ Column Type Description
``node`` ``BIGINT`` New ordering in reverse order.
=============== =========== ======================================

.. node_ordering_end

See Also
-------------------------------------------------------------------------------

Expand Down
93 changes: 93 additions & 0 deletions doc/ordering/pgr_kingOrdering.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
..
****************************************************************************
pgRouting Manual
Copyright(c) pgRouting Contributors

This documentation is licensed under a Creative Commons Attribution-Share
Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
****************************************************************************

.. index::
single: Ordering Family ; pgr_kingOrdering
single: kingOrdering - Experimental on v4.0

|

``pgr_kingOrdering`` - Experimental
===============================================================================

``pgr_kingOrdering`` — Returns the King ordering of an undirected graphs

.. include:: experimental.rst
:start-after: warning-begin
:end-before: end-warning

.. rubric:: Availability

* Version 4.0.0

* New experimental function.


Description
-------------------------------------------------------------------------------

TBD

Signatures
------------------------------------------------------------------------------

.. index::
single: kingOrdering - Experimental on v4.0

.. admonition:: \ \
:class: signatures

| pgr_kingOrdering(`Edges SQL`_)

| Returns set of |result_node_order|
| OR EMPTY SET

:Example: Graph ordering of pgRouting :doc:`sampledata`

.. literalinclude:: kingOrdering.queries
:start-after: -- q1
:end-before: -- q2

Parameters
-------------------------------------------------------------------------------

.. include:: pgRouting-concepts.rst
:start-after: only_edge_param_start
:end-before: only_edge_param_end

Inner Queries
-------------------------------------------------------------------------------

Edges SQL
...............................................................................

.. include:: pgRouting-concepts.rst
:start-after: basic_edges_sql_start
:end-before: basic_edges_sql_end

Result columns
-------------------------------------------------------------------------------

.. include:: pgr_cuthillMckeeOrdering.rst
:start-after: node_ordering_start
:end-before: node_ordering_end

See Also
-------------------------------------------------------------------------------

* :doc:`sampledata`
* `Boost: King Ordering
<https://www.boost.org/libs/graph/doc/king_ordering.html>`__

.. rubric:: Indices and tables

* :ref:`genindex`
* :ref:`search`


93 changes: 93 additions & 0 deletions doc/ordering/pgr_minDegreeOrdering.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
..
****************************************************************************
pgRouting Manual
Copyright(c) pgRouting Contributors

This documentation is licensed under a Creative Commons Attribution-Share
Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
****************************************************************************

.. index::
single: Ordering Family ; pgr_minDegreeOrdering
single: minDegreeOrdering - Experimental on v4.0

|

``pgr_minDegreeOrdering`` - Experimental
===============================================================================

``pgr_minDegreeOrdering`` — Returns the minimum degree ordering of an undirected graphs

.. include:: experimental.rst
:start-after: warning-begin
:end-before: end-warning

.. rubric:: Availability

* Version 4.0.0

* New experimental function.


Description
-------------------------------------------------------------------------------

TBD

Signatures
------------------------------------------------------------------------------

.. index::
single: minDegreeOrdering - Experimental on v4.0

.. admonition:: \ \
:class: signatures

| pgr_minDegreeOrdering(`Edges SQL`_)

| Returns set of |result_node_order|
| OR EMPTY SET

:Example: Graph ordering of pgRouting :doc:`sampledata`

.. literalinclude:: minDegreeOrdering.queries
:start-after: -- q1
:end-before: -- q2

Parameters
-------------------------------------------------------------------------------

.. include:: pgRouting-concepts.rst
:start-after: only_edge_param_start
:end-before: only_edge_param_end

Inner Queries
-------------------------------------------------------------------------------

Edges SQL
...............................................................................

.. include:: pgRouting-concepts.rst
:start-after: basic_edges_sql_start
:end-before: basic_edges_sql_end

Result columns
-------------------------------------------------------------------------------

.. include:: pgr_cuthillMckeeOrdering.rst
:start-after: node_ordering_start
:end-before: node_ordering_end

See Also
-------------------------------------------------------------------------------

* :doc:`sampledata`
* `Boost: King Ordering
<https://www.boost.org/libs/graph/doc/minimum_degree_ordering.html>`__

.. rubric:: Indices and tables

* :ref:`genindex`
* :ref:`search`


2 changes: 2 additions & 0 deletions docqueries/ordering/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
SET(LOCAL_FILES
cuthillMckeeOrdering
topologicalSort
kingOrdering
minDegreeOrdering
)

foreach (f ${LOCAL_FILES})
Expand Down
63 changes: 0 additions & 63 deletions include/drivers/ordering/kingOrdering_driver.h

This file was deleted.

63 changes: 0 additions & 63 deletions include/drivers/ordering/minimumDegreeOrdering_driver.h

This file was deleted.

Empty file removed just_start_week8
Empty file.
Loading