pgr_depthFirstSearch GSoC-2020 Week [-1]

.travis.yml

@@ -5,8 +5,8 @@
 # Main configuration
 # ------------------------------------------------------------------------------
 
+os: linux
 dist: xenial
-sudo: required
 
 
 language: cpp
@@ -16,135 +16,140 @@ compiler:
 
 python:
   - "3.5"
-  - "pypy3.5"
+  - "pypy3"
 
-matrix:
+
+jobs:
   include:
-    - os: linux
-      env: POSTGRESQL_VERSION=10 DOCUMENTATION=OFF BUILD_TYPE=Debug
-      addons:
-        postgresql: 10
+    - addons:
+        postgresql: "9.5"
         apt:
-          sources:
-            - boost-latest
-            - ubuntu-toolchain-r-test
           packages:
-            - postgresql-10-postgis-2.4
-            - postgresql-10-postgis-2.4-scripts
-            - postgresql-10-pgtap
-            - postgresql-server-dev-10
-            - libboost-graph-dev
+            - postgresql-9.5-postgis-2.4
+            - postgresql-server-dev-9.5
+            - postgresql-9.5-pgtap
             - libtap-parser-sourcehandler-pgtap-perl
-
-    - os: linux
-      env: POSTGRESQL_VERSION=9.6 DOCUMENTATION=OFF BUILD_TYPE=Debug
-      addons:
-        postgresql: 9.6
+            - libboost-graph-dev
+      env:
+        PGPORT: "5432"
+        POSTGRESQL_VERSION: 9.5
+        BUILD_TYPE: "Debug"
+        DOCUMENTATION: "OFF"
+
+    - addons:
+        postgresql: "9.6"
         apt:
-          sources:
-            - boost-latest
-            - ubuntu-toolchain-r-test
           packages:
             - postgresql-9.6-postgis-2.4
-            - postgresql-9.6-postgis-2.4-scripts
-            - postgresql-9.6-pgtap
             - postgresql-server-dev-9.6
-            - libboost-graph-dev
+            - postgresql-9.6-pgtap
             - libtap-parser-sourcehandler-pgtap-perl
-
-    - os: linux
-      env: POSTGRESQL_VERSION=9.5 DOCUMENTATION=OFF BUILD_TYPE=Debug
-      addons:
-        postgresql: 9.5
+            - libboost-graph-dev
+      env:
+        PGPORT: "5432"
+        POSTGRESQL_VERSION: 9.6
+        BUILD_TYPE: "Debug"
+        DOCUMENTATION: "OFF"
+
+    - addons:
+        postgresql: "10"
         apt:
-          sources:
-            - boost-latest
-            - ubuntu-toolchain-r-test
           packages:
-            - postgresql-9.5-postgis-2.4
-            - postgresql-9.5-postgis-2.4-scripts
-            - postgresql-9.5-pgtap
-            - postgresql-server-dev-9.5
-            - libboost-graph-dev
+            - postgresql-10-postgis-2.4
+            - postgresql-server-dev-10
+            - postgresql-10-pgtap
             - libtap-parser-sourcehandler-pgtap-perl
-
-    - os: linux
-      env: POSTGRESQL_VERSION=9.4 DOCUMENTATION=OFF BUILD_TYPE=Debug
-      addons:
-        postgresql: 9.4
+            - libboost-graph-dev
+      env:
+        PGPORT: "5432"
+        POSTGRESQL_VERSION: 10
+        BUILD_TYPE: "Debug"
+        DOCUMENTATION: "OFF"
+
+    - addons:
+        postgresql: "11"
         apt:
-          sources:
-            - boost-latest
-            - ubuntu-toolchain-r-test
           packages:
-            - postgresql-9.4-postgis-2.4
-            - postgresql-9.4-postgis-2.4-scripts
-            - postgresql-9.4-pgtap
-            - postgresql-server-dev-9.4
-            - libboost-graph-dev
+            - postgresql-11-postgis-3
+            - postgresql-server-dev-11
+            - postgresql-11-pgtap
+            - postgresql-client-11
+            - postgresql-client-common
+            - postgresql-common
             - libtap-parser-sourcehandler-pgtap-perl
-
-    - os: linux
-      env: POSTGRESQL_VERSION=9.6 DOCUMENTATION=OFF BUILD_TYPE=Release
-      addons:
-        postgresql: 9.6
+            - libboost-graph-dev
+      env:
+        PGPORT: "5433"
+        PGVERSION: 11
+        POSTGRESQL_VERSION: 11
+        BUILD_TYPE: "Debug"
+        DOCUMENTATION: "OFF"
+    - addons:
+        postgresql: "12"
         apt:
