Commit b0220e9e authored by Bas Couwenberg's avatar Bas Couwenberg

Imported Upstream version 2.2.0

parent 228b17fa
### Expected behavior and actual behavior
### Steps to reproduce the problem
### Specifications like the version of pgRouting/PostGIS and PostgreSQL as well as Operating System
Use the commands:
```
SELECT version();
SELECT postgis_full_version();
SELECT pgr_version();
```
Fixes # .
Changes proposed in this pull request:
-
-
-
@pgRouting/admins
# default build directory
build
src/turnRestricted
.DS_Store
.vagrant
issues
......
......@@ -5,12 +5,19 @@
# Main configuration
# ------------------------------------------------------------------------------
language: c
#choose precise or trusty
group: edge
3dist: trusty
#dist: precise
sudo: required
language: c
compiler:
- gcc
- gcc
notifications:
email:
......@@ -21,46 +28,62 @@ branches:
- master
- develop
addons:
postgresql: "9.2"
postgresql: "9.3"
postgresql: "9.4"
env:
- POSTGRESQL_VERSION=9.1
- POSTGRESQL_VERSION=9.2
- POSTGRESQL_VERSION=9.3
- POSTGRESQL_VERSION=9.4
- POSTGRESQL_VERSION=9.5
services:
#- postgresql: 9.1
#- postgresql: 9.2
#- postgresql: 9.3
env:
matrix:
- POSTGRESQL_VERSION=9.4 POSTGIS_VERSION=2.1
- POSTGRESQL_VERSION=9.3 POSTGIS_VERSION=2.1
- POSTGRESQL_VERSION=9.2 POSTGIS_VERSION=2.1
- POSTGRESQL_VERSION=9.1 POSTGIS_VERSION=2.1
- POSTGRESQL_VERSION=9.4 POSTGIS_VERSION=2.0
- POSTGRESQL_VERSION=9.3 POSTGIS_VERSION=2.0
- POSTGRESQL_VERSION=9.2 POSTGIS_VERSION=2.0
- POSTGRESQL_VERSION=9.1 POSTGIS_VERSION=2.0
## We are NOT supporting these for pgrouting 2.1.0
#- POSTGRESQL_VERSION=8.4 POSTGIS_VERSION=1.5
#- POSTGRESQL_VERSION=9.0 POSTGIS_VERSION=1.5
#- POSTGRESQL_VERSION=9.1 POSTGIS_VERSION=1.5
# excecuted. So things have to be tested oe by one.
addons:
apt:
sources:
# For gcc >= 4.8
- ubuntu-toolchain-r-test
# For cmake >= 2.8.8 (for CMakePackageConfigHelpers)
- kubuntu-backports
- boost-latest
packages:
- g++-4.8
- cmake
- libboost-thread-dev
- libboost-graph-dev
- libcgal-dev
- postgresql-server-dev-all
- postgresql-common
install:
- ./tools/travis/pgrouting_install.sh $POSTGRESQL_VERSION $POSTGIS_VERSION
- sudo /etc/init.d/postgresql stop
- sudo /etc/init.d/postgresql stop
- sudo ./tools/travis/install-postgres9.5.sh $POSTGRESQL_VERSION postgres
before_script:
#-
# Add our chosen PG version to the path
- export PATH=/usr/lib/postgresql/$POSTGRESQL_VERSION/bin:$PATH
# Stop whichever version of PG that travis started
- sudo /etc/init.d/postgresql stop
# Start the version of PG that we want to test
- sudo /etc/init.d/postgresql start $POSTGRESQL_VERSION
# Install pgtap and pg_prove
# pgtap has to be installed after postgres has started
- ./tools/travis/install_pgtap.sh $POSTGRESQL_VERSION
- sudo apt-get install -y libtap-parser-sourcehandler-pgtap-perl
# initialize databases
- createdb -U postgres ___pgr___test___
- createdb -U postgres pgr_test__db__test
- ./tools/travis/check-extensions.sh $POSTGRESQL_VERSION ___pgr___test___
script:
- ./tools/travis/pgrouting_build.sh $POSTGRESQL_VERSION $POSTGIS_VERSION
after_script:
- ./tools/travis/pgrouting_prepare.sh $POSTGRESQL_VERSION $POSTGIS_VERSION
- ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION $POSTGIS_VERSION
# note: right takes the travis default
- ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION postgres
- ./tools/testers/pg_prove_tests.sh postgres
after_success:
#after_success:
#- ./tools/travis/pgrouting_deploy.sh $POSTGRESQL_VERSION $POSTGIS_VERSION
This diff is collapsed.
Changes for 2.2.0
-------------------------------------------------------------------------------
- Improved:
- pgr_nodeNetwork
- Adding a row_where and outall optional parameters
- Signature fix
- pgr_dijkstra -- to match what was documented (the pgr_dijkstra from V2.0)
- New functions
- pgr_floydWarshall
- pgr_Johnson
- pgr_DijkstraCost
- New Proposed functions
- pgr_withPoints
- pgr_withPointsCost
- pgr_withPointsDD
- pgr_withPointsKSP
- pgr_dijkstraVia
- Deprecated functions:
- pgr_apspWarshall use pgr_floydWarshall instead
- pgr_apspJohnson use pgr_Johnson instead
- pgr_kDijkstraCost use pgr_dijkstraCost instead
- pgr_kDijkstraPath use pgr_dijkstra instead
Changes for 2.1.0
-------------------------------------------------------------------------------
......
......@@ -6,8 +6,8 @@
### Current Development is in the *develop* branch
The *master* branch reflects our current 2.1.0 release.
Post 2.1.0 development will happen in the *develop* branch.
The *master* branch reflects the current 2.2.0 release.
## LINKS
......@@ -25,18 +25,13 @@ Post 2.1.0 development will happen in the *develop* branch.
<tr>
<td>master</td>
<td><img src="https://travis-ci.org/pgRouting/pgrouting.png?branch=master" alt="Build Status"/></td>
<td>not enabled</td>
</tr>
<tr>
<td>develop</td>
<td><img src="https://travis-ci.org/pgRouting/pgrouting.png?branch=develop" alt="Build Status"/></td>
<td></td>
</tr>
<tr>
<td>develop_2_1_0</td>
<td><img src="https://travis-ci.org/pgRouting/pgrouting.png?branch=develop_2_1_0" alt="Build Status"/></td>
<td></td>
</tr>
<tr>
<td>gh-pages</td>
<td><img src="https://travis-ci.org/pgRouting/pgrouting.png?branch=gh-pages" alt="Build Status"/></td>
......@@ -55,13 +50,28 @@ This library contains following features:
* Shortest Path A*
* Bi-directional Dijkstra Shortest Path
* Bi-directional A* Shortest Path
* Shortest Path Dijkstra
* Shortest Path Dijkstra Family of functions
* Shortest Path Dijkstra Cost Family of functions
* Driving Distance
* K-Shortest Path, Multiple Alternative Paths
* K-Dijkstra, One to Many Shortest Path
* K-Shortest Path, Multiple Alternative Paths (Yen's algorithm)
* Traveling Sales Person
* Turn Restriction Shortest Path (TRSP)
Additionaly, ready for testing and to be part of 2.3 official version:
* Shortest Path Dijkstra With Points Family of functions
* Shortest Path Dijkstra Cost With Points Family of functions
* Driving Distance With Points
* K-Shortest Path With Points, Multiple Alternative Paths (Yen's algorithm)
* Dijkstra Via vertices
Family of functions include:
* one to one
* one to many
* many to one
* many to many
## REQUIREMENTS
......@@ -69,8 +79,7 @@ This library contains following features:
* Postgresql version >= 9.1
* PostGIS version >= 2.0
* The Boost Graph Library (BGL).
* Version >= 1.55 for linux
* Version >= 1.58 for MAC
* Version >= 1.46
* CMake >= 2.8.8
* CGAL >= 4.4
* Sphinx >= 1.2
......@@ -106,12 +115,12 @@ Build with documentation (requires [Sphinx](http://sphinx-doc.org/))
Postgresql 9.1+
createdb mydatabase
psql mydatabase -c "create extension postgis"
psql mydatabase -c "create extension pgrouting"
psql mydatabase -c "CREATE EXTENSION postgis"
psql mydatabase -c "CREATE EXTENSION pgrouting"
## USAGE
See online documentation: http://docs.pgrouting.org/dev/doc/index.html
See online documentation: http://docs.pgrouting.org/en/2.2/doc/index.html
## LICENSE
......
pgrouting-2.1.0-1-gb38118a master
pgrouting-2.2.0-RC1-13-gafc622e master
# ------------------------------------------------------------------------------
# appVeyor script
# Copyright(c) pgRouting Contributors
#
# Main configuration
# ------------------------------------------------------------------------------
notifications:
email:
on_failure: vicky_vergara@hotmail.com
branches:
only:
- master
- develop
- dev-2.2
services:
- postgresql
environment:
POSTGRESQL_VERSION: 9.4
# excecuted. So things have to be tested oe by one.
#addons:
# apt:
# sources:
# For gcc >= 4.8
# - ubuntu-toolchain-r-test
# For cmake >= 2.8.8 (for CMakePackageConfigHelpers)
#- kubuntu-backports
# - boost-latest
# packages:
#- cmake
# - libboost-thread-dev
#- libboost-graph-dev
#- libcgal-dev
#- postgresql-server-dev-all
#- postgresql-common
#- export PATH=/usr/lib/postgresql/$POSTGRESQL_VERSION/bin:$PATH # Add our chosen PG version to the path
#- sudo /etc/init.d/postgresql stop # Stop whichever version of PG that travis started
#- sudo apt-get install -y postgresql-9.5
#- sudo apt-get install -y postgresql-9.5-postgis
#- sudo /etc/init.d/postgresql stop # Stop whichever version of PG that travis started
#- sudo /etc/init.d/postgresql start $POSTGRESQL_VERSION # Start the version of PG that we want to test
#before_script:
# - ./tools/travis/install_pgtap.sh $POSTGRESQL_VERSION # pgtap has to be installed after postgres has started
#- sudo apt-get install -y libtap-parser-sourcehandler-pgtap-perl
#- createdb ___pgr___test___
#- createdb pgr_test__db__test
#- ./tools/travis/check-extensions.sh $POSTGRESQL_VERSION ___pgr___test___
#before_install:
#before_script:
#script:
#- ./tools/travis/pgrouting_build.sh $POSTGRESQL_VERSION $POSTGIS_VERSION
#- ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION
#after_script:
#- ./tools/travis/pg_prove_tests.sh postgres
#after_success:
# CMAKE_PARSE_ARGUMENTS(<prefix> <options> <one_value_keywords> <multi_value_keywords> args...)
#
# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions for
# parsing the arguments given to that macro or function.
# It processes the arguments and defines a set of variables which hold the
# values of the respective options.
#
# The <options> argument contains all options for the respective macro,
# i.e. keywords which can be used when calling the macro without any value
# following, like e.g. the OPTIONAL keyword of the install() command.
#
# The <one_value_keywords> argument contains all keywords for this macro
# which are followed by one value, like e.g. DESTINATION keyword of the
# install() command.