Merge pull request #434 from cvvergara/week2-dijkstra

Week2 dijkstra demo

Author: cvvergara

.github/workflows/ubuntu.yml

@@ -29,28 +29,28 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-          psql: [13,14,15,16,17]
+          psql: [13,14,15,16,17,18]
           postgis: [3]
-          os: [ubuntu-latest, ubuntu-22.04, ubuntu-20.04]
+          os: [ubuntu-latest, ubuntu-22.04]
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: get postgres version
+      - name: 'Raise Priority for apt.postgresql.org'
         run: |
-          sudo service postgresql start
-          pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()')
-          echo "PGVER=${pgver}" >> $GITHUB_ENV
-          PGP=5433
-          if [ "${{ matrix.psql }}" == "${pgver}" ]; then PGP=5432; fi
-          echo "PGPORT=${PGP}" >> $GITHUB_ENV
-
+          cat << EOF >> ./pgdg.pref
+          Package: *
+          Pin: release o=apt.postgresql.org
+          Pin-Priority: 600
+          EOF
+          sudo mv ./pgdg.pref /etc/apt/preferences.d/
+          sudo apt update
+        
       - name: Add PostgreSQL APT repository
         run: |
-          sudo apt-get install curl ca-certificates gnupg
-          curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
-          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ \
-            $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+          sudo apt-get purge postgresql-*
+          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg-testing main ${{ matrix.psql }}" > /etc/apt/sources.list.d/pgdg.list'
+          curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
 
       - name: Install dependencies
         run: |
@@ -81,6 +81,7 @@ jobs:
         run: |
           sudo service postgresql start
           export PG_RUNNER_USER=`whoami`
+          export PGPORT=5432
           sudo -u postgres psql -p ${PGPORT} -c "DROP DATABASE IF EXISTS ___pgr___test___;"
           sudo -u postgres psql -p ${PGPORT} -c "DROP DATABASE IF EXISTS \"${PG_RUNNER_USER}\";"
           sudo -u postgres psql -p ${PGPORT} -c "DROP ROLE IF EXISTS \"${PG_RUNNER_USER}\";"

NEWS.md

@@ -58,6 +58,28 @@ milestone for 4.0.0
   * pgr_trsp(text,integer,integer,boolean,boolean,text)
   * pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)
 
+* [#2888](https://github.com/pgRouting/pgrouting/issues/2888):
+  pgr_findCloseEdges
+
+  * pgr_findcloseedges(text,geometry,double precision,integer,boolean,boolean)
+  * pgr_findcloseedges(text,geometry[],double precision,integer,boolean,boolean)
+
+* [#2890](https://github.com/pgRouting/pgrouting/issues/2890):
+  pgr_withPointsDD
+
+  * pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)
+  * pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)
+
+* [#2895](https://github.com/pgRouting/pgrouting/issues/2895):
+  pgr_withPointsKSP
+
+  * pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,character,boolean)
+
+* [#2899](https://github.com/pgRouting/pgrouting/issues/2899):
+  pgr_maxCardinalityMatch
+
+  * pgr_maxcardinalitymatch(text,boolean)
+
 **Removal of SQL deprecated functions**
 
 * [#2681](https://github.com/pgRouting/pgrouting/issues/2681):
@@ -74,23 +96,35 @@ milestone for 4.0.0
   pgr_analyzeOneWay
 * [#2827](https://github.com/pgRouting/pgrouting/issues/2827):
   pgr_createVerticesTable
+* [#2886](https://github.com/pgRouting/pgrouting/issues/2886):
+  pgr_nodeNetwork
 
 **Removal of SQL deprecated internal functions**
 
+Related issues: [#2897](https://github.com/pgRouting/pgrouting/issues/2897)
+
 * _pgr_dijkstranear(text,anyarray,anyarray,bigint,boolean)
 * _pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)
 * _pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)
 * _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)
 * _pgr_dijkstra(text,text,boolean,boolean,boolean)
 * _pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)
+* _pgr_ksp(text,anyarray,anyarray,integer,boolean,boolean,boolean)
+* _pgr_ksp(text,bigint,bigint,integer,boolean,boolean)
+* _pgr_ksp(text,text,integer,boolean,boolean)
 * _pgr_kruskal(text,anyarray,text,bigint,double precision)
+* _pgr_maxcardinalitymatch(text,boolean)
 * _pgr_prim(text,anyarray,text,bigint,double precision)
 * _pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)
 * _pgr_trsp(text,text,anyarray,anyarray,boolean)
 * _pgr_trsp(text,text,anyarray,bigint,boolean)
 * _pgr_trsp(text,text,bigint,anyarray,boolean)
 * _pgr_trsp(text,text,bigint,bigint,boolean)
 * _pgr_trspviavertices(text,integer[],boolean,boolean,text)
+* _pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)
+* _pgr_withpointsksp(text,text,anyarray,anyarray,integer,character,boolean,boolean,boolean,boolean)
+* _pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,character,boolean)
+* _pgr_withpointsksp(text,text,text,integer,character,boolean,boolean,boolean)
 * _pgr_withpointsvia(text,bigint[],double precision[],boolean)
 * _trsp(text,text,anyarray,anyarray,boolean)
 * _v4trsp(text,text,anyarray,anyarray,boolean)
