Commit c6b30311 authored by Bas Couwenberg's avatar Bas Couwenberg

New upstream version 2.6.0

parent c3f4eff2
......@@ -2,7 +2,9 @@
build
fix_typos
code_linter
.DS_Store
.vagrant
.directory
notUsed
*.swp
......@@ -21,13 +21,22 @@ env: POSTGRESQL_VERSION=9.6 PG_USER=postgres
matrix:
include:
- os: linux
env: POSTGRESQL_VERSION=9.6 PG_USER=postgres
env: POSTGRESQL_VERSION=10 PG_USER=postgres DOCUMENTATION=OFF
- os: linux
env: POSTGRESQL_VERSION=9.6 PG_USER=postgres DOCUMENTATION=OFF
- os: linux
env: POSTGRESQL_VERSION=9.5 PG_USER=postgres DOCUMENTATION=OFF
- os: linux
env: POSTGRESQL_VERSION=9.5 PG_USER=postgres
env: POSTGRESQL_VERSION=9.4 PG_USER=postgres DOCUMENTATION=OFF
- os: linux
env: POSTGRESQL_VERSION=9.3 PG_USER=postgres DOCUMENTATION=OFF
- os: linux
env: POSTGRESQL_VERSION=9.6 PG_USER=postgres DOCUMENTATION=ON
# executed. So things have to be tested oe by one.
......@@ -55,15 +64,14 @@ addons:
install:
- pip install sphinx
- sudo ./tools/travis/install-doxygen.sh
- sudo ./tools/travis/install-postgres.sh $POSTGRESQL_VERSION $PG_USER
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ./tools/travis/install-doxygen.sh ; fi
before_script:
# Add our chosen PG version to the path
- psql -U postgres -c "create extension postgis"
- export PATH=/usr/lib/postgresql/$POSTGRESQL_VERSION/bin:$PATH
- export PATH=/usr/lib/postgresql/$POSTGRESQL_VERSION/bin:$PATH
# initialize databases
- createdb -U $PG_USER ___pgr___test___
- createdb -U $PG_USER pgr_test__db__test
......@@ -73,10 +81,10 @@ before_script:
script:
- ./tools/travis/pgrouting_build.sh $POSTGRESQL_VERSION $POSTGIS_VERSION
# tests as part of script so if a test fails the build fails
- ./tools/testers/pg_prove_tests.sh $PG_USER 5432 DEBUG
- if [ "$DOCUMENTATION" == "OFF" ]; then ./tools/testers/pg_prove_tests.sh $PG_USER 5432 DEBUG ; fi
#after_script:
- ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION $PG_USER -ignorenotice
- ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION $PG_USER
#after_success:
# blank
......@@ -113,7 +113,7 @@ endif()
set(DOXYGEN_MINIMUM_VERSION "1.7")
set(SPHINX_MINIMUM_VERSION "1.1")
set(POSTGRESQL_MINIMUM_VERSION "9.2.0")
set(BOOST_MINIMUM_VERSION "1.46")
set(BOOST_MINIMUM_VERSION "1.53")
set(CGAL_CXX_MINIMUM_VERSION "4.4")
set(POSTGIS_MINIMUM_VERSION "2.0.0")
set(GNU_CXX_MINIMUM_VERSION "4.6")
......@@ -181,8 +181,8 @@ endif()
#-----------------------------------------------------------------------------
set(PGROUTING_VERSION_MAJOR "2")
set(PGROUTING_VERSION_MINOR "5")
set(PGROUTING_VERSION_PATCH "3")
set(PGROUTING_VERSION_MINOR "6")
set(PGROUTING_VERSION_PATCH "0")
set(PGROUTING_VERSION_DEV "")
set(PGROUTING_SHORT_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
......@@ -361,8 +361,6 @@ include_directories(${CGAL_INCLUDE_DIR})
#---------------------------------------------
set(PGROUTING_INCLUDE_DIRECTORIES
${PGROUTING_SOURCE_DIR}/src/common/src
${PGROUTING_SOURCE_DIR}/src/dijkstra/src
${PGROUTING_SOURCE_DIR}/include
)
......@@ -522,7 +520,7 @@ endif()
#-------------------
foreach (subdir ${PgRouting_SOURCE_NAMES})
add_subdirectory("${PGROUTING_SOURCE_DIR}/src/${subdir}/src")
add_subdirectory("${PGROUTING_SOURCE_DIR}/src/${subdir}")
endforeach()
......@@ -555,7 +553,6 @@ endforeach()
# PGROUTING Library names
#-----------------------------------------------------------------------------
message("Building the library names")
#----------------------
# PGROUTING installation files names have the following name
......
pgRouting 2.6.0 Release Notes
-------------------------------------------------------------------------------
To see the issues closed by this release see the [Git closed milestone for 2.6.0 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.0%22%20) on Github.
*New fexperimental functions*
* pgr_lineGraphFull
*Bug fixes*
* Fix pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean[,text])
* without restrictions
* calls pgr_dijkstra when both end points have a fraction IN (0,1)
* calls pgr_withPoints when at least one fraction NOT IN (0,1)
* with restrictions
* calls original trsp code
*Internal code*
* Cleaned the internal code of trsp(text,integer,integer,boolean,boolean [, text])
* Removed the use of pointers
* Internal code can accept BIGINT
* Cleaned the internal code of withPoints
pgRouting 2.5.3 Release Notes
-------------------------------------------------------------------------------
......@@ -72,6 +106,7 @@ To see the issues closed by this release see the [Git closed issues for 2.5.0 ](
* pgr_bdDijkstraCost(many to many)
* pgr_bdDijkstraCostMatrix
* pgr_lineGraph
* pgr_lineGraphFull
* pgr_connectedComponents
* pgr_strongComponents
* pgr_biconnectedComponents
......
......@@ -16,7 +16,7 @@ https://github.com/pgRouting/pgrouting/releases
## LINKS
* http://pgrouting.org/
* http://pgrouting.org/
* http://docs.pgrouting.org/
* https://github.com/pgRouting/pgrouting
......@@ -100,12 +100,12 @@ Family of functions include:
Building reqirements
--------------------
* Perl
* Perl
* C and C++ compilers
* GNU >= 4.6
* MSVC >= 18.0
* Postgresql >= 9.2
* The Boost Graph Library (BGL) >= 1.46
* The Boost Graph Library (BGL) >= 1.53
* CMake >= 3.2
* CGAL >= 4.4
* Sphinx >= 1.2
......@@ -133,7 +133,7 @@ For MinGW on Windows
Also pre-built Windows binaries can be downloaded from https://postgis.net/windows_downloads
For Linux
mkdir build
cd build
cmake ..
......
6286-9a0d404 master
6756-a6226c4 release/2.6
......@@ -5,7 +5,7 @@
# Main configuration
# ------------------------------------------------------------------------------
version: 2.5.{build}
version: 2.6.{build}
image: Visual Studio 2013
configuration: Release
......@@ -19,14 +19,15 @@ cache:
- c:\build\local\msvc120\x64 -> appveyor
services:
- postgresql94
- postgresql96
environment:
CONFIGURATION: Release
MSVC_VER: 12.0
BUILD_ROOT_DIR: c:\build
PGIS_VERSION: 2.3.3
PG_VER: 9.4
PGIS_VERSION: 2.4
PG_VER: 9.6
init:
- git config --global core.autocrlf false
......
......@@ -167,7 +167,7 @@ if defined CGAL_LOCAL_DEBUG (
echo GMP_SRC_DIR %GMP_SRC_DIR%
dir %GMP_SRC_DIR%
dir C:/build/local/msvc120/x64/include/CGAL
)
:_ExitCGAL
......
......@@ -10,7 +10,7 @@ if not defined MSVC_VER goto _error
if not defined ARCH goto _error
if not defined BUILD_ROOT_DIR goto _error
if not defined CONFIGURATION goto _error
if defined BOOST_LOCAL_DEBUG (
echo "install-boost.bat"
echo received environment
......
......@@ -49,7 +49,7 @@ message(STATUS "GAUL_LIBRARIES=${GAUL_LIBRARIES}")
)
message(STATUS "GAUL_UTIL_LIBRARIES=${GAUL_UTIL_LIBRARIES}")
if(GAUL_INCLUDE_DIR AND GAUL_LIBRARIES AND GAUL_UTIL_LIBRARIES)
set(GAUL_FOUND TRUE)
message(STATUS "Found GAUL: ${GAUL_LIBRARIES}, ${GAUL_UTIL_LIBRARIES}")
......
# (c) 2015 pgRouting colaborators
#
#
# Finds the most recent postGIS for a particular postgreSQL
# We need this for the tests
#
......
......@@ -16,21 +16,21 @@
# A check condition to see if those variables are set
SET(POSTGRESQL_BIN "" CACHE STRING "non-standard path to the postgresql program executables")
SET(POSTGRESQL_BIN "" CACHE STRING "non-standard path to the postgresql program executables")
if(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES AND POSTGRESQL_EXECUTABLE AND POSTGRESQL_VERSION_STRING)
set(POSTGRESQL_FOUND TRUE)
else(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES AND POSTGRESQL_EXECUTABLE)
if(NOT "${POSTGRESQL_BIN}" STREQUAL "")
# Checking POSTGRESQL_PG_CONFIG
# Checking POSTGRESQL_PG_CONFIG
find_program(POSTGRESQL_PG_CONFIG NAMES pg_config
PATHS
${POSTGRESQL_BIN}
NO_DEFAULT_PATH
)
else(NOT "${POSTGRESQL_BIN}" STREQUAL "")
# Checking POSTGRESQL_PG_CONFIG
# Checking POSTGRESQL_PG_CONFIG
find_program(POSTGRESQL_PG_CONFIG NAMES pg_config
PATHS
/usr/lib/postgresql/*/bin/
......@@ -47,7 +47,7 @@ else(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES AND POSTGRESQL_EXECUTABLE)
endif(POSTGRESQL_PG_CONFIG)
# Checking POSTGRESQL_EXECUTABLE in all the dir (*) - implies that
# Checking POSTGRESQL_EXECUTABLE in all the dir (*) - implies that
find_program(POSTGRESQL_EXECUTABLE NAMES postgres
PATHS
${T_POSTGRESQL_BIN}
......
#
#
# Find Sphinx
# Find Sphinx executable to build documentation
# Source: http://ericscottbarr.com/blog/2012/03/sphinx-and-cmake-beautiful-documentation-for-c-projects/
#
#
# Daniel Kastl 03/2013
#
......@@ -40,7 +40,7 @@ option(EPUB
option(DUMMY
"Set ON|OFF (default=OFF) for debugging purposes" OFF)
if (LOCALE)
if (LOCALE)
set(WITH_DOC ON)
endif()
......@@ -82,11 +82,11 @@ set(PgRouting_ENGLISH "en")
# Language options
#---------------------------------------------
option(WITH_ALL_LANG
"Set ON|OFF (default=OFF) to build all the supported languages:
"Set ON|OFF (default=OFF) to build all the supported languages:
Main Language will always be built:
${PgRouting_ENGLISH}
Optional languages:
${PgRouting_SUPPORTED_LANGUAGES}
${PgRouting_SUPPORTED_LANGUAGES}
When OFF and want to build specific optional language, use the language code in capital letters:
-D ES=ON
......@@ -224,11 +224,11 @@ set(ENV{SPHINXINTL_LANGUAGE} ${SPHINXINTL_LANGUAGE})
if (LOCALE)
add_custom_target(locale
COMMAND ${SPHINX_EXECUTABLE}
COMMAND ${SPHINX_EXECUTABLE}
-b gettext
-c "${PGR_DOCUMENTATION_SOURCE_DIR}"
"${PGR_DOCUMENTATION_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/locale/pot"
-c "${PGR_DOCUMENTATION_SOURCE_DIR}"
"${PGR_DOCUMENTATION_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/locale/pot"
COMMAND sphinx-intl update -p ${CMAKE_SOURCE_DIR}/locale/pot -d ${CMAKE_SOURCE_DIR}/locale --language=${SPHINXINTL_LANGUAGE}
......@@ -239,7 +239,7 @@ endif()
# The doc target will build all documentation targets.
add_custom_target(doc
add_custom_target(doc
COMMENT "Building documentation with Sphinx")
......@@ -254,21 +254,21 @@ foreach (target ${PgRouting_DOC_TARGETS})
foreach (lang ${PgRouting_BUILD_LANGUAGES})
add_custom_target(
"${target}-${lang}"
COMMAND ${SPHINX_EXECUTABLE}
#-q # Enable for quiet mode
COMMAND ${SPHINX_EXECUTABLE}
#-q # Enable for quiet mode
#-Q # Enable for even more quiet mode
-v # increase verbosity
#-E # don't use a saved environment, always read all file
#-a # write all files; default is to only write new and changed files
-b ${target}
-D language='${lang}'
-c "${PGR_DOCUMENTATION_SOURCE_DIR}"
"${PGR_DOCUMENTATION_SOURCE_DIR}"
-c "${PGR_DOCUMENTATION_SOURCE_DIR}"
"${PGR_DOCUMENTATION_SOURCE_DIR}"
"${PGR_DOCUMENTATION_BUILD_DIR}/${target}/${lang}"
COMMENT "Generating ${target}/${lang} documentation ..."
SOURCES ${PgRouting_DOC_FILES} ${PgRouting_IMG_FILES}
DEPENDS ${PgRouting_DOC_FILES} ${PgRouting_IMG_FILES}
SOURCES ${PgRouting_DOC_FILES} ${PgRouting_IMG_FILES}
DEPENDS ${PgRouting_DOC_FILES} ${PgRouting_IMG_FILES}
)
add_dependencies(${target} "${target}-${lang}")
......
......@@ -57,7 +57,7 @@ The main Characteristics are:
- Running time (worse case scenario): :math:`O((E + V) * \log V)`
- For large graphs where there is a path bewtween the starting vertex and ending vertex:
- It is expected to terminate faster than pgr_astar
- It is expected to terminate faster than pgr_astar
Description of the Signatures
--------------------------------
......
..
..
****************************************************************************
pgRouting Manual
Copyright(c) pgRouting Contributors
......@@ -131,7 +131,7 @@ pgr_bdAstar One to many
pgr_bdAstar(edges_sql, start_vid, end_vids [, directed, heuristic, factor, epsilon])
RETURNS SET OF (seq, path_seq, end_vid, node, edge, cost, agg_cost) or EMPTY SET
This usage finds the shortest path from the ``start_vid`` to each ``end_vid`` in ``end_vids`` allowing the user to choose
This usage finds the shortest path from the ``start_vid`` to each ``end_vid`` in ``end_vids`` allowing the user to choose
* if the graph is **directed** or **undirected**
* and/or **heuristic**,
* and/or **factor**
......@@ -156,7 +156,7 @@ pgr_bdAstar Many to One
pgr_bdAstar(edges_sql, start_vids, end_vid [, directed, heuristic, factor, epsilon])
RETURNS SET OF (seq, path_seq, start_vid, node, edge, cost, agg_cost) or EMPTY SET
This usage finds the shortest path from each ``start_vid`` in ``start_vids`` to the ``end_vid`` allowing the user to choose
This usage finds the shortest path from each ``start_vid`` in ``start_vids`` to the ``end_vid`` allowing the user to choose
* if the graph is **directed** or **undirected**
* and/or **heuristic**,
* and/or **factor**
......@@ -180,7 +180,7 @@ pgr_bdAstar Many to Many
pgr_bdAstar(edges_sql, start_vids, end_vids [, directed, heuristic, factor, epsilon])
RETURNS SET OF (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost) or EMPTY SET
This usage finds the shortest path from each ``start_vid`` in ``start_vids`` to each ``end_vid`` in ``end_vids`` allowing the user to choose
This usage finds the shortest path from each ``start_vid`` in ``start_vids`` to each ``end_vid`` in ``end_vids`` allowing the user to choose
* if the graph is **directed** or **undirected**
* and/or **heuristic**,
* and/or **factor**
......