This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pgrouting.
commit ea92b9f32a9011c430263a5526bc5a5a7c8b7033 Merge: b45034f 5ddb51c Author: Bas Couwenberg <[email protected]> Date: Tue Mar 21 07:23:27 2017 +0100 Merge tag 'upstream/2.4.0' Upstream version 2.4.0 .travis.yml | 11 +- CMakeLists.txt | 470 +- CONTRIBUTING.md | 42 + NEWS | 104 +- README.md | 33 +- VERSION | 2 +- Vagrantfile | 24 - appveyor.yml | 2 +- cmake/CMakeLists.txt | 3 - doc/CMakeLists.txt | 94 +- doc/conf.py.in | 24 +- doc/deprecated.rst | 112 - doc/index.rst | 153 +- doc/src/developer/developer_guide.rst | 174 - doc/src/developer/discontinued.rst | 26 - .../{developer => }/images/Fig1-originalData.png | Bin doc/src/{developer => }/images/Fig2-cost.png | Bin .../{developer => }/images/Fig4-costUndirected.png | Bin doc/src/{developer => }/images/Fig6-undirected.png | Bin .../{introduction => }/images/boost-inside.jpeg | Bin doc/src/{recipes => }/images/parallelImage.png | Bin doc/src/{developer => }/images/test1.png | Bin doc/src/{developer => }/images/trsp-test-image.png | Bin doc/src/installation/build.rst | 123 - doc/src/installation/install-dependencies.rst | 155 - doc/src/installation/installation.rst | 186 - doc/src/pgRouting-concepts.rst | 705 + doc/src/pgRouting-installation.rst | 312 + ...introduction.rst => pgRouting-introduction.rst} | 23 +- doc/src/proposed.rst | 163 + doc/src/recipes/example_recipe.rst | 29 - doc/src/recipes/index.rst | 83 - doc/src/recipes/parallel_handling.rst | 221 - doc/src/recipes/test/sampledata.data.sql | 59 - doc/src/recipes/test/test.conf | 19 - doc/src/recipes/test/zzz-remove_sampledata.result | 0 .../recipes/test/zzz-remove_sampledata.test.sql | 9 - doc/src/{changelog => }/release_notes.rst | 197 +- doc/src/routingFunctions.rst | 67 + doc/src/{developer => }/sampledata.rst | 20 +- doc/src/{introduction => }/support.rst | 12 +- doc/src/tutorial/analytics.rst | 138 - doc/src/tutorial/custom_query.rst | 180 - doc/src/tutorial/index.rst | 45 - doc/src/tutorial/performance.rst | 56 - doc/src/tutorial/topology.rst | 121 - doc/src/tutorial/tutorial.rst | 131 - doc/{src/recipes => }/test/example_recipe.result | 0 doc/{src/recipes => }/test/example_recipe.test.sql | 5 +- .../recipes => }/test/parallel_handling.result | 0 .../recipes => }/test/parallel_handling.test.sql | 7 +- doc/test/test.conf | 2 + doc/test/utilities-any.result | 2 +- doc/test/utilities-any.test.sql | 2 - doxygen/Doxyfile.in | 4 +- {src/contraction/src => doxygen}/contraction.dox | 0 {src => doxygen}/mainpage.dox | 0 src/CMakeLists.txt | 62 - .../doc/{allpairs.rst => allpairs-family.rst} | 19 +- src/allpairs/doc/doc-floydWarshall.queries | 7 + src/allpairs/doc/doc-johnson.queries | 7 + src/allpairs/doc/pgr_floydWarshall.rst | 19 +- src/allpairs/doc/pgr_johnson.rst | 19 +- src/allpairs/src/floydWarshall.c | 38 +- src/allpairs/src/floydWarshall_driver.cpp | 16 +- src/allpairs/src/floydWarshall_driver.h | 1 - src/allpairs/src/johnson.c | 39 +- src/allpairs/src/johnson_driver.cpp | 16 +- src/allpairs/src/pgr_allpairs.hpp | 54 +- src/allpairs/test/doc-floydWarshall.result | 1 + src/allpairs/test/doc-floydWarshall.test.sql | 1 + src/allpairs/test/doc-johnson.result | 1 + src/allpairs/test/doc-johnson.test.sql | 1 + src/alpha_shape/doc/doc-pgr_alphashape.queries | 42 +- .../doc/doc-pgr_pointsAsPolygon.queries | 2 + src/alpha_shape/doc/pgr_alphaShape.rst | 79 +- src/alpha_shape/doc/pgr_pointsAsPolygon.rst | 4 +- src/alpha_shape/src/alpha.c | 56 +- src/alpha_shape/src/alpha_driver.cpp | 13 +- src/alpha_shape/test/doc-pgr_alphashape.result | 13 +- src/alpha_shape/test/doc-pgr_alphashape.test.sql | 34 +- .../test/doc-pgr_pointsAsPolygon.test.sql | 2 - src/apsp_johnson/doc/CMakeLists.txt | 0 src/apsp_johnson/doc/doc-apspJohnson.queries | 4 + src/apsp_johnson/doc/pgr_apspJohnson.rst | 78 - src/apsp_johnson/test/doc-apspJohnson.test.sql | 1 - src/apsp_warshall/doc/CMakeLists.txt | 0 src/apsp_warshall/doc/doc-apspWarshall.queries | 4 + src/apsp_warshall/doc/pgr_apspWarshall.rst | 84 - src/apsp_warshall/test/doc-apspWarshall.test.sql | 1 - src/astar/doc/aStar-family.rst | 109 + src/astar/doc/doc-aStarCost.queries | 58 + src/astar/doc/doc-astar-v2.queries | 12 +- src/astar/doc/doc-astar.queries | 95 +- src/astar/doc/{pgr_astar.rst => pgr_aStar.rst} | 208 +- src/astar/doc/pgr_aStarCost.rst | 239 + src/astar/doc/pgr_astar-v2.rst | 101 - src/astar/sql/CMakeLists.txt | 9 +- src/astar/sql/astarCost.sql | 10 + src/astar/sql/astarV2.0.sql | 2 +- src/astar/src/CMakeLists.txt | 14 +- src/astar/src/astarOneToMany_driver.cpp | 182 - src/astar/src/astarOneToMany_driver.h | 67 - src/astar/src/astarOneToOne_driver.h | 65 - ...ny_driver.cpp => astar_many_to_many_driver.cpp} | 138 +- ...ToMany_driver.h => astar_many_to_many_driver.h} | 18 +- .../{astarManyToMany.c => many_to_many_astar.c} | 174 +- .../src/{astarManyToOne.c => many_to_one_astar.c} | 158 +- .../src/{astarOneToMany.c => one_to_many_astar.c} | 159 +- .../src/{astarOneToOne.c => one_to_one_astar.c} | 133 +- src/astar/src/pgr_astar.hpp | 546 +- src/astar/test/doc-aStarCost.result | 16 + src/astar/test/doc-aStarCost.test.sql | 22 + src/astar/test/doc-astar-v2.result | 4 +- src/astar/test/doc-astar-v2.test.sql | 6 +- src/astar/test/doc-astar.result | 64 +- src/astar/test/doc-astar.test.sql | 20 +- .../astar_ManyToMany-compare-dijkstra.test.sql | 97 + .../astar_ManyToOne-compare-dijkstra.test.sql | 99 + .../astar_oneToMany-compare-dijkstra.test.sql | 99 + .../test/pgtap/astar_oneToOne-types-check.sql | 26 +- src/astar/test/test.conf | 2 + src/bdDijkstra/doc/doc-pgr_bdDijkstra.queries | 52 + src/bdDijkstra/doc/pgr_bdDijkstra.rst | 113 + src/bdDijkstra/sql/CMakeLists.txt | 7 + src/bdDijkstra/sql/bdDijkstra.sql | 93 + src/bdDijkstra/src/CMakeLists.txt | 4 + .../src/bdDijkstra.c} | 122 +- .../src/bdDijkstra_driver.cpp} | 147 +- .../src/bdDijkstra_driver.h} | 28 +- src/bdDijkstra/src/pgr_bdDijkstra.hpp | 281 + src/bdDijkstra/test/bdDijkstra-large.result | 332 + .../test/bdDijkstra-large.test.sql} | 47 +- src/bdDijkstra/test/doc-pgr_bdDijkstra.result | 17 + src/bdDijkstra/test/doc-pgr_bdDijkstra.test.sql | 23 + src/bdDijkstra/test/large.data | 17280 ++++++++++++++++ .../test/pgtap/bdDijkstra-compare-dijkstra.sql | 73 + .../test/pgtap/bdDijkstra-innerQuery.sql | 116 + .../test/pgtap/bdDijkstra-types-check.sql | 54 + src/bdDijkstra/test/test.conf | 17 + src/bd_astar/doc/doc-bdAstar.queries | 2 + src/bd_astar/doc/pgr_bdAstar.rst | 6 +- src/bd_astar/src/BiDirAStar.cpp | 19 +- src/bd_astar/src/bdastar.c | 42 +- src/bd_astar/src/bdastar_driver.cpp | 6 +- src/bd_astar/test/CMakeLists.txt | 0 src/bd_astar/test/bd_astar-any-01.result | 202 +- src/bd_astar/test/bd_astar-any-02.result | 120 +- src/bd_astar/test/bd_astar-any-03.result | 4 +- src/bd_astar/test/bd_astar-any-04.result | 4 +- src/bd_astar/test/bd_astar-any-05.result | 202 +- src/bd_astar/test/bd_astar-any-06.result | 120 +- src/bd_astar/test/doc-bdAstar.test.sql | 2 - src/bd_astar/tester/ans1.txt | 202 +- src/bd_astar/tester/ans2.txt | 120 +- src/bd_astar/tester/ans3.txt | 4 +- src/bd_astar/tester/ans4.txt | 4 +- src/bd_astar/tester/ans5.txt | 202 +- src/bd_astar/tester/ans6.txt | 120 +- src/bd_astar/tester/input.txt | 14 +- src/bd_dijkstra/doc/doc-bdDijkstra.queries | 32 +- src/bd_dijkstra/doc/pgr_bdDijkstra.rst | 95 - src/bd_dijkstra/sql/CMakeLists.txt | 3 +- .../sql/bdDijkstra-v2.sql} | 19 +- src/bd_dijkstra/sql/routing_bd_dijkstra.sql | 39 - src/bd_dijkstra/src/BiDirDijkstra.cpp | 460 - src/bd_dijkstra/src/BiDirDijkstra.h | 120 - src/bd_dijkstra/src/CMakeLists.txt | 5 - src/bd_dijkstra/src/bdsp.c | 408 - src/bd_dijkstra/src/bdsp_driver.cpp | 79 - src/bd_dijkstra/src/bdsp_driver.h | 55 - src/bd_dijkstra/test/CMakeLists.txt | 0 src/bd_dijkstra/test/bd_dijkstra-any-01.result | 203 +- src/bd_dijkstra/test/bd_dijkstra-any-02.result | 121 +- src/bd_dijkstra/test/bd_dijkstra-any-03.result | 5 +- src/bd_dijkstra/test/bd_dijkstra-any-04.result | 5 +- src/bd_dijkstra/test/bd_dijkstra-any-05.result | 203 +- src/bd_dijkstra/test/bd_dijkstra-any-06.result | 121 +- src/bd_dijkstra/test/doc-bdDijkstra.result | 22 +- src/bd_dijkstra/test/doc-bdDijkstra.test.sql | 6 +- .../test/pgtap/bdDijkstra-types-check.sql | 139 +- .../test/pgtap/v2-bdDijkstra-compare-dijkstra.sql | 99 + src/bd_dijkstra/test/test.conf | 1 + src/common/doc/{types => }/cost_result.rst | 8 +- src/common/doc/{types => }/geom_result.rst | 6 +- src/common/doc/pgr_version.rst | 12 +- .../doc/{types/index.rst => types_index.rst} | 2 +- src/common/doc/utilities/end_point.rst | 61 - src/common/doc/utilities/get_column_name.rst | 88 - src/common/doc/utilities/get_table_name.rst | 106 - src/common/doc/utilities/is_column_in_table.rst | 89 - src/common/doc/utilities/is_column_indexed.rst | 90 - src/common/doc/utilities/point_to_id.rst | 66 - src/common/doc/utilities/quote_ident.rst | 124 - src/common/doc/utilities/start_point.rst | 61 - src/common/doc/utilities/versionless.rst | 68 - src/common/sql/pgrouting.control.in | 2 +- src/common/sql/pgrouting_version.sql | 21 +- src/common/sql/utilities_pgr.sql | 87 - src/common/src/CMakeLists.txt | 2 + src/common/src/arrays_input.c | 185 +- src/common/src/basePath_SSEC.cpp | 71 +- src/common/src/basePath_SSEC.hpp | 131 +- src/common/src/basic_edge.cpp | 8 - src/common/src/basic_edge.h | 1 - src/common/src/basic_vertex.cpp | 12 +- src/common/src/basic_vertex.h | 2 + src/common/src/ch_edge.cpp | 103 +- src/common/src/ch_edge.h | 35 +- src/common/src/ch_vertex.cpp | 80 +- src/common/src/ch_vertex.h | 27 +- src/common/src/coordinates_input.c | 7 +- src/common/src/debug_macro.h | 5 +- src/common/src/e_report.c | 123 + src/common/src/e_report.h | 136 + src/common/src/edges_input.c | 106 +- src/common/src/edges_input.h | 8 +- src/common/src/get_check_data.c | 23 +- src/common/src/get_check_data.h | 2 +- src/common/src/identifiers.hpp | 22 +- src/common/src/matrixRows_input.c | 6 +- src/common/src/{debug_macro.h => pgr_alloc.cpp} | 25 +- src/common/src/pgr_alloc.hpp | 40 +- src/common/src/pgr_assert.cpp | 13 +- src/common/src/pgr_base_graph.hpp | 177 +- src/common/src/pgr_types.h | 58 +- src/common/src/points_input.c | 2 +- src/common/src/postgres_connection.c | 34 +- src/common/src/postgres_connection.h | 40 +- src/common/src/restrictions_input.c | 7 +- src/common/src/time_msg.c | 7 +- src/common/src/xy_vertex.cpp | 9 +- src/common/src/xy_vertex.h | 7 + .../{contraction.rst => contraction-family.rst} | 31 +- src/contraction/doc/doc-contractGraph.queries | 6 + src/contraction/doc/doc-contraction.queries | 10 +- src/contraction/doc/pgr_contractGraph.rst | 35 +- src/contraction/src/contractGraph.c | 284 +- src/contraction/src/contractGraph_driver.cpp | 462 +- src/contraction/src/contractGraph_driver.h | 8 +- src/contraction/src/pgr_contract.hpp | 509 +- src/contraction/src/pgr_contractionGraph.hpp | 712 +- src/contraction/src/pgr_deadEndContraction.hpp | 525 +- src/contraction/src/pgr_linearContraction.hpp | 423 +- src/contraction/src/structs.h | 48 - src/contraction/test/directed-deadend.result | 11 + src/contraction/test/directed-deadend.test.sql | 44 + src/contraction/test/directed-development.result | 18 +- src/contraction/test/directed-development.test.sql | 68 +- src/contraction/test/directed-linear.result | 17 + src/contraction/test/directed-linear.test.sql | 45 + src/contraction/test/doc-contractGraph.test.sql | 2 +- src/contraction/test/doc-contraction.test.sql | 3 +- src/contraction/test/expand_graph.test.sql | 51 - .../test/expand_graph_without_function.test.sql | 51 - .../test/pgtap/contraction-types-check.sql | 4 +- src/contraction/test/pgtap/directed_dead_end.sql | 287 +- src/contraction/test/proof_of_concept.test.sql | 2 - src/contraction/test/proof_of_concept_1.test.sql | 2 - src/contraction/test/return_types.test.sql | 2 - src/contraction/test/test.conf | 2 + src/convenience/doc/doc-conversion.queries | 23 +- src/convenience/doc/doc-matrix.queries | 5 + src/convenience/doc/pgr_flipEdges.rst | 73 - src/convenience/doc/pgr_pointToEdgeNode.rst | 10 +- src/convenience/doc/pgr_pointsToDMatrix.rst | 84 - src/convenience/doc/pgr_pointsToVids.rst | 83 - src/convenience/doc/pgr_textToPoints.rst | 71 - src/convenience/doc/pgr_vidsToDMatrix.rst | 101 - src/convenience/doc/pgr_vidsToDMatrix2.rst | 92 - src/convenience/sql/CMakeLists.txt | 1 - src/convenience/sql/pgr_fakeContraction.sql | 56 - src/convenience/sql/pgrouting_conversion_tools.sql | 1 + src/convenience/test/doc-conversion.result | 1 + src/convenience/test/doc-conversion.test.sql | 25 - src/convenience/test/doc-matrix.result | 5 + src/convenience/test/doc-matrix.test.sql | 4 - src/convenience/test/test.conf | 4 +- src/convenience/test/vidstodmatrix-any-01.test.sql | 2 - .../doc/{costMatrix.rst => cost-category.rst} | 43 +- .../{costMatrix.rst => costMatrix-category.rst} | 22 +- src/costMatrix/doc/doc-pgr_fooDmatrix.queries | 66 +- ...kstraCostMatrix.rst => pgr_aStarCostMatrix.rst} | 73 +- src/costMatrix/doc/pgr_dijkstraCostMatrix.rst | 18 +- src/costMatrix/doc/pgr_withPointsCostMatrix.rst | 21 +- src/costMatrix/sql/CMakeLists.txt | 6 +- src/costMatrix/sql/eucledianCostMatrix.sql | 92 - .../test/doc-pgr_fooDmatrix-mac.test.sql | 2 - .../test/doc-pgr_fooDmatrix-windows.test.sql | 2 - src/costMatrix/test/doc-pgr_fooDmatrix.result | 33 + src/costMatrix/test/doc-pgr_fooDmatrix.test.sql | 37 +- .../doc/{dijkstra.rst => dijkstra-family.rst} | 29 +- src/dijkstra/doc/doc-pgr_dijkstra.queries | 10 +- src/dijkstra/doc/doc-pgr_dijkstraCost.queries | 4 +- src/dijkstra/doc/doc-pgr_dijkstraVia.queries | 6 + src/dijkstra/doc/pgr_dijkstra.rst | 51 +- src/dijkstra/doc/pgr_dijkstraCost.rst | 33 +- src/dijkstra/doc/pgr_dijkstraVia.rst | 8 +- src/dijkstra/doc/pgr_dijkstra_v2.rst | 113 - src/dijkstra/sql/dijkstra.sql | 4 +- src/dijkstra/sql/dijkstraVia.sql | 4 +- src/dijkstra/src/CMakeLists.txt | 4 - src/dijkstra/src/dijkstraVia.c | 155 +- src/dijkstra/src/dijkstraVia_driver.cpp | 146 +- src/dijkstra/src/dijkstraVia_driver.h | 22 +- src/dijkstra/src/many_to_many_dijkstra.c | 190 +- src/dijkstra/src/many_to_many_dijkstra_driver.cpp | 139 +- src/dijkstra/src/many_to_many_dijkstra_driver.h | 31 +- src/dijkstra/src/many_to_one_dijkstra.c | 158 +- src/dijkstra/src/many_to_one_dijkstra_driver.cpp | 121 - src/dijkstra/src/many_to_one_dijkstra_driver.h | 62 - src/dijkstra/src/one_to_many_dijkstra.c | 169 +- src/dijkstra/src/one_to_many_dijkstra_driver.cpp | 114 - src/dijkstra/src/one_to_many_dijkstra_driver.h | 62 - src/dijkstra/src/one_to_one_dijkstra.c | 129 +- src/dijkstra/src/one_to_one_dijkstra_driver.cpp | 115 - src/dijkstra/src/pgr_dijkstra.hpp | 388 +- src/dijkstra/test/CMakeLists.txt | 0 src/dijkstra/test/dijkstra-v2.test.sql | 2 - src/dijkstra/test/doc-pgr_dijkstra.result | 8 +- src/dijkstra/test/doc-pgr_dijkstra.test.sql | 5 - src/dijkstra/test/doc-pgr_dijkstraCost.test.sql | 2 - .../test/pgtap/oneToOne_equiv_manyToMany.test.sql | 2 + .../test/pgtap/oneToOne_equiv_manyToOne.test.sql | 6 +- .../test/pgtap/oneToOne_equiv_oneToMany.test.sql | 2 + .../pgtap/v2-equi-v3-undirected-N-reverse.test.sql | 9 +- .../pgtap/v2-equi-v3-undirected-W-reverse.test.sql | 3 + src/dijkstra/test/test.conf | 7 +- src/dijkstra/tester/Makefile | 14 - src/dijkstra/tester/boost_wrapper.cpp | 216 - src/dijkstra/tester/dijkstra.h | 72 - src/dijkstra/tester/testit.c | 139 - .../doc/doc-pgr_drivingDistance.queries | 10 +- .../doc/doc-pgr_drivingdistance-v2.queries | 2 + .../doc/drivingDistance-category.rst} | 23 +- src/driving_distance/doc/drivingDistance.rst | 37 - src/driving_distance/doc/pgr_drivingDistance.rst | 12 +- .../doc/pgr_drivingDistance_v2.rst | 97 - src/driving_distance/sql/routing_dd.sql | 151 +- src/driving_distance/sql/withPoints_dd.sql | 23 +- src/driving_distance/src/CMakeLists.txt | 6 +- .../src/boost_interface_drivedist.cpp | 173 - src/driving_distance/src/drivedist.c | 184 - src/driving_distance/src/drivedist_driver.cpp | 118 + ...st_interface_drivedist.h => drivedist_driver.h} | 24 +- .../src/many_to_dist_driving_distance.c | 180 +- .../src/many_to_dist_withPointsDD.c | 171 +- src/driving_distance/src/withPoints_dd.c | 262 - src/driving_distance/src/withPoints_dd_driver.cpp | 260 +- src/driving_distance/src/withPoints_dd_driver.h | 29 +- .../test/doc-pgr_drivingDistance.test.sql | 3 - .../test/doc-pgr_drivingdistance-v2.test.sql | 6 +- .../test/drivingdistance-any-00.test.sql | 19 +- src/driving_distance/test/issue729.result | 5 + src/driving_distance/test/issue729.test.sql | 61 + src/driving_distance/test/test.conf | 1 + src/internalQueryTests/src/testXYedges.c | 18 +- src/internalQueryTests/src/testXYedges_driver.cpp | 53 +- src/internalQueryTests/src/test_c_edges.c | 15 +- src/internalQueryTests/src/test_c_edges_driver.cpp | 279 +- src/internalQueryTests/src/test_matrixRows.c | 18 +- .../src/test_matrixRows_driver.cpp | 8 +- src/internalQueryTests/test/test.conf | 6 +- src/internalQueryTests/test/testCHedges.result | 681 - src/internalQueryTests/test/testCHedges.test.sql | 2 - src/kdijkstra/doc/pgr_kDijkstra.rst | 128 - src/kdijkstra/test/doc-kdijkstra.test.sql | 3 - src/ksp/doc/{ksp.rst.back => KSP-category.rst} | 17 +- src/ksp/doc/doc-ksp-v2.queries | 4 + src/ksp/doc/doc-ksp.queries | 32 +- src/ksp/doc/{pgr_ksp.rst => pgr_KSP.rst} | 34 +- src/ksp/doc/pgr_ksp_v2.rst | 102 - src/ksp/src/ksp.c | 206 +- src/ksp/src/ksp_driver.cpp | 140 +- src/ksp/src/ksp_driver.h | 20 +- src/ksp/src/pgr_ksp.cpp | 86 +- src/ksp/src/pgr_ksp.hpp | 52 +- src/ksp/src/withPoints_ksp.c | 73 +- src/ksp/src/withPoints_ksp_driver.cpp | 112 +- src/ksp/src/withPoints_ksp_driver.h | 5 +- src/ksp/test/doc-ksp-v2.test.sql | 1 - src/ksp/test/doc-ksp.test.sql | 31 +- src/ksp/test/ksp-network.result | 182 - src/ksp/test/ksp-network.test.sql | 39 +- src/ksp/test/test.conf | 6 +- src/label_graph/doc/doc-pgr_labelGraph.queries | 6 +- src/label_graph/doc/pgr_labelGraph.rst | 16 +- src/label_graph/test/CMakeLists.txt | 0 src/label_graph/test/doc-pgr_labelGraph.test.sql | 5 +- src/label_graph/test/pgrouting_labelgraph.test.sql | 2 - .../doc-pgr_maxFlow.queries} | 137 +- src/max_flow/doc/{maxFlow.rst => flow-family.rst} | 37 +- src/max_flow/doc/maxFlowApplications.rst | 6 +- src/max_flow/doc/pgr_edgeDisjointPaths.rst | 8 +- ...{pgr_maxFlowPushRelabel.rst => pgr_maxFlow.rst} | 87 +- src/max_flow/doc/pgr_maxFlowBoykovKolmogorov.rst | 16 +- src/max_flow/doc/pgr_maxFlowEdmondsKarp.rst | 16 +- src/max_flow/doc/pgr_maxFlowPushRelabel.rst | 22 +- .../doc/pgr_maximumCardinalityMatching.rst | 16 +- src/max_flow/sql/CMakeLists.txt | 1 + src/max_flow/sql/max_flow.sql | 5 + src/max_flow/sql/only_flow.sql | 86 + src/max_flow/src/CMakeLists.txt | 12 +- ...y_driver.cpp => edge_disjoint_paths_driver.cpp} | 82 +- ..._many_driver.h => edge_disjoint_paths_driver.h} | 12 +- .../src/edge_disjoint_paths_many_to_many.c | 169 +- src/max_flow/src/edge_disjoint_paths_many_to_one.c | 163 +- .../src/edge_disjoint_paths_many_to_one_driver.cpp | 103 - .../src/edge_disjoint_paths_many_to_one_driver.h | 56 - src/max_flow/src/edge_disjoint_paths_one_to_many.c | 118 +- .../src/edge_disjoint_paths_one_to_many_driver.cpp | 104 - .../src/edge_disjoint_paths_one_to_many_driver.h | 56 - src/max_flow/src/edge_disjoint_paths_one_to_one.c | 108 +- .../src/edge_disjoint_paths_one_to_one_driver.cpp | 99 - .../src/edge_disjoint_paths_one_to_one_driver.h | 55 - src/max_flow/src/max_flow_driver.cpp | 152 + ...low_many_to_many_driver.h => max_flow_driver.h} | 13 +- src/max_flow/src/max_flow_many_to_many.c | 183 +- src/max_flow/src/max_flow_many_to_many_driver.cpp | 116 - src/max_flow/src/max_flow_many_to_one.c | 152 +- src/max_flow/src/max_flow_many_to_one_driver.cpp | 117 - src/max_flow/src/max_flow_many_to_one_driver.h | 56 - src/max_flow/src/max_flow_one_to_many.c | 175 +- src/max_flow/src/max_flow_one_to_many_driver.cpp | 117 - src/max_flow/src/max_flow_one_to_many_driver.h | 56 - src/max_flow/src/max_flow_one_to_one.c | 163 +- src/max_flow/src/max_flow_one_to_one_driver.cpp | 114 - src/max_flow/src/maximum_cardinality_matching.c | 123 +- .../src/maximum_cardinality_matching_driver.cpp | 67 +- .../src/maximum_cardinality_matching_driver.h | 6 +- src/max_flow/src/pgr_edgedisjointpaths.hpp | 41 +- src/max_flow/src/pgr_maxflow.hpp | 106 +- .../src/pgr_maximumcardinalitymatching.hpp | 29 +- src/max_flow/test/CMakeLists.txt | 0 .../test/doc-pgr_edgeDisjointPaths.test.sql | 3 - src/max_flow/test/doc-pgr_maxFlow.result | 9 + ...shRelabel.test.sql => doc-pgr_maxFlow.test.sql} | 121 +- .../test/doc-pgr_maxFlowBoykovKolmogorov.test.sql | 114 +- .../test/doc-pgr_maxFlowEdmondsKarp.test.sql | 117 +- .../test/doc-pgr_maxFlowPushRelabel.test.sql | 121 +- .../doc-pgr_maximumCardinalityMatching.test.sql | 3 - src/max_flow/test/pgtap/flow-types-check.sql | 34 +- src/max_flow/test/pgtap/internet_example.sql | 144 + src/max_flow/test/test.conf | 2 + src/pickDeliver/doc/CMakeLists.txt | 0 src/pickDeliver/doc/doc-pickDeliver.queries | 6 + src/pickDeliver/src/customers_input.c | 6 +- src/pickDeliver/src/optimize.cpp | 4 +- src/pickDeliver/src/order.cpp | 2 +- src/pickDeliver/src/pgr_pickDeliver.cpp | 14 +- src/pickDeliver/src/pgr_pickDeliver.h | 4 - src/pickDeliver/src/pickDeliver.c | 45 +- src/pickDeliver/src/pickDeliver_driver.cpp | 11 +- src/pickDeliver/src/pickDeliver_driver.h | 1 - src/pickDeliver/src/solution.cpp | 1 - src/pickDeliver/src/tw_node.cpp | 2 +- src/pickDeliver/src/vehicle.cpp | 4 +- src/pickDeliver/src/vehicle.h | 2 +- src/pickDeliver/src/vehicle_node.cpp | 3 +- src/pickDeliver/src/vehicle_pickDeliver.cpp | 8 +- src/pickDeliver/test/jet_customers.result | 60 +- src/pickDeliver/test/pickDeliver.data | 240 +- src/proposed.rst | 104 - src/proposedNext.rst | 71 - src/routingFunctions.rst | 65 - src/topology/doc/doc-pgr_analyzeGraph.queries | 8 +- src/topology/doc/doc-pgr_createTopology.queries | 20 +- src/topology/doc/pgr_analyzeGraph.rst | 46 +- src/topology/doc/pgr_analyzeOneWay.rst | 24 +- src/topology/doc/pgr_createTopology.rst | 26 +- src/topology/doc/pgr_createVerticesTable.rst | 34 +- src/topology/doc/pgr_nodeNetwork.rst | 54 +- .../doc/{topology.rst => topology-functions.rst} | 22 +- src/topology/test/analyzeOneway-any.test.sql | 3 - src/topology/test/createVertTab-any.test.sql | 3 - src/topology/test/doc-pgr_analyzeGraph.test.sql | 89 +- src/topology/test/doc-pgr_createTopology.test.sql | 232 +- src/topology/test/nodeNetwork-any.test.sql | 3 - src/trsp/doc/README.md | 185 +- src/trsp/doc/doc-trsp.queries | 2 + src/trsp/doc/pgr_trsp.rst | 10 +- src/trsp/sql/routing_trsp.sql | 31 - src/trsp/sql/routing_trsp_vias.sql | 32 +- src/trsp/sql/trsp_V2.2.sql | 2 +- src/trsp/sql/viaEdges_v2.2.sql | 85 + src/trsp/sql/viaVertices_v2.2.sql | 82 + src/trsp/src/GraphDefinition.cpp | 204 +- src/trsp/src/GraphDefinition.h | 36 +- src/trsp/src/trsp.c | 183 +- src/trsp/src/trsp.h | 42 +- src/trsp/src/trsp_core.cpp | 61 +- src/trsp/src/utils.h | 6 +- src/trsp/test/doc-trsp.test.sql | 2 - src/trsp/test/issue693.test.sql | 2 - src/trsp/test/issue704.result | 1 - src/trsp/test/test.conf | 5 +- src/trsp/test/trsp-any-02.test.sql | 2 - ...otes_v2.3.2.result => trsp_notes_v2.4.0.result} | 140 +- ..._v2.3.2.test.sql => trsp_notes_v2.4.0.test.sql} | 174 +- src/trsp/test/trsp_vias-any-04.test.sql | 2 - src/tsp/doc/{tsp.rst => TSP-family.rst} | 131 +- src/tsp/doc/doc-pgr_TSP.queries | 6 +- src/tsp/doc/doc-pgr_eucledianTSP.queries | 6 +- src/tsp/doc/doc-tsp.queries | 44 +- src/tsp/doc/{pgr_tsp.rst => pgr_TSP.rst} | 26 +- src/tsp/doc/pgr_eucledianTSP.rst | 10 +- src/tsp/doc/pgr_tsp-V2.0.rst | 255 - src/tsp/doc/tsp_parameters.txt | 4 +- src/tsp/sql/CMakeLists.txt | 12 +- src/tsp/sql/TSP.sql | 24 + src/tsp/sql/_makeMatrix.sql | 69 - src/tsp/sql/eucledianTSP.sql | 24 + src/tsp/sql/routing_tsp.sql | 49 - src/tsp/sql/routing_tsp_wrappers.sql | 44 - src/tsp/sql/tsp_v2.0_coordinates.sql | 33 +- src/tsp/sql/tsp_v2.0_matrix.sql | 95 + src/tsp/src/CMakeLists.txt | 3 - src/tsp/src/Dmatrix.cpp | 34 +- src/tsp/src/eucledianDmatrix.cpp | 9 +- src/tsp/src/eucledianTSP.c | 78 +- src/tsp/src/eucledianTSP_driver.cpp | 86 +- src/tsp/src/eucledianTSP_driver.h | 2 +- src/tsp/src/newTSP.c | 78 +- src/tsp/src/newTSP_driver.cpp | 73 +- src/tsp/src/newTSP_driver.h | 1 + src/tsp/src/pgr_tsp.cpp | 44 +- src/tsp/src/pgr_tsp.hpp | 5 + src/tsp/src/tsp.h | 52 - src/tsp/src/tsp2.c | 345 - src/tsp/src/tsplib.c | 616 - src/tsp/test/development/gr9882-tsp.test.sql | 19806 +++++++++--------- src/tsp/test/doc-pgr_TSP-mac.test.sql | 2 - src/tsp/test/doc-pgr_TSP-windows.test.sql | 2 - src/tsp/test/doc-pgr_TSP.test.sql | 2 - src/tsp/test/doc-pgr_eucledianTSP.result | 2 +- src/tsp/test/doc-pgr_eucledianTSP.test.sql | 7 +- src/tsp/test/doc-tsp-mac.test.sql | 1 - src/tsp/test/doc-tsp-windows.test.sql | 2 +- src/tsp/test/doc-tsp.result | 32 +- src/tsp/test/doc-tsp.test.sql | 10 +- src/tsp/test/test.conf | 3 +- src/tsp/test/tsp-v2-0.result | 134 +- src/tsp/test/tsp-v2-0.test.sql | 5 +- src/vrp_basic/doc/pgr_vrpOneDepot.rst | 8 +- src/vrp_basic/src/CMakeLists.txt | 2 - src/vrp_basic/src/VRP.c | 58 +- src/vrp_basic/src/VRP_Solver.cpp | 27 +- src/vrp_basic/src/VRP_core.cpp | 6 +- src/vrp_basic/test/CMakeLists.txt | 0 src/vrp_basic/test/Distance.txt | 20200 +++++++++---------- src/vrp_basic/test/Orders.txt | 202 +- src/vrp_basic/test/Vehicles.txt | 42 +- src/vrppdtw/doc/doc-gsoc_vrppdtw.queries | 6 + src/vrppdtw/doc/pgr_gsoc_vrppdtw.rst | 14 +- src/vrppdtw/test/jet_customers.result | 96 + src/vrppdtw/test/jet_customers.test.sql | 128 + src/vrppdtw/test/test.conf | 1 + src/withPoints/doc/doc-pgr_withPoints.queries | 100 +- src/withPoints/doc/doc-pgr_withPointsCost.queries | 58 +- src/withPoints/doc/doc-pgr_withPointsDD.queries | 38 +- src/withPoints/doc/doc-pgr_withPointsKSP.queries | 38 +- src/withPoints/doc/pgr_withPoints.rst | 14 +- src/withPoints/doc/pgr_withPointsCost.rst | 14 +- src/withPoints/doc/pgr_withPointsDD.rst | 16 +- src/withPoints/doc/pgr_withPointsKSP.rst | 20 +- src/withPoints/doc/pgr_withPointsVia.rst | 14 +- .../doc/{withPoints.rst => withPoints-family.rst} | 40 +- src/withPoints/src/CMakeLists.txt | 3 - src/withPoints/src/get_new_queries.cpp | 19 +- src/withPoints/src/get_new_queries.h | 2 + src/withPoints/src/many_to_many_withPoints.c | 162 +- .../src/many_to_many_withPoints_driver.cpp | 210 +- .../src/many_to_many_withPoints_driver.h | 8 +- src/withPoints/src/many_to_one_withPoints.c | 145 +- .../src/many_to_one_withPoints_driver.cpp | 171 - src/withPoints/src/many_to_one_withPoints_driver.h | 66 - src/withPoints/src/msg_logger.hpp | 47 - src/withPoints/src/one_to_many_withPoints.c | 192 +- .../src/one_to_many_withPoints_driver.cpp | 209 - src/withPoints/src/one_to_many_withPoints_driver.h | 74 - src/withPoints/src/one_to_one_withPoints.c | 179 +- .../src/one_to_one_withPoints_driver.cpp | 191 - src/withPoints/src/one_to_one_withPoints_driver.h | 65 - src/withPoints/src/pgr_withPoints.cpp | 103 +- src/withPoints/src/pgr_withPoints.hpp | 9 +- src/withPoints/test/doc-pgr_withPoints.test.sql | 130 +- .../test/doc-pgr_withPointsCost.test.sql | 100 +- src/withPoints/test/doc-pgr_withPointsDD.test.sql | 61 +- ....result => doc-pgr_withPointsKSP-cygwin.result} | 4 +- .../test/doc-pgr_withPointsKSP-cygwin.test.sql | 26 + src/withPoints/test/doc-pgr_withPointsKSP.result | 8 +- src/withPoints/test/doc-pgr_withPointsKSP.test.sql | 52 +- src/withPoints/test/doc-pgr_withPointsVia.test.sql | 60 +- .../many_to_one_eq_one_to_one_withPoint.test.sql | 14 +- src/withPoints/test/test.conf | 14 +- ...pdate-files => build-extension-update-files.pl} | 52 +- tools/clean/clean.sh | 2 +- tools/cpplint.py | 6321 ------ tools/curr-sig/pgrouting--2.3.2.sig | 141 - tools/curr-sig/pgrouting--2.4.0.sig | 156 + tools/git-tools/gitattributes | 19 + tools/{mk-signature-file => mk-signature-file.pl} | 0 tools/release-scripts/check-release.sh | 327 + tools/release-scripts/compile-release.sh | 51 + tools/release-scripts/get_signatures.sh | 41 + tools/scripts/README.txt | 32 + tools/scripts/code_checker.sh | 78 + tools/scripts/fix_typos.sh | 9 +- tools/sigs/pgrouting--2.0.0.sig | 27 +- tools/sigs/pgrouting--2.0.1.sig | 27 +- tools/sigs/pgrouting--2.1.0.sig | 138 +- tools/sigs/pgrouting--2.2.0.sig | 182 +- tools/sigs/pgrouting--2.2.1.sig | 182 +- tools/sigs/pgrouting--2.2.2.sig | 182 +- tools/sigs/pgrouting--2.2.3.sig | 182 +- tools/sigs/pgrouting--2.2.4.sig | 182 +- tools/sigs/pgrouting--2.3.0.sig | 240 +- tools/sigs/pgrouting--2.3.1.sig | 242 +- tools/sigs/pgrouting--2.3.2.sig | 141 + tools/template/create.sh | 46 +- tools/template/doc/CMakeLists.txt | 0 tools/template/doc/doc-pgr_function1.queries | 32 + tools/template/doc/pgr_function1.rst | 246 +- tools/template/sql/function1.sql | 8 +- tools/template/src/CMakeLists.txt | 7 +- tools/template/src/function1.c | 253 +- tools/template/src/function1_driver.cpp | 143 +- tools/template/src/function1_driver.h | 30 +- tools/template/test/doc-function1.result | 30 +- tools/template/test/doc-function1.test.sql | 20 +- .../test/pgtap/function1-compare-dijkstra.sql | 73 + tools/template/test/pgtap/function1-innerQuery.sql | 116 + tools/template/test/pgtap/types-check.sql | 165 +- tools/template/test/test.conf | 14 +- tools/testers/algorithm-tester.pl | 29 +- tools/testers/pg_prove_tests.sh | 9 +- tools/testers/setup.sql | 2 + tools/testers/update-tester.pl | 12 - tools/testers/update-tester.sh | 9 +- tools/travis/before_script.sh | 14 - tools/travis/install-doxygen.sh | 8 +- tools/travis/install-postgres9.5.sh | 39 - tools/travis/install-postgres9.6.sh | 39 - tools/travis/install_pgtap.sh | 26 - tools/travis/pgrouting_build.sh | 7 +- tools/travis/pgrouting_install.sh | 85 - tools/travis/pgrouting_prepare.sh | 47 - tools/travis/postGIS_install.sh | 93 - tools/travis/test-documentation.sh | 9 +- tools/vagrant/Readme.md | 54 - tools/vagrant/bootstrap.sh | 95 - tools/vagrant/build.sh | 18 - tools/vagrant/install.sh | 16 - tools/vagrant/packaging.sh | 15 - tools/vagrant/packaging.sh.sample | 15 - tools/winnie/build_pgrouting.sh | 18 +- 656 files changed, 55655 insertions(+), 51984 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pgrouting.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