@@ -131,5 +165,6 @@ milestone for 4.0.0
 * _trsp(text,text,anyarray,anyarray,boolean)
 * _v4trsp(text,text,anyarray,anyarray,boolean)
 * _v4trsp(text,text,text,boolean)
+* _pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)
 
 </details>

configuration.conf

@@ -52,5 +52,4 @@ categories          | N | N | Y
 #----------------------
 # SQL only directories
 #----------------------
-topology            | N | Y | Y
 utilities           | N | Y | Y

doc/_static/page_history.js

@@ -207,29 +207,10 @@ var filesArr = [
         { v: '2.1', n: 'src/apsp_johnson/doc/index'},
         { v: '2.3', n: 'src/allpairs/doc/pgr_johnson'}
     ]),
-    new createInfo('pgr_nodeNetwork', '2.0', [
-        { v: '2.1', n: 'src/common/doc/functions/node_network'},
-        { v: '2.3', n: 'src/topology/doc/pgr_nodeNetwork'},
-    ]),
-    new createInfo('topology-functions', '2.0', [
+    new createInfo('utilities-family', '2.0', [
         { v: '2.1', n: 'src/common/doc/functions/index'},
         { v: '2.3', n: 'src/topology/doc/topology'},
-    ]),
-    new createInfo('pgr_createVerticesTable', '2.0', [
-        { v: '2.1', n: 'src/common/doc/functions/create_vert_table'},
-        { v: '2.3', n: 'src/topology/doc/pgr_createVerticesTable'}, 3.8
-    ]),
-    new createInfo('pgr_createTopology', '2.0', [
-        { v: '2.1', n: 'src/common/doc/functions/create_topology'},
-        { v: '2.3', n: 'src/topology/doc/pgr_createTopology'}, 3.8
-    ]),
-    new createInfo('pgr_analyzeOneWay', '2.0', [
-        { v: '2.1', n: 'src/common/doc/functions/analyze_oneway'},
-        { v: '2.3', n: 'src/topology/doc/pgr_analyzeOneWay'}, 3.8
-    ]),
-    new createInfo('pgr_analyzeGraph', '2.0', [
-        { v: '2.1', n: 'src/common/doc/functions/analyze_graph'},
-        { v: '2.3', n: 'src/topology/doc/pgr_analyzeGraph'},
+        { v: '3.8', n: 'topology-functions'},
     ]),
     new createInfo('pgRouting-concepts', '2.0', [
         { v: '2.3', n: 'doc/src/tutorial/tutorial'},
@@ -260,6 +241,27 @@ var filesArr = [
         { v: '2.1', n: 'src/driving_distance/doc/dd_driving_distance_v3'},
         { v: '2.3', n: 'src/driving_distance/doc/pgr_drivingDistance'}
     ]),
+
+    new createInfo('pgr_nodeNetwork', '2.0', [
+        { v: '2.1', n: 'src/common/doc/functions/node_network'},
+        { v: '2.3', n: 'src/topology/doc/pgr_nodeNetwork'}, 3.8
+    ]),
+    new createInfo('pgr_createVerticesTable', '2.0', [
+        { v: '2.1', n: 'src/common/doc/functions/create_vert_table'},
+        { v: '2.3', n: 'src/topology/doc/pgr_createVerticesTable'}, 3.8
+    ]),
+    new createInfo('pgr_createTopology', '2.0', [
+        { v: '2.1', n: 'src/common/doc/functions/create_topology'},
+        { v: '2.3', n: 'src/topology/doc/pgr_createTopology'}, 3.8
+    ]),
+    new createInfo('pgr_analyzeOneWay', '2.0', [
+        { v: '2.1', n: 'src/common/doc/functions/analyze_oneway'},
+        { v: '2.3', n: 'src/topology/doc/pgr_analyzeOneWay'}, 3.8
+    ]),
+    new createInfo('pgr_analyzeGraph', '2.0', [
+        { v: '2.1', n: 'src/common/doc/functions/analyze_graph'},
+        { v: '2.3', n: 'src/topology/doc/pgr_analyzeGraph'}, 3.8
+    ]),
     new createInfo('pgr_alphaShape', '2.0', [
         { v: '2.1', n: 'src/driving_distance/doc/dd_alphashape'},
         { v: '2.3', n: 'src/alpha_shape/doc/pgr_alphaShape'}, 3.8

doc/conf.py.in

@@ -333,7 +333,11 @@ linkcheck_ignore = [
     r'https://github.com/pgRouting/pgrouting/issues/*',    # limit only pgrouting
     r'https://github.com/pgRouting/pgrouting/archive/*',
     r'https://docs.pgrouting.org/3.8/*',
-    r'https://www.overpass-api.de/*'
+    # Currently has a problem
+    'https://www.boost.org/doc/libs/1_78_0/libs/graph/doc/hawick_circuits.html',
+    r'https://www.overpass-api.de/*',
+    # 403 Client error
+    'https://gis.stackexchange.com/questions/tagged/pgrouting'
 ]
 
 linkcheck_timeout = 20

doc/metrics/pgr_degree.rst

@@ -378,7 +378,7 @@ If there is a vertices table already built using the ``pgr_extractVertices``
 See Also
 -------------------------------------------------------------------------------
 
-* :doc:`topology-functions`
+* :doc:`utilities-family`
 * :doc:`pgr_extractVertices`
 
 .. rubric:: Indices and tables