Skip to content

Commit ba40050

Browse files
Saloni-2005Saloni-2005
committed
Merge remote-tracking branch 'upstream/develop' into new-function-bandwidth-try1
2 parents 2f08b15 + de15dde commit ba40050

161 files changed

Lines changed: 550 additions & 693 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎doc/allpairs/pgr_johnson.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
===============================================================================
1818

1919
``pgr_johnson`` - Returns the sum of the costs of the shortest path for each
20-
pair of nodes in the graph using Floyd-Warshall algorithm.
20+
pair of nodes in the graph using Johnson algorithm.
2121

2222
.. rubric:: Availability
2323

‎doc/contraction/pgr_contractionHierarchies.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ shortcut edges created.
2323

2424
.. rubric:: Availability
2525

26-
* Version 3.8.0
26+
.. rubric:: Version 3.8.0
2727

28-
* New **experimental** function
28+
* New experimental function
2929

3030

3131
Description

‎doc/src/pgRouting-introduction.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ Contributors
6363
This Release Contributors
6464
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
6565

66-
Individuals in this release v3.8.x (in alphabetical order)
66+
Individuals in this release v4.0.0 (in alphabetical order)
6767
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6868

69-
Aurélie Bousquet,
7069
Regina Obe,
7170
Saloni kumari,
7271
Vicky Vergara

‎doc/src/support.rst‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,22 @@ Bugs are reported and managed in an `issue tracker
4848
4949
5050
51-
Mailing List and GIS StackExchange
51+
Mailing List, Matrix, GIS StackExchange
5252
-------------------------------------------------------------------------------
5353

54-
There are two mailing lists for pgRouting hosted on OSGeo mailing list server:
54+
There are two mailing lists for pgRouting hosted on OSGeo discourse server:
5555

56-
* User mailing list: https://lists.osgeo.org/mailman/listinfo/pgrouting-users
56+
* User mailing list: https://discourse.osgeo.org/c/pgrouting/pgrouting-users/
5757
* Developer mailing list: https://discourse.osgeo.org/c/pgrouting/pgrouting-dev/
5858

5959
* Subscribe: https://discourse.osgeo.org/g/pgrouting-dev
6060

6161
For general questions and topics about how to use pgRouting, please write to the
6262
user mailing list.
6363

64+
If you want to chat with fellow pgRouting users and contributors, you
65+
can join our matrix channel: `pgRouting matrix channel <https://matrix.to/#/#pgrouting:osgeo.org>`_.
66+
6467
You can also ask at `GIS StackExchange <https://gis.stackexchange.com/>`_ and
6568
tag the question with ``pgrouting``.
6669
Find all questions tagged with ``pgrouting`` under

‎docqueries/src/sampledata.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,13 @@ SELECT
206206
pid, ST_AsText(geom) geom,
207207
edge_id, fraction AS frac, side, distance AS dist,
208208
ST_AsText(edge) edge, ST_AsText(newPoint) newPoint
209-
FROM pointsOfInterest;
209+
FROM pointsOfInterest ORDER BY pid;
210210
pid | geom | edge_id | frac | side | dist | edge | newpoint
211211
-----+----------------+---------+------+------+------+---------------------------+--------------
212212
1 | POINT(1.8 0.4) | 1 | 0.4 | l | 0.2 | LINESTRING(1.8 0.4,2 0.4) | POINT(2 0.4)
213-
4 | POINT(0.3 1.8) | 6 | 0.3 | r | 0.2 | LINESTRING(0.3 1.8,0.3 2) | POINT(0.3 2)
214-
3 | POINT(2.6 3.2) | 12 | 0.6 | l | 0.2 | LINESTRING(2.6 3.2,2.6 3) | POINT(2.6 3)
215213
2 | POINT(4.2 2.4) | 15 | 0.4 | r | 0.2 | LINESTRING(4.2 2.4,4 2.4) | POINT(4 2.4)
214+
3 | POINT(2.6 3.2) | 12 | 0.6 | l | 0.2 | LINESTRING(2.6 3.2,2.6 3) | POINT(2.6 3)
215+
4 | POINT(0.3 1.8) | 6 | 0.3 | r | 0.2 | LINESTRING(0.3 1.8,0.3 2) | POINT(0.3 2)
216216
5 | POINT(2.9 1.8) | 5 | 0.8 | l | 0.1 | LINESTRING(2.9 1.8,3 1.8) | POINT(3 1.8)
217217
6 | POINT(2.2 1.7) | 4 | 0.7 | b | 0.2 | LINESTRING(2.2 1.7,2 1.7) | POINT(2 1.7)
218218
(6 rows)