-          sources:
-            - boost-latest
-            - ubuntu-toolchain-r-test
           packages:
-            - postgresql-9.6-postgis-2.4
-            - postgresql-9.6-postgis-2.4-scripts
-            - postgresql-9.6-pgtap
-            - postgresql-server-dev-9.6
-            - libboost-graph-dev
+            - postgresql-12-postgis-3
+            - postgresql-server-dev-12
+            - postgresql-12-pgtap
+            - postgresql-client-12
+            - postgresql-client-common
+            - postgresql-common
             - libtap-parser-sourcehandler-pgtap-perl
-
-    - os: linux
-      env: POSTGRESQL_VERSION=9.6 DOCUMENTATION=ON BUILD_TYPE=Release
-      addons:
-        postgresql: 9.6
+            - libboost-graph-dev
+      env:
+        PGPORT: "5433"
+        PGVERSION: 12
+        POSTGRESQL_VERSION: 12
+        BUILD_TYPE: "Debug"
+        DOCUMENTATION: "OFF"
+    - addons:
+        postgresql: "12"
         apt:
-          sources:
-            - boost-latest
-            - ubuntu-toolchain-r-test
           packages:
-            - postgresql-server-dev-9.6
+            - postgresql-12-postgis-3
+            - postgresql-server-dev-12
+            - postgresql-12-pgtap
+            - postgresql-client-12
+            - postgresql-client-common
+            - postgresql-common
+            - libtap-parser-sourcehandler-pgtap-perl
             - libboost-graph-dev
-            - python-sphinx
-
+            - graphviz
+      env:
+        PGPORT: "5433"
+        PGVERSION: 12
+        POSTGRESQL_VERSION: 12
+        BUILD_TYPE: "Release"
+        DOCUMENTATION: "ON"
 
+services:
+  - postgresql
 
 before_install:
-  - sudo updatedb
-  - locate pg_config
-  - PGR_VERSION=$(grep -Po '(?<=project\(PGROUTING VERSION )[^;]+' CMakeLists.txt)
-  - echo "Building for $PGR_VERSION"
-  - sudo service postgresql stop
-  - sed -e 's/^port.*/port = 5432/' /etc/postgresql/$POSTGRESQL_VERSION/main/postgresql.conf > postgresql.conf
-  - sudo chown postgres postgresql.conf
-  - sudo mv postgresql.conf /etc/postgresql/$POSTGRESQL_VERSION/main
-  - sudo service postgresql start
+  - "if [ ! -z $PGVERSION ]; then sudo cp /etc/postgresql/{9.6,$PGVERSION}/main/pg_hba.conf; fi"
+  - "if [ ! -z $PGVERSION ]; then sudo service postgresql restart $PGVERSION; fi"
 
 install:
-  - if [ "$DOCUMENTATION" == "ON" ]; then  sphinx-build --version; fi
+  - pip install --user sphinx==1.6.5
+
 
 before_script:
-  - export PATH=/usr/lib/postgresql/$POSTGRESQL_VERSION/bin:$PATH
-  - if [ "$DOCUMENTATION" == "OFF" ]; then /usr/lib/postgresql/$POSTGRESQL_VERSION/bin/psql -p 5432 -U postgres -c "CREATE EXTENSION postgis"; fi
   # initialize databases
+  - psql --version
+  - psql -c 'SELECT version();' -U postgres -p $PGPORT
   - createdb  -U postgres ___pgr___test___
   - createdb  -U postgres pgr_test__db__test
+  - psql -U postgres -c "CREATE EXTENSION postgis"  -d ___pgr___test___
   - mkdir build
   - cd build
   - cmake  -DPOSTGRESQL_VERSION=$POSTGRESQL_VERSION -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DWITH_DOC=$DOCUMENTATION ..
 
 script:
-  - if [ "$DOCUMENTATION" == "OFF" ]; then make; sudo make install; sudo cp  /usr/lib/postgresql/11/lib/libpgrouting-3.0.so /usr/lib/postgresql/$POSTGRESQL_VERSION/lib/libpgrouting-3.0.so; sudo cp /usr/share/postgresql/11/extension/pgrouting* /usr/share/postgresql/$POSTGRESQL_VERSION/extension; fi
+  - if [ "$DOCUMENTATION" == "OFF" ]; then make -j 4; sudo make install; fi
   - if [ "$DOCUMENTATION" == "ON" ]; then make doc; fi
 
   # tests as part of script so if a test fails the build fails
   - cd ..
-  - if [ "$DOCUMENTATION" == "OFF" ]; then bash ./tools/testers/pg_prove_tests.sh postgres 5432 $BUILD_TYPE; fi
+  - if [ "$DOCUMENTATION" == "OFF" ]; then bash ./tools/testers/pg_prove_tests.sh postgres $PGPORT $BUILD_TYPE; fi
   - if [ "$DOCUMENTATION" == "OFF" ] && [ "$BUILD_TYPE" == "Debug" ]; then bash ./ci/travis/doc-quieries_test.sh $POSTGRESQL_VERSION postgres; fi
 

.tx/config

@@ -252,6 +252,11 @@ file_filter = locale/<lang>/LC_MESSAGES/proposed.po
 source_file = locale/pot/proposed.pot
 source_lang = en
 
+[pgrouting.experimental-po--master]
+file_filter = locale/<lang>/LC_MESSAGES/experimental.po
+source_file = locale/pot/experimental.pot
+source_lang = en
+
 [pgrouting.pgrouting-installation-po--master]
 file_filter = locale/<lang>/LC_MESSAGES/pgRouting-installation.po
 source_file = locale/pot/pgRouting-installation.pot

CMakeLists.txt

@@ -35,7 +35,7 @@ include(pgr/BuildType)
 
 project(PGROUTING VERSION 3.0.0
     LANGUAGES C CXX )
-set(PGROUTING_VERSION_DEV "-rc1")
+set(PGROUTING_VERSION_DEV "")
 
 include(pgr/GitInfo)
 

ci/travis/doc-quieries_test.sh

@@ -70,7 +70,12 @@ then
     ERROR=1
 fi
 
-./tools/testers/doc_queries_generator.pl -pgver "${POSTGRESQL_VERSION}" -pguser "${PGUSER}" -documentation
+TESTDIRS="version"
+for d in ${TESTDIRS}
+do
+    ./tools/testers/doc_queries_generator.pl -pgver "${POSTGRESQL_VERSION}" -pguser "${PGUSER}" -documentation -alg "${d}"
+done
+
 ./tools/testers/doc_queries_generator.pl -pgver "${POSTGRESQL_VERSION}" -pguser "${PGUSER}"
 
 if [ "$?" -ne 0 ]

configuration.conf

@@ -40,6 +40,7 @@ version             | Y | Y | Y
 topologicalSort     | Y | Y | Y 
 transitiveClosure   | Y | Y | Y
 breadthFirstSearch  | Y | Y | Y
+depthFirstSearch    | Y | Y | N
 #----------------------
 # SQL only directories
 #----------------------

doc/contraction/contraction-family.rst

@@ -423,21 +423,23 @@ Add additional columns
 
 Adding extra columns to the ``edge_table`` and ``edge_table_vertices_pgr`` tables, where:
 
-=======================  ==================================================
+========================  ==================================================
 Column                    Description
-=======================  ==================================================
-**contracted_vertices**  The vertices set belonging to the vertex/edge
-**is_contracted**        On the `vertex` table
+========================  ==================================================
+**contracted_vertices**   The vertices set belonging to the vertex/edge
+**is_contracted**         On the `vertex` table
 
-                         * when ``true`` the vertex is contracted, its not part of the contracted graph.
-                         * when ``false`` the vertex is not contracted, its part of the contracted graph.
+                          * when ``true`` the vertex is contracted, its not part of the contracted graph.
+                          * when ``false`` the vertex is not contracted, its part of the contracted graph.
 
-**is_new**               On the `edge` table:
+**is_new**                On the `edge` table:
+
+                          * when ``true`` the edge was generated by the contraction algorithm. its part of the contracted graph.
+                          * when ``false`` the edge is an original edge, might be or not part of the contracted graph.
+
+========================  ==================================================
 
-                         * when ``true`` the edge was generated by the contraction algorithm. its part of the contracted graph.
-                         * when ``false`` the edge is an original edgei, might be or not part of the contracted graph.
 
-=======================  ==================================================
 
 .. literalinclude:: doc-contraction-family.queries
    :start-after: -- q1

doc/depthFirstSearch/CMakeLists.txt

@@ -0,0 +1,12 @@
+
+SET(LOCAL_FILES
+    pgr_depthFirstSearch.rst
+    )
+
+foreach (f ${LOCAL_FILES})
+    configure_file(${f} "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}")
+    list(APPEND LOCAL_DOC_FILES  ${PGR_DOCUMENTATION_SOURCE_DIR}/${f})
+endforeach()
+
+set(PGROUTING_DOC_FILES ${PGROUTING_DOC_FILES} ${LOCAL_DOC_FILES} PARENT_SCOPE)
+