Fix for pgr_gsoc_vrppdtw on Release/2.3

.gitattributes

@@ -0,0 +1,19 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.c text eol=lf
+*.h text eol=lf
+*.cpp text eol=lf
+*.hpp text eol=lf
+*.rst text eol=lf
+*.queries text eol=lf
+*.dox text eol=lf
+*.sh text eol=lf
+*.md text eol=lf
+*.queries text eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary

.gitignore

@@ -1,6 +1,7 @@
 # default build directory
 build
 fix_typos
+code_linter
 
 .DS_Store
 .vagrant

.travis.yml

@@ -18,9 +18,6 @@ language: cpp
 compiler:
     - gcc
 
-#notifications:
-#  email:
-#    on_failure: project@pgrouting.org
 
 env: POSTGRESQL_VERSION=9.6   PG_USER=postgres
 
@@ -52,19 +49,13 @@ matrix:
       env: POSTGRESQL_VERSION=9.5   PG_USER=postgres
 
 
-    - os: linux
-      sudo: required
-      dist: trusty
-      group: edge
-      env: POSTGRESQL_VERSION=9.4   PG_USER=postgres
-
 
 
 # executed. So things have to be tested oe by one.
 addons:
   apt:
     sources:
-      - - ubuntu-toolchain-r-test
+      - ubuntu-toolchain-r-test
       # For cmake
       - kubuntu-backports
       - boost-latest

CMakeLists.txt

@@ -177,7 +177,7 @@ endif()
 # PGROUTING version number.
 set(PGROUTING_VERSION_MAJOR "2")
 set(PGROUTING_VERSION_MINOR "3")