‎docqueries/src/withPoints-category.pg‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
-- CopyRight(c) pgRouting developers
22
-- Creative Commons Attribution-Share Alike 3.0 License : https://creativecommons.org/licenses/by-sa/3.0/
33
/* --q1 */
4-
SELECT pid, edge_id, fraction, side FROM pointsOfInterest;
4+
SELECT pid, edge_id, fraction, side FROM pointsOfInterest
5+
ORDER BY pid;
56
/* --q2 */
67
SELECT id, source, target, cost, reverse_cost
78
FROM edges WHERE id = 15;

‎docqueries/src/withPoints-category.result‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ BEGIN
33
SET client_min_messages TO NOTICE;
44
SET
55
/* --q1 */
6-
SELECT pid, edge_id, fraction, side FROM pointsOfInterest;
6+
SELECT pid, edge_id, fraction, side FROM pointsOfInterest
7+
ORDER BY pid;
78
pid | edge_id | fraction | side
89
-----+---------+----------+------
910
1 | 1 | 0.4 | l
10-
4 | 6 | 0.3 | r
11-
3 | 12 | 0.6 | l
1211
2 | 15 | 0.4 | r
12+
3 | 12 | 0.6 | l
13+
4 | 6 | 0.3 | r
1314
5 | 5 | 0.8 | l
1415
6 | 4 | 0.7 | b
1516
(6 rows)

‎locale/en/LC_MESSAGES/pgrouting_doc_strings.po‎

Lines changed: 17 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: pgRouting v3.8\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2025-08-19 15:47+0000\n"
11+
"POT-Creation-Date: 2025-08-18 16:23+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3409,9 +3409,6 @@ msgid ""
34093409
"centrality using Brandes Algorithm"
34103410
msgstr ""
34113411

3412-
msgid ":doc:`pgr_bandwidth` - Computes the bandwidth of a graph."
3413-
msgstr ""
3414-
34153412
msgid ":doc:`TRSP-family`"
34163413
msgstr ""
34173414

@@ -8226,10 +8223,10 @@ msgstr ""
82268223
msgid "This Release Contributors"
82278224
msgstr ""
82288225

8229-
msgid "Individuals in this release v3.8.x (in alphabetical order)"
8226+
msgid "Individuals in this release v4.0.0 (in alphabetical order)"
82308227
msgstr ""
82318228

8232-
msgid "Aurélie Bousquet, Regina Obe, Saloni kumari, Vicky Vergara"
8229+
msgid "Regina Obe, Vicky Vergara"
82338230
msgstr ""
82348231

82358232
msgid ""
@@ -8284,9 +8281,9 @@ msgid ""
82848281
"Nagase, Mahmoud Sakr, Manikata Kondeti, Mario Basa, Martin Wiesenhaan, "
82858282
"Maxim Dubinin, Maoguang Wang, Mohamed Bakli, Mohamed Zia, Mukul Priya, "
82868283
"Nitish Chauhan, Rajat Shinde, Razequl Islam, Regina Obe, Rohith Reddy, "
8287-
"Saloni Kumari, Sarthak Agarwal, Shobhit Chaurasia, Sourabh Garg, Stephen "
8288-
"Woodbridge, Swapnil Joshi, Sylvain Housseman, Sylvain Pasche, Veenit "
8289-
"Kumar, Vidhan Jain, Virginia Vergara, Yige Huang"
8284+
"Sarthak Agarwal, Shobhit Chaurasia, Sourabh Garg, Stephen Woodbridge, "
8285+
"Swapnil Joshi, Sylvain Housseman, Sylvain Pasche, Veenit Kumar, Vidhan "
8286+
"Jain, Virginia Vergara, Yige Huang"
82908287
msgstr ""
82918288

