Commit 71c3fd79 authored by Bas Couwenberg's avatar Bas Couwenberg

New upstream version 2.6.1

parent c6b30311
......@@ -382,3 +382,13 @@ file_filter = locale/<lang>/LC_MESSAGES/pgr_strongComponents.po
source_file = locale/pot/pgr_strongComponents.pot
source_lang = en
[pgrouting.transformation-family]
file_filter = locale/<lang>/LC_MESSAGES/transformation-family.po
source_file = locale/pot/transformation-family.pot
source_lang = en
[pgrouting.pgr_lineGraphFull]
file_filter = locale/<lang>/LC_MESSAGES/pgr_lineGraphFull.po
source_file = locale/pot/pgr_lineGraphFull.pot
source_lang = en
......@@ -182,7 +182,7 @@ endif()
set(PGROUTING_VERSION_MAJOR "2")
set(PGROUTING_VERSION_MINOR "6")
set(PGROUTING_VERSION_PATCH "0")
set(PGROUTING_VERSION_PATCH "1")
set(PGROUTING_VERSION_DEV "")
set(PGROUTING_SHORT_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
......
pgRouting 2.6.1 Release Notes
-------------------------------------------------------------------------------
To see the issues closed by this release see the [Git closed milestone for 2.6.1 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.1%22%20) on Github.
* Fixes server crash on several functions.
* pgr_floydWarshall
* pgr_johnson
* pgr_astar
* pgr_bdAstar
* pgr_bdDijstra
* pgr_alphashape
* pgr_dijkstraCostMatrix
* pgr_dijkstra
* pgr_dijkstraCost
* pgr_drivingDistance
* pgr_KSP
* pgr_dijkstraVia (proposed)
* pgr_boykovKolmogorov (proposed)
* pgr_edgeDisjointPaths (proposed)
* pgr_edmondsKarp (proposed)
* pgr_maxCardinalityMatch (proposed)
* pgr_maxFlow (proposed)
* pgr_withPoints (proposed)
* pgr_withPointsCost (proposed)
* pgr_withPointsKSP (proposed)
* pgr_withPointsDD (proposed)
* pgr_withPointsCostMatrix (proposed)
* pgr_contractGraph (experimental)
* pgr_pushRelabel (experimental)
* pgr_vrpOneDepot (experimental)
* pgr_gsoc_vrppdtw (experimental)
* Fixes for deprecated functions where also applied but not tested
* Removed compilation warning for g++8
* Fixed a fallthrugh on Astar and bdAstar.
pgRouting 2.6.0 Release Notes
-------------------------------------------------------------------------------
......@@ -32,6 +71,44 @@ To see the issues closed by this release see the [Git closed milestone for 2.6.0
* Cleaned the internal code of withPoints
pgRouting 2.5.4 Release Notes
-------------------------------------------------------------------------------
To see the issues closed by this release see the [Git closed milestone for 2.5.4 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.4%22%20) on Github.
* Fixes server crash on several functions.
* pgr_floydWarshall
* pgr_johnson
* pgr_astar
* pgr_bdAstar
* pgr_bdDijstra
* pgr_alphashape
* pgr_dijkstraCostMatrix
* pgr_dijkstra
* pgr_dijkstraCost
* pgr_drivingDistance
* pgr_KSP
* pgr_dijkstraVia (proposed)
* pgr_boykovKolmogorov (proposed)
* pgr_edgeDisjointPaths (proposed)
* pgr_edmondsKarp (proposed)
* pgr_maxCardinalityMatch (proposed)
* pgr_maxFlow (proposed)
* pgr_withPoints (proposed)
* pgr_withPointsCost (proposed)
* pgr_withPointsKSP (proposed)
* pgr_withPointsDD (proposed)
* pgr_withPointsCostMatrix (proposed)
* pgr_contractGraph (experimental)
* pgr_pushRelabel (experimental)
* pgr_vrpOneDepot (experimental)
* pgr_gsoc_vrppdtw (experimental)
* Fixes for deprecated functions where also applied but not tested
* Removed compilation warning for g++8
* Fixed a fallthrugh on Astar and bdAstar.
pgRouting 2.5.3 Release Notes
-------------------------------------------------------------------------------
......
......@@ -16,8 +16,9 @@ https://github.com/pgRouting/pgrouting/releases
## LINKS
* http://pgrouting.org/
* http://docs.pgrouting.org/
* https://pgrouting.org/
* https://docs.pgrouting.org/
* https://workshop.pgrouting.org/
* https://github.com/pgRouting/pgrouting
<table>
......@@ -118,7 +119,7 @@ User's reqirements
## INSTALLATION
See online documentation: http://docs.pgrouting.org/
See online documentation: https://docs.pgrouting.org/
## COMPILATION
......@@ -152,7 +153,7 @@ Postgresql 9.2+
## USAGE
See online documentation: http://docs.pgrouting.org/dev/en/index.html
See online documentation: https://docs.pgrouting.org/dev/en/index.html
## LICENSE
......
6756-a6226c4 release/2.6
6798-1360698 release/2.6
@echo off
:: left: the installed version
:: right: the requiered min version
:: right: the required min version
:: return 0 when installed version < requiered version
:: return 1 when installed version >= requiered version
:: return 0 when installed version < required version
:: return 1 when installed version >= required version
SETLOCAL
......@@ -27,23 +27,23 @@ for /f "delims=. tokens=1,2,3" %%a in ("%right%") do (
:: examples
:: 3.2.12 > 2.3.1 ===> 1 installed does fulfill requiered
:: 3.2.12 > 2.3.1 ===> 1 installed does fulfill required
if "%VersionLeftMajor%" GTR "%VersionRight.Major%" (
EXIT /B 0
)
:: 1.2.12 > 3.3.1 ===> 0 installed does not fulfill requiered
:: 1.2.12 > 3.3.1 ===> 0 installed does not fulfill required
if %VersionLeftMajor% LSS %VersionRightMajor% (
EXIT /B 1
)
:: the Major's are equal
:: 3.5.12 >= 3.3.1 ===> 1 installed does fulfill requiered
:: 3.5.12 >= 3.3.1 ===> 1 installed does fulfill required
if %VersionLeftMinor% GEQ %VersionRightMinor% (
EXIT /B 0
)
:: 3.2.12 > 3.3.1 ===> 0 installed does not fulfill requiered regardless of build
:: 3.2.12 > 3.3.1 ===> 0 installed does not fulfill required regardless of build
EXIT /B 1
:exit
......
......@@ -230,11 +230,14 @@ if (LOCALE)
"${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}
#COMMAND sphinx-intl update -p ${CMAKE_SOURCE_DIR}/locale/pot -d ${CMAKE_SOURCE_DIR}/locale --language=${SPHINXINTL_LANGUAGE}
COMMAND sphinx-intl update-txconfig-resources --locale-dir ${CMAKE_SOURCE_DIR}/locale --pot-dir ${CMAKE_SOURCE_DIR}/locale/pot --transifex-project-name pgrouting
COMMENT "Generating POT & PO files ..."
COMMENT "Generating POT files ..."
SOURCES ${PgRouting_DOC_FILES}
)
return()
endif()
......
......@@ -240,7 +240,7 @@ latex_domain_indices = False
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index_man', 'pgrouting', u'pgRouting Reference', u'pgRouting Contributors', 7)
('index', 'pgrouting', u'pgRouting Reference', u'pgRouting Contributors', 7)
]
# If true, show URL addresses after external links.
......
......@@ -145,13 +145,13 @@ Next, we set the original_id of all of the vertices in the results graph that we
:start-after: -- q3
:end-before: -- q4
Then, we cross reference all of the other newly created vertices that do not have the same original_id and set thier original_id values.
Then, we cross reference all of the other newly created vertices that do not have the same original_id and set their original_id values.
.. literalinclude:: doc-pgr_lineGraphFull.queries
:start-after: -- q4
:end-before: -- q5
The only vertices left that have not been mapped are a few of the leaf vertices from the original graph. The following sql completes the mapping for these leaf vertices (in the case of this example graph there are no leaf vertices but this is nessessary for larger graphs).
The only vertices left that have not been mapped are a few of the leaf vertices from the original graph. The following sql completes the mapping for these leaf vertices (in the case of this example graph there are no leaf vertices but this is necessary for larger graphs).
.. literalinclude:: doc-pgr_lineGraphFull.queries
:start-after: -- q5
......
......@@ -22,10 +22,10 @@ SELECT * FROM pgr_astar(
directed := false, heuristic := 2);
seq | path_seq | node | edge | cost | agg_cost
-----+----------+------+------+------+----------
1 | 1 | 2 | 2 | 1 | 0
2 | 2 | 3 | 3 | 1 | 1
3 | 3 | 4 | 16 | 1 | 2
4 | 4 | 9 | 15 | 1 | 3
1 | 1 | 2 | 4 | 1 | 0
2 | 2 | 5 | 8 | 1 | 1
3 | 3 | 6 | 11 | 1 | 2
4 | 4 | 11 | 13 | 1 | 3
5 | 5 | 12 | -1 | 0 | 4
(5 rows)
......@@ -42,8 +42,8 @@ SELECT * FROM pgr_astar(
5 | 5 | 3 | 4 | 3 | 1 | 4
6 | 6 | 3 | 3 | -1 | 0 | 5
7 | 1 | 12 | 2 | 4 | 1 | 0
8 | 2 | 12 | 5 | 10 | 1 | 1
9 | 3 | 12 | 10 | 12 | 1 | 2
8 | 2 | 12 | 5 | 8 | 1 | 1
9 | 3 | 12 | 6 | 11 | 1 | 2
10 | 4 | 12 | 11 | 13 | 1 | 3
11 | 5 | 12 | 12 | -1 | 0 | 4
(11 rows)
......
......@@ -11,11 +11,11 @@ SELECT * FROM pgr_bdAstar(
seq | path_seq | node | edge | cost | agg_cost
-----+----------+------+------+------+----------
1 | 1 | 2 | 4 | 1 | 0
2 | 2 | 5 | 8 | 1 | 1
3 | 3 | 6 | 9 | 1 | 2
4 | 4 | 9 | 16 | 1 | 3
5 | 5 | 4 | 3 | 1 | 4
6 | 6 | 3 | -1 | 0 | 5
2 | 2 | 5 | 8 | 1 | 3
3 | 3 | 6 | 9 | 1 | 5
4 | 4 | 9 | 16 | 1 | 8
5 | 5 | 4 | 3 | 1 | 9
6 | 6 | 3 | -1 | 0 | 10
(6 rows)
-- q2
......@@ -28,11 +28,11 @@ SELECT * FROM pgr_bdAstar(
seq | path_seq | node | edge | cost | agg_cost
-----+----------+------+------+------+----------
1 | 1 | 2 | 4 | 1 | 0
2 | 2 | 5 | 8 | 1 | 1
3 | 3 | 6 | 9 | 1 | 2
4 | 4 | 9 | 16 | 1 | 3
5 | 5 | 4 | 3 | 1 | 4
6 | 6 | 3 | -1 | 0 | 5
2 | 2 | 5 | 8 | 1 | 2
3 | 3 | 6 | 9 | 1 | 3
4 | 4 | 9 | 16 | 1 | 4
5 | 5 | 4 | 3 | 1 | 5
6 | 6 | 3 | -1 | 0 | 6
(6 rows)
-- q3
......@@ -45,11 +45,11 @@ SELECT * FROM pgr_bdAstar(
seq | path_seq | end_vid | node | edge | cost | agg_cost
-----+----------+---------+------+------+------+----------
1 | 1 | 3 | 2 | 4 | 1 | 0
2 | 2 | 3 | 5 | 8 | 1 | 1
3 | 3 | 3 | 6 | 9 | 1 | 2
4 | 4 | 3 | 9 | 16 | 1 | 3
5 | 5 | 3 | 4 | 3 | 1 | 4
6 | 6 | 3 | 3 | -1 | 0 | 5
2 | 2 | 3 | 5 | 8 | 1 | 25.5
3 | 3 | 3 | 6 | 9 | 1 | 38.75
4 | 4 | 3 | 9 | 16 | 1 | 64.25
5 | 5 | 3 | 4 | 3 | 1 | 65.25
6 | 6 | 3 | 3 | -1 | 0 | 66.25
7 | 1 | 11 | 2 | 4 | 1 | 0
8 | 2 | 11 | 5 | 8 | 1 | 1
9 | 3 | 11 | 6 | 11 | 1 | 2
......@@ -63,15 +63,15 @@ SELECT * FROM pgr_bdAstar(
ARRAY[2, 7], 3,
false, heuristic := 4
);
seq | path_seq | start_vid | node | edge | cost | agg_cost
-----+----------+-----------+------+------+------+----------
1 | 1 | 2 | 2 | 2 | 1 | 0
2 | 2 | 2 | 3 | -1 | 0 | 1
3 | 1 | 7 | 7 | 6 | 1 | 0
4 | 2 | 7 | 8 | 7 | 1 | 1
5 | 3 | 7 | 5 | 4 | 1 | 2
6 | 4 | 7 | 2 | 2 | 1 | 3
7 | 5 | 7 | 3 | -1 | 0 | 4
seq | path_seq | start_vid | node | edge | cost | agg_cost
-----+----------+-----------+------+------+------+------------------
1 | 1 | 2 | 2 | 2 | 1 | 0
2 | 2 | 2 | 3 | -1 | 0 | 1
3 | 1 | 7 | 7 | 6 | 1 | 0
4 | 2 | 7 | 8 | 7 | 1 | 3.23606797749979
5 | 3 | 7 | 5 | 8 | 1 | 5.65028153987288
6 | 4 | 7 | 6 | 5 | 1 | 6.65028153987288
7 | 5 | 7 | 3 | -1 | 0 | 7.65028153987288
(7 rows)
-- q5
......@@ -84,26 +84,26 @@ SELECT * FROM pgr_bdAstar(
seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost
-----+----------+-----------+---------+------+------+------+----------
1 | 1 | 2 | 3 | 2 | 4 | 1 | 0
2 | 2 | 2 | 3 | 5 | 8 | 1 | 1
3 | 3 | 2 | 3 | 6 | 9 | 1 | 2
4 | 4 | 2 | 3 | 9 | 16 | 1 | 3
5 | 5 | 2 | 3 | 4 | 3 | 1 | 4
6 | 6 | 2 | 3 | 3 | -1 | 0 | 5
2 | 2 | 2 | 3 | 5 | 8 | 1 | 2
3 | 3 | 2 | 3 | 6 | 9 | 1 | 3.5
4 | 4 | 2 | 3 | 9 | 16 | 1 | 4.5
5 | 5 | 2 | 3 | 4 | 3 | 1 | 5.5
6 | 6 | 2 | 3 | 3 | -1 | 0 | 6.5
7 | 1 | 2 | 11 | 2 | 4 | 1 | 0
8 | 2 | 2 | 11 | 5 | 8 | 1 | 1
9 | 3 | 2 | 11 | 6 | 11 | 1 | 2
10 | 4 | 2 | 11 | 11 | -1 | 0 | 3
11 | 1 | 7 | 3 | 7 | 6 | 1 | 0
12 | 2 | 7 | 3 | 8 | 7 | 1 | 1
13 | 3 | 7 | 3 | 5 | 8 | 1 | 2
14 | 4 | 7 | 3 | 6 | 9 | 1 | 3
15 | 5 | 7 | 3 | 9 | 16 | 1 | 4
16 | 6 | 7 | 3 | 4 | 3 | 1 | 5
17 | 7 | 7 | 3 | 3 | -1 | 0 | 6
12 | 2 | 7 | 3 | 8 | 7 | 1 | 2.5
13 | 3 | 7 | 3 | 5 | 8 | 1 | 4.5
14 | 4 | 7 | 3 | 6 | 9 | 1 | 6
15 | 5 | 7 | 3 | 9 | 16 | 1 | 7
16 | 6 | 7 | 3 | 4 | 3 | 1 | 8
17 | 7 | 7 | 3 | 3 | -1 | 0 | 9
18 | 1 | 7 | 11 | 7 | 6 | 1 | 0
19 | 2 | 7 | 11 | 8 | 7 | 1 | 1
20 | 3 | 7 | 11 | 5 | 10 | 1 | 2
21 | 4 | 7 | 11 | 10 | 12 | 1 | 3
20 | 3 | 7 | 11 | 5 | 8 | 1 | 2
21 | 4 | 7 | 11 | 6 | 11 | 1 | 3
22 | 5 | 7 | 11 | 11 | -1 | 0 | 4
(22 rows)
......
......@@ -10,7 +10,7 @@ SELECT * FROM pgr_bdAstarCost(
);
start_vid | end_vid | agg_cost
-----------+---------+----------
2 | 3 | 5
2 | 3 | 10
(1 row)
-- q2
......@@ -22,7 +22,7 @@ SELECT * FROM pgr_bdAstarCost(
);
start_vid | end_vid | agg_cost
-----------+---------+----------
2 | 3 | 5
2 | 3 | 6
(1 row)
-- q3
......@@ -34,8 +34,8 @@ SELECT * FROM pgr_bdAstarCost(
);
start_vid | end_vid | agg_cost
-----------+---------+----------
2 | 3 | 5
2 | 11 | 3
2 | 3 | 66.25
2 | 11 | 27.5
(2 rows)
-- q4
......@@ -45,10 +45,10 @@ SELECT * FROM pgr_bdAstarCost(
ARRAY[2, 7], 3,
false, heuristic := 4
);
start_vid | end_vid | agg_cost
-----------+---------+----------
2 | 3 | 1
7 | 3 | 4
start_vid | end_vid | agg_cost
-----------+---------+------------------
2 | 3 | 1
7 | 3 | 7.65028153987288
(2 rows)
-- q5
......@@ -60,10 +60,10 @@ SELECT * FROM pgr_bdAstarCost(
);
start_vid | end_vid | agg_cost
-----------+---------+----------
2 | 3 | 5
2 | 11 | 3
7 | 3 | 6
7 | 11 | 4
2 | 3 | 7.5
2 | 11 | 4
7 | 3 | 11.5
7 | 11 | 6.5
(4 rows)
-- q6
......
......@@ -264,15 +264,15 @@ SELECT * FROM pgr_bdAstarCostMatrix(
start_vid | end_vid | agg_cost
-----------+---------+----------
1 | 2 | 1
1 | 3 | 6
1 | 4 | 5
1 | 3 | 12
1 | 4 | 12
2 | 1 | 1
2 | 3 | 5
2 | 4 | 4
2 | 3 | 10
2 | 4 | 9
3 | 1 | 2
3 | 2 | 1
3 | 4 | 3
4 | 1 | 3
3 | 4 | 5
4 | 1 | 5
4 | 2 | 2
4 | 3 | 1
(12 rows)
......@@ -287,14 +287,14 @@ SELECT * FROM pgr_bdAstarCostMatrix(
-----------+---------+----------
1 | 2 | 1
1 | 3 | 2
1 | 4 | 3
1 | 4 | 5
2 | 1 | 1
2 | 3 | 1
2 | 4 | 2
3 | 1 | 2
3 | 2 | 1
3 | 4 | 1
4 | 1 | 3
4 | 1 | 5
4 | 2 | 2
4 | 3 | 1
(12 rows)
......@@ -312,10 +312,10 @@ SELECT * FROM pgr_TSP(
);
seq | node | cost | agg_cost
-----+------+------+----------
1 | 1 | 1 | 0
2 | 2 | 1 | 1
3 | 3 | 1 | 2
4 | 4 | 3 | 3
1 | 1 | 2 | 0
2 | 3 | 1 | 2
3 | 4 | 2 | 3
4 | 2 | 1 | 5
5 | 1 | 0 | 6
(5 rows)
......
......@@ -6,7 +6,7 @@ SET
SELECT version FROM pgr_version();
version
---------
2.6.0
2.6.1
(1 row)
-- q2
......
......@@ -62,6 +62,7 @@ These are corporate entities that have contributed developer time, hosting, or d
- `Georepublic <https://georepublic.info/en/>`__
- `Google Summer of Code <https://developers.google.com/open-source/gsoc/>`_
- `iMaptools <http://imaptools.com>`__
- `Leopark <https://www.leopark.mx/>`__
- `Paragon Corporation <http://www.paragoncorporation.com/>`_
- `Versaterm Inc. <http://www.versaterm.com/>`__
......
......@@ -18,7 +18,9 @@ To see the full list of changes check the list of `Git commits <https://github.c
.. changelog start
* :ref:`changelog_2_6_1`
* :ref:`changelog_2_6_0`
* :ref:`changelog_2_5_4`
* :ref:`changelog_2_5_3`
* :ref:`changelog_2_5_2`
* :ref:`changelog_2_5_1`
......@@ -41,6 +43,46 @@ To see the full list of changes check the list of `Git commits <https://github.c
.. changelog end
.. _changelog_2_6_1:
pgRouting 2.6.1 Release Notes
-------------------------------------------------------------------------------
To see the issues closed by this release see the `Git closed milestone for 2.6.1 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.1%22%20>`_ on Github.
* Fixes server crash on several functions.
* pgr_floydWarshall
* pgr_johnson
* pgr_astar
* pgr_bdAstar
* pgr_bdDijstra
* pgr_alphashape
* pgr_dijkstraCostMatrix
* pgr_dijkstra
* pgr_dijkstraCost
* pgr_drivingDistance
* pgr_KSP
* pgr_dijkstraVia (proposed)
* pgr_boykovKolmogorov (proposed)
* pgr_edgeDisjointPaths (proposed)
* pgr_edmondsKarp (proposed)
* pgr_maxCardinalityMatch (proposed)
* pgr_maxFlow (proposed)
* pgr_withPoints (proposed)
* pgr_withPointsCost (proposed)
* pgr_withPointsKSP (proposed)
* pgr_withPointsDD (proposed)
* pgr_withPointsCostMatrix (proposed)
* pgr_contractGraph (experimental)
* pgr_pushRelabel (experimental)
* pgr_vrpOneDepot (experimental)
* pgr_gsoc_vrppdtw (experimental)
* Fixes for deprecated functions where also applied but not tested
* Removed compilation warning for g++8
* Fixed a fallthrugh on Astar and bdAstar.
.. _changelog_2_6_0:
pgRouting 2.6.0 Release Notes
......@@ -75,6 +117,45 @@ To see the issues closed by this release see the `Git closed milestone for 2.6.0
* Cleaned the internal code of withPoints
.. _changelog_2_5_4:
pgRouting 2.5.4 Release Notes
-------------------------------------------------------------------------------
To see the issues closed by this release see the `Git closed milestone for 2.5.4 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.4%22%20>`_ on Github.
* Fixes server crash on several functions.
* pgr_floydWarshall
* pgr_johnson
* pgr_astar
* pgr_bdAstar
* pgr_bdDijstra
* pgr_alphashape
* pgr_dijkstraCostMatrix
* pgr_dijkstra
* pgr_dijkstraCost
* pgr_drivingDistance
* pgr_KSP
* pgr_dijkstraVia (proposed)
* pgr_boykovKolmogorov (proposed)
* pgr_edgeDisjointPaths (proposed)
* pgr_edmondsKarp (proposed)
* pgr_maxCardinalityMatch (proposed)
* pgr_maxFlow (proposed)
* pgr_withPoints (proposed)
* pgr_withPointsCost (proposed)
* pgr_withPointsKSP (proposed)
* pgr_withPointsDD (proposed)
* pgr_withPointsCostMatrix (proposed)
* pgr_contractGraph (experimental)
* pgr_pushRelabel (experimental)
* pgr_vrpOneDepot (experimental)
* pgr_gsoc_vrppdtw (experimental)
* Fixes for deprecated functions where also applied but not tested
* Removed compilation warning for g++8
* Fixed a fallthrugh on Astar and bdAstar.
.. _changelog_2_5_3:
......
......@@ -204,16 +204,22 @@ class Pgr_astar {
switch (m_heuristic) {
case 0:
current = 0;
break;
case 1:
current = std::fabs((std::max)(dx, dy)) * m_factor;
break;
case 2:
current = std::fabs((std::min)(dx, dy)) * m_factor;
break;
case 3:
current = (dx * dx + dy * dy) * m_factor * m_factor;
break;
case 4:
current = std::sqrt(dx * dx + dy * dy) * m_factor;
break;
case 5:
current = (std::fabs(dx) + std::fabs(dy)) * m_factor;
break;
default:
current = 0;
}
......
/*PGR-GNU*****************************************************************
File: pgr_bdAstar.hpp
File: pgr_bdAstar.hpp
Generated with Template by:
Copyright (c) 2015 pgRouting developers
......@@ -167,16 +167,22 @@ class Pgr_bdAstar : public Pgr_bidirectional<G> {
switch (m_heuristic) {
case 0:
current = 0;
break;
case 1:
current = std::fabs((std::max)(dx, dy)) * m_factor;
break;