-set(PGROUTING_VERSION_PATCH "1")
+set(PGROUTING_VERSION_PATCH "2")
 
 set(PGROUTING_VERSION_STRING "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}.${PGROUTING_VERSION_PATCH}")
 set(PGROUTING_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
@@ -187,12 +187,12 @@ set(POSTGIS_MINIMUM_VERSION "2.0.0")
 
 file(STRINGS "${PGROUTING_SOURCE_DIR}/VERSION" PGROUTING_BUILD_STRING)
 
-set(PGROUTING_GIT_TAG "v2.3.1")
+set(PGROUTING_GIT_TAG "v2.3.2")
 
 #string(REGEX REPLACE "^(.+)-([0-9]+)-g([0-9a-f]+) (.*)$" "\\1" PGROUTING_GIT_TAG ${PGROUTING_BUILD_STRING})
-string(REGEX REPLACE "^(.+)-([^-]+)-[0-9]+-([0-9a-f]+) (.*)$" "\\2" PGROUTING_GIT_BUILD ${PGROUTING_BUILD_STRING})
-string(REGEX REPLACE "^(.+)-([0-9]+)-([0-9a-f]+) (.*)$" "\\3" PGROUTING_GIT_HASH ${PGROUTING_BUILD_STRING})
-string(REGEX REPLACE "^(.+)-([0-9]+)-([0-9a-f]+) (.*)$" "\\4" PGROUTING_GIT_BRANCH ${PGROUTING_BUILD_STRING})
+string(REGEX REPLACE "^(.+)-([0-9a-f]+) (.*)$" "\\1" PGROUTING_GIT_BUILD ${PGROUTING_BUILD_STRING})
+string(REGEX REPLACE "^(.+)-([0-9a-f]+) (.*)$" "\\2" PGROUTING_GIT_HASH ${PGROUTING_BUILD_STRING})
+string(REGEX REPLACE "^(.+)-([0-9a-f]+) (.*)$" "\\3" PGROUTING_GIT_BRANCH ${PGROUTING_BUILD_STRING})
 
 set(PGROUTING_VERSION_REVISION_NAME "${PGROUTING_GIT_HASH} ${PGROUTING_GIT_BRANCH}")
 set(PGROUTING_VERSION_REVISION_HASH "${PGROUTING_GIT_HASH}")

NEWS

@@ -1,4 +1,10 @@
 
+Changes for 2.3.2
+-------------------------------------------------------------------------------
+
+* Bug fixes
+  * Fixed pgr_gsoc_vrppdtw crash when all orders fit on one truck.
+
 Changes for 2.3.1
 -------------------------------------------------------------------------------
 

VERSION

@@ -1 +1 @@
-pgrouting-2.3.1-4029-1cf2cc9 release/2.3
+4047-8f80b05d8 release/2.3

ci/appveyor/install.bat

@@ -20,7 +20,7 @@ if not defined COMMON_INSTALL_DIR set COMMON_INSTALL_DIR=%BUILD_ROOT_DIR%\local\
 
 :: for cmake its the min version
 if not defined CMAKE_VERSION set CMAKE_VERSION=3.5.2
-if not defined PG_VERSION set PG_VERSION=2.3.0
+if not defined PG_VERSION set PG_VERSION=2.3.1
 if not defined BOOST_VERSION set BOOST_VERSION=1.58.0
 if not defined CGAL_VERSION set CGAL_VERSION=4.8.1
 
@@ -55,6 +55,7 @@ for /f "tokens=*  delims=" %%a in ('cmake --version') do (
 )
 :_ExitForLoop1
 set CURR_CMAKE=%CURR_CMAKE:~14%
+echo cmake %CURR_CMAKE% found
 
 if "%CURR_CMAKE%" GTR "%CMAKE_VERSION%" (
     echo cmake %CMAKE_VERSION% already installed

doc/index.rst

@@ -178,6 +178,7 @@ Change Log
 
 :ref:`change_log`
 
+   - :ref:`changelog_2_3_2`
    - :ref:`changelog_2_3_1`
    - :ref:`changelog_2_3_0`
    - :ref:`changelog_2_2_4`

doc/src/changelog/release_notes.rst

@@ -17,6 +17,7 @@ To see the full list of changes check the list of `Git commits <https://github.c
 Table of contents
 --------------------------
 
+   - :ref:`changelog_2_3_2`
    - :ref:`changelog_2_3_1`
    - :ref:`changelog_2_3_0`
    - :ref:`changelog_2_2_4`
@@ -30,12 +31,23 @@ Table of contents
    - :ref:`changelog_1_x`
 
 
+.. _changelog_2_3_2:
+
+pgRouting 2.3.2 Release Notes
+===============================================================================
+
+To see the issues closed by this release see the `Git closed issues for 2.3.2 <https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.3.2%22+is%3Aclosed>`_ on Github.
+
+.. rubric:: Bug Fixes
+
+* Fixed pgr_gsoc_vrppdtw crash when all orders fit on one truck.
+
 .. _changelog_2_3_1:
 
 pgRouting 2.3.1 Release Notes
 ===============================================================================
 
-To see the issues closed by this release see the `Git closed issues for 2.3.1 <https://github.com/pgRouting/pgrouting/issues?q=is%3Aissue+milestone%3A%22Release+2.3.1%22+is%3Aclosed>`_ on Github.
+To see the issues closed by this release see the `Git closed issues for 2.3.1 <https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.3.1%22+is%3Aclosed>`_ on Github.
 
 .. rubric:: Bug Fixes
 

doc/test/utilities-any.result

@@ -1 +1 @@
-2.3.1
+2.3.2

src/max_flow/doc/doc-pgr_maxFlowBoykovKolmogorov.queries

@@ -3,16 +3,16 @@ BEGIN
 SET client_min_messages TO NOTICE;
 SET
 -- q1
-SELECT * FROM pgr_maxFlowBoykovKolmogorov(
-    'SELECT id,
-            source,
-            target,
-            c1.capacity as capacity,
-            c2.capacity as reverse_capacity
-    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
-    WHERE edge_table.reverse_category_id = c2.category_id
-    ORDER BY id'
-    , 6, 11
+SELECT * FROM pgr_maxFlowBoykovKolmogorov(
+    'SELECT id,
+            source,
+            target,
+            c1.capacity as capacity,
+            c2.capacity as reverse_capacity
+    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
+    WHERE edge_table.reverse_category_id = c2.category_id
+    ORDER BY id'
+    , 6, 11
 );
  seq | edge_id | source | target | flow | residual_capacity 
 -----+---------+--------+--------+------+-------------------
@@ -26,16 +26,16 @@ SELECT * FROM pgr_maxFlowBoykovKolmogorov(
 (7 rows)
 
 -- q2
-SELECT * FROM pgr_maxFlowBoykovKolmogorov(
-    'SELECT id,
-            source,
-            target,
-            c1.capacity as capacity,
-            c2.capacity as reverse_capacity
-    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
-    WHERE edge_table.reverse_category_id = c2.category_id
-    ORDER BY id'
-    , 6, ARRAY[1, 3, 11]
+SELECT * FROM pgr_maxFlowBoykovKolmogorov(
+    'SELECT id,
+            source,
+            target,
+            c1.capacity as capacity,
+            c2.capacity as reverse_capacity
+    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
+    WHERE edge_table.reverse_category_id = c2.category_id
+    ORDER BY id'
+    , 6, ARRAY[1, 3, 11]
 );
  seq | edge_id | source | target | flow | residual_capacity 
 -----+---------+--------+--------+------+-------------------
@@ -54,16 +54,16 @@ SELECT * FROM pgr_maxFlowBoykovKolmogorov(
 (12 rows)
 
 -- q3
-SELECT * FROM pgr_maxFlowBoykovKolmogorov(
-    'SELECT id,
-            source,
-            target,
-            c1.capacity as capacity,
-            c2.capacity as reverse_capacity
-    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
-    WHERE edge_table.reverse_category_id = c2.category_id
-    ORDER BY id'
-    , ARRAY[6, 8, 12], 11
+SELECT * FROM pgr_maxFlowBoykovKolmogorov(
+    'SELECT id,
+            source,
+            target,
+            c1.capacity as capacity,
+            c2.capacity as reverse_capacity
+    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
+    WHERE edge_table.reverse_category_id = c2.category_id
+    ORDER BY id'
+    , ARRAY[6, 8, 12], 11
 );
  seq | edge_id | source | target | flow | residual_capacity 
 -----+---------+--------+--------+------+-------------------
@@ -75,16 +75,16 @@ SELECT * FROM pgr_maxFlowBoykovKolmogorov(
 (5 rows)
 
 -- q4
-SELECT * FROM pgr_maxFlowBoykovKolmogorov(
-    'SELECT id,
-            source,
-            target,
-            c1.capacity as capacity,
-            c2.capacity as reverse_capacity
-    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
-    WHERE edge_table.reverse_category_id = c2.category_id
-    ORDER BY id'
-    , ARRAY[6, 8, 12], ARRAY[1, 3, 11]
+SELECT * FROM pgr_maxFlowBoykovKolmogorov(
+    'SELECT id,
+            source,
+            target,
+            c1.capacity as capacity,
+            c2.capacity as reverse_capacity
+    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
+    WHERE edge_table.reverse_category_id = c2.category_id
+    ORDER BY id'
+    , ARRAY[6, 8, 12], ARRAY[1, 3, 11]
 );
  seq | edge_id | source | target | flow | residual_capacity 
 -----+---------+--------+--------+------+-------------------

src/max_flow/doc/doc-pgr_maxFlowEdmondsKarp.queries

@@ -3,16 +3,16 @@ BEGIN
 SET client_min_messages TO NOTICE;
 SET
 -- q1
-SELECT * FROM pgr_maxFlowEdmondsKarp(
-    'SELECT id,
-            source,
-            target,
-            c1.capacity as capacity,
-            c2.capacity as reverse_capacity
-    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
-    WHERE edge_table.reverse_category_id = c2.category_id
-    ORDER BY id'
-    , 6, 11
+SELECT * FROM pgr_maxFlowEdmondsKarp(
+    'SELECT id,
+            source,
+            target,
+            c1.capacity as capacity,
+            c2.capacity as reverse_capacity
+    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
+    WHERE edge_table.reverse_category_id = c2.category_id
+    ORDER BY id'
+    , 6, 11
 );
  seq | edge_id | source | target | flow | residual_capacity 
 -----+---------+--------+--------+------+-------------------
@@ -26,16 +26,16 @@ SELECT * FROM pgr_maxFlowEdmondsKarp(
 (7 rows)
 
 -- q2
-SELECT * FROM pgr_maxFlowEdmondsKarp(
-    'SELECT id,
-            source,
-            target,
-            c1.capacity as capacity,
-            c2.capacity as reverse_capacity
-    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
-    WHERE edge_table.reverse_category_id = c2.category_id
-    ORDER BY id'
-   , 6, ARRAY[1, 3, 11]
+SELECT * FROM pgr_maxFlowEdmondsKarp(
+    'SELECT id,
+            source,
+            target,
+            c1.capacity as capacity,
+            c2.capacity as reverse_capacity
+    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
+    WHERE edge_table.reverse_category_id = c2.category_id
+    ORDER BY id'
+   , 6, ARRAY[1, 3, 11]
 );
  seq | edge_id | source | target | flow | residual_capacity 
 -----+---------+--------+--------+------+-------------------
@@ -54,16 +54,16 @@ SELECT * FROM pgr_maxFlowEdmondsKarp(
 (12 rows)
 
 -- q3
-SELECT * FROM pgr_maxFlowEdmondsKarp(
-    'SELECT id,
-            source,
-            target,
-            c1.capacity as capacity,
-            c2.capacity as reverse_capacity
-    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
-    WHERE edge_table.reverse_category_id = c2.category_id
-    ORDER BY id'
-   , ARRAY[6, 8, 12], 11
+SELECT * FROM pgr_maxFlowEdmondsKarp(
+    'SELECT id,
+            source,
+            target,
+            c1.capacity as capacity,
+            c2.capacity as reverse_capacity
+    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
+    WHERE edge_table.reverse_category_id = c2.category_id
+    ORDER BY id'
+   , ARRAY[6, 8, 12], 11
 );
  seq | edge_id | source | target | flow | residual_capacity 
 -----+---------+--------+--------+------+-------------------
@@ -75,16 +75,16 @@ SELECT * FROM pgr_maxFlowEdmondsKarp(
 (5 rows)
 
 -- q4
-SELECT * FROM pgr_maxFlowEdmondsKarp(
-    'SELECT id,
-            source,
-            target,
-            c1.capacity as capacity,
-            c2.capacity as reverse_capacity
-    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
-    WHERE edge_table.reverse_category_id = c2.category_id
-    ORDER BY id'
-   , ARRAY[6, 8, 12], ARRAY[1, 3, 11]
+SELECT * FROM pgr_maxFlowEdmondsKarp(
+    'SELECT id,
+            source,
+            target,
+            c1.capacity as capacity,
+            c2.capacity as reverse_capacity
+    FROM edge_table JOIN categories AS c1 USING(category_id), categories AS c2
+    WHERE edge_table.reverse_category_id = c2.category_id
+    ORDER BY id'
+   , ARRAY[6, 8, 12], ARRAY[1, 3, 11]
 );
  seq | edge_id | source | target | flow | residual_capacity 
 -----+---------+--------+--------+------+-------------------