82928289
msgid "Corporate Sponsors (in alphabetical order)"
@@ -9150,59 +9147,6 @@ msgid ""
91509147
"<https://en.wikipedia.org/wiki/Biconnected_component>`__"
91519148
msgstr ""
91529149

9153-
msgid "``pgr_bandwidth`` - Experimental"
9154-
msgstr ""
9155-
9156-
msgid "``pgr_bandwidth`` - Calculates the bandwidth of the graph"
9157-
msgstr ""
9158-
9159-
msgid ""
9160-
"Bandwidth measures how \"spread out\" the connections are in a graph when"
9161-
" vertices are arranged in a linear order (like numbering them 1, 2, 3, "
9162-
"etc.)."
9163-
msgstr ""
9164-
9165-
msgid ""
9166-
"For each edge in the graph, calculate the distance between the vertex "
9167-
"numbers it connects"
9168-
msgstr ""
9169-
9170-
msgid "The bandwidth is the maximum of all these distances"
9171-
msgstr ""
9172-
9173-
msgid "The implementation is for undirected graphs"
9174-
msgstr ""
9175-
9176-
msgid "Run time is 0.160789 seconds"
9177-
msgstr ""
9178-
9179-
msgid "pgr_bandwidth(`Edges SQL`_)"
9180-
msgstr ""
9181-
9182-
msgid "Returns ``BIGINT``"
9183-
msgstr ""
9184-
9185-
msgid "For an undirected graph with edges."
9186-
msgstr ""
9187-
9188-
msgid "Returns a bigint ``(pgr_bandwidth)``"
9189-
msgstr ""
9190-
9191-
msgid "``pgr_bandwidth``"
9192-
msgstr ""
9193-
9194-
msgid "gives the bandwidth of the graph."
9195-
msgstr ""
9196-
9197-
msgid "Undirected graph with edges before optimization."
9198-
msgstr ""
9199-
9200-
msgid "Undirected graph with edges after optimization."
9201-
msgstr ""
9202-
9203-
msgid "`Boost: bandwidth <https://www.boost.org/libs/graph/doc/bandwidth.html>`_"
9204-
msgstr ""
9205-
92069150
msgid "``pgr_bdAstar``"
92079151
msgstr ""
92089152

@@ -13247,7 +13191,7 @@ msgstr ""
1324713191

1324813192
msgid ""
1324913193
"``pgr_johnson`` - Returns the sum of the costs of the shortest path for "
13250-
"each pair of nodes in the graph using Floyd-Warshall algorithm."
13194+
"each pair of nodes in the graph using Johnson algorithm."
1325113195
msgstr ""
1325213196

1325313197
msgid ""
@@ -18798,17 +18742,17 @@ msgid ""
1879818742
"point the step that is causing the problem."
1879918743
msgstr ""
1880018744

18801-
msgid "Mailing List and GIS StackExchange"
18745+
msgid "Mailing List, Matrix, GIS StackExchange"
1880218746
msgstr ""
1880318747

1880418748
msgid ""
18805-
"There are two mailing lists for pgRouting hosted on OSGeo mailing list "
18749+
"There are two mailing lists for pgRouting hosted on OSGeo discourse "
1880618750
"server:"
1880718751
msgstr ""
1880818752

1880918753
msgid ""
18810-
"User mailing list: https://lists.osgeo.org/mailman/listinfo/pgrouting-"
18811-
"users"
18754+
"User mailing list: https://discourse.osgeo.org/c/pgrouting/pgrouting-"
18755+
"users/"
1881218756
msgstr ""
1881318757

1881418758
msgid ""
@@ -18824,6 +18768,12 @@ msgid ""
1882418768
" to the user mailing list."
1882518769
msgstr ""
1882618770

18771+
msgid ""
18772+
"If you want to chat with fellow pgRouting users and contributors, you can"
18773+
" join our matrix channel: `pgRouting matrix channel "
18774+
"<https://matrix.to/#/#pgrouting:osgeo.org>`_."
18775+
msgstr ""
18776+
1882718777
msgid ""
1882818778
"You can also ask at `GIS StackExchange <https://gis.stackexchange.com/>`_"
1882918779
" and tag the question with ``pgrouting``. Find all questions tagged with "

‎locale/pot/pgrouting_doc_strings.pot‎

Lines changed: 11 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: pgRouting v4.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2025-08-19 15:47+0000\n"
11+
"POT-Creation-Date: 2025-08-18 16:23+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3082,9 +3082,6 @@ msgstr ""
30823082
msgid ":doc:`pgr_betweennessCentrality` - Calculates relative betweenness centrality using Brandes Algorithm"
30833083
msgstr ""
30843084

3085-
msgid ":doc:`pgr_bandwidth` - Computes the bandwidth of a graph."
3086-
msgstr ""
3087-
30883085
msgid ":doc:`TRSP-family`"
30893086
msgstr ""
30903087

@@ -7036,10 +7033,10 @@ msgstr ""
70367033
msgid "This Release Contributors"
70377034
msgstr ""
70387035

7039-
msgid "Individuals in this release v3.8.x (in alphabetical order)"
7036+
msgid "Individuals in this release v4.0.0 (in alphabetical order)"
70407037
msgstr ""
70417038

7042-
msgid "Aurélie Bousquet, Regina Obe, Saloni kumari, Vicky Vergara"
7039+
msgid "Regina Obe, Vicky Vergara"
70437040
msgstr ""
70447041

70457042
msgid "And all the people that give us a little of their time making comments, finding issues, making pull requests etc. in any of our products: osm2pgrouting, pgRouting, pgRoutingLayer, workshop."
@@ -7078,7 +7075,7 @@ msgstr ""
70787075
msgid "Individuals (in alphabetical order)"
70797076
msgstr ""
70807077

7081-
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, Saloni Kumari, Sarthak Agarwal, Shobhit Chaurasia, Sourabh Garg, Stephen Woodbridge, Swapnil Joshi, Sylvain Housseman, Sylvain Pasche, Veenit Kumar, Vidhan Jain, Virginia Vergara, Yige Huang"
7078+
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"
70827079
msgstr ""
70837080

70847081
msgid "Corporate Sponsors (in alphabetical order)"
@@ -7819,54 +7816,6 @@ msgstr ""
78197816
msgid "wikipedia: `Biconnected component <https://en.wikipedia.org/wiki/Biconnected_component>`__"
78207817
msgstr ""
78217818

7822-
msgid "``pgr_bandwidth`` - Experimental"
7823-
msgstr ""
7824-
7825-
msgid "``pgr_bandwidth`` - Calculates the bandwidth of the graph"
7826-
msgstr ""
7827-
7828-
msgid "Bandwidth measures how \"spread out\" the connections are in a graph when vertices are arranged in a linear order (like numbering them 1, 2, 3, etc.)."
7829-
msgstr ""
7830-
7831-
msgid "For each edge in the graph, calculate the distance between the vertex numbers it connects"
7832-
msgstr ""
7833-
7834-
msgid "The bandwidth is the maximum of all these distances"
7835-
msgstr ""
7836-
7837-
msgid "The implementation is for undirected graphs"
7838-
msgstr ""
7839-
7840-
msgid "Run time is 0.160789 seconds"
7841-
msgstr ""
7842-
7843-
msgid "pgr_bandwidth(`Edges SQL`_)"
7844-
msgstr ""
7845-
7846-
msgid "Returns ``BIGINT``"
7847-
msgstr ""
7848-
7849-
msgid "For an undirected graph with edges."
7850-
msgstr ""
7851-
7852-
msgid "Returns a bigint ``(pgr_bandwidth)``"
7853-
msgstr ""
7854-
7855-
msgid "``pgr_bandwidth``"
7856-
msgstr ""
7857-
7858-
msgid "gives the bandwidth of the graph."
7859-
msgstr ""
7860-
7861-
msgid "Undirected graph with edges before optimization."
7862-
msgstr ""
7863-
7864-
msgid "Undirected graph with edges after optimization."
7865-
msgstr ""
7866-
7867-
msgid "`Boost: bandwidth <https://www.boost.org/libs/graph/doc/bandwidth.html>`_"
7868-
msgstr ""
7869-
78707819
msgid "``pgr_bdAstar``"
78717820
msgstr ""
78727821

@@ -11164,7 +11113,7 @@ msgstr ""
1116411113
msgid "``pgr_johnson``"
1116511114
msgstr ""
1116611115

11167-
msgid "``pgr_johnson`` - Returns the sum of the costs of the shortest path for each pair of nodes in the graph using Floyd-Warshall algorithm."
11116+
msgid "``pgr_johnson`` - Returns the sum of the costs of the shortest path for each pair of nodes in the graph using Johnson algorithm."
1116811117
msgstr ""
1116911118

1117011119
msgid "The Johnson algorithm, is a good choice to calculate the sum of the costs of the shortest path for each pair of nodes in the graph, for *sparse graphs*. It uses the Boost's implementation which runs in :math:`O(V E \\log V)` time,"
@@ -15601,13 +15550,13 @@ msgstr ""
1560115550
msgid "It is recommended to use the following wrapper on the problem to pin point the step that is causing the problem."
1560215551
msgstr ""
1560315552

15604-
msgid "Mailing List and GIS StackExchange"
15553+
msgid "Mailing List, Matrix, GIS StackExchange"
1560515554
msgstr ""
1560615555

15607-
msgid "There are two mailing lists for pgRouting hosted on OSGeo mailing list server:"
15556+
msgid "There are two mailing lists for pgRouting hosted on OSGeo discourse server:"
1560815557
msgstr ""
1560915558

15610-
msgid "User mailing list: https://lists.osgeo.org/mailman/listinfo/pgrouting-users"
15559+
msgid "User mailing list: https://discourse.osgeo.org/c/pgrouting/pgrouting-users/"
1561115560
msgstr ""
1561215561

1561315562
msgid "Developer mailing list: https://discourse.osgeo.org/c/pgrouting/pgrouting-dev/"
@@ -15619,6 +15568,9 @@ msgstr ""
1561915568
msgid "For general questions and topics about how to use pgRouting, please write to the user mailing list."
1562015569
msgstr ""
1562115570

15571+
msgid "If you want to chat with fellow pgRouting users and contributors, you can join our matrix channel: `pgRouting matrix channel <https://matrix.to/#/#pgrouting:osgeo.org>`_."
15572+
msgstr ""
15573+
1562215574
msgid "You can also ask at `GIS StackExchange <https://gis.stackexchange.com/>`_ and tag the question with ``pgrouting``. Find all questions tagged with ``pgrouting`` under https://gis.stackexchange.com/questions/tagged/pgrouting or subscribe to the `pgRouting questions feed <https://gis.stackexchange.com/feeds/tag?tagnames=pgrouting&sort=newest>`_."
1562315575
msgstr ""
1562415576

‎sql/CMakeLists.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
add_subdirectory(sigs)
22

3+
SET(COST_HIGH 10000)
4+
SET(COST_MED 5000)
5+
SET(COST_LOW 100)
6+
7+
SET(ROWS_HIGH 10000)
8+
SET(ROWS_MED 5000)
9+
SET(ROWS_LOW 100)
310

411
#-------------------
512
# From the parent get the subdirectories that have the SQL files

0 commit comments

Comments
 (0)