This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pgrouting.
commit e9157c39d3ee0437a34f2dd8e913a0da7df53d0a Merge: b15a482 03f3118 Author: Bas Couwenberg <[email protected]> Date: Mon Sep 26 17:27:40 2016 +0200 Merge tag 'upstream/2.3.0' Upstream version 2.3.0 .gitignore | 4 +- .travis.yml | 29 +- CMakeLists.txt | 523 +- NEWS | 85 +- README.md | 41 +- VERSION | 2 +- appveyor.yml | 102 +- ci/appveyor/install-CGAL.bat | 211 + ci/appveyor/install-boost.bat | 149 + ci/appveyor/install.bat | 176 + ci/appveyor/msbuild_pgrouting.bat | 55 + cmake/FindPostgreSQL.cmake | 3 +- doc/CMakeLists.txt | 18 +- doc/conf.py.in | 12 +- doc/deprecated.rst | 97 +- doc/i18n/pot/src/index.pot | 2 +- doc/index.html.in | 84 - doc/index.rst | 33 +- doc/src/changelog/1_x.rst | 79 - doc/src/changelog/2_0.rst | 52 - doc/src/changelog/2_1_0.rst | 71 - doc/src/changelog/2_2_0.rst | 59 - doc/src/changelog/2_2_1.rst | 30 - doc/src/changelog/2_2_2.rst | 28 - doc/src/changelog/2_2_3.rst | 28 - doc/src/changelog/2_2_4.rst | 31 - doc/src/changelog/index.rst | 35 - doc/src/changelog/release_notes.rst | 359 + doc/src/developer/developer_guide.rst | 16 +- doc/src/developer/sampledata.rst | 33 +- doc/src/installation/install-dependencies.rst | 2 - doc/src/installation/installation.rst | 49 +- doc/src/introduction/introduction.rst | 4 +- doc/src/introduction/support.rst | 9 +- doc/src/recipes/index.rst | 8 +- doc/src/tutorial/analytics.rst | 2 +- doc/src/tutorial/custom_query.rst | 49 +- doc/src/tutorial/topology.rst | 2 +- doc/src/tutorial/tutorial.rst | 2 +- doc/test/utilities-any.result | 2 +- doc/test/utilities-any.test.sql | 2 +- doxygen/CMakeLists.txt | 23 + tools/doxygen/Doxyfile => doxygen/Doxyfile.in | 43 +- {tools/doxygen => doxygen}/DoxygenLayout.xml | 0 src/CMakeLists.txt | 3 + src/allpairs/doc/allpairs.rst | 17 +- src/allpairs/doc/pgr_floydWarshall.rst | 108 +- src/allpairs/doc/pgr_johnson.rst | 117 +- src/allpairs/src/floydWarshall.c | 34 +- src/allpairs/src/floydWarshall_driver.cpp | 118 +- src/allpairs/src/floydWarshall_driver.h | 5 +- src/allpairs/src/johnson.c | 17 +- src/allpairs/src/johnson_driver.cpp | 95 +- src/allpairs/src/johnson_driver.h | 4 + src/allpairs/src/pgr_allpairs.hpp | 43 +- src/allpairs/test/test.conf | 2 +- src/alpha_shape/doc/doc-pgr_alphashape.queries | 15 +- src/alpha_shape/src/CMakeLists.txt | 2 +- src/alpha_shape/src/alpha.c | 211 +- src/alpha_shape/src/alpha_drivedist.cpp | 301 - src/alpha_shape/src/alpha_driver.cpp | 279 + src/alpha_shape/src/{alpha.h => alpha_driver.h} | 25 +- src/apsp_johnson/doc/doc-apspJohnson.queries | 2 + src/apsp_johnson/doc/pgr_apspJohnson.rst | 11 +- src/apsp_johnson/test/doc-apspJohnson.test.sql | 1 + src/apsp_warshall/doc/doc-apspWarshall.queries | 2 + src/apsp_warshall/doc/pgr_apspWarshall.rst | 13 +- src/apsp_warshall/test/doc-apspWarshall.test.sql | 1 + src/astar/CMakeLists.txt | 5 - .../{doc-astar.queries => doc-astar-v2.queries} | 20 +- src/astar/doc/doc-astar.queries | 74 +- src/astar/doc/{pgr_astar.rst => pgr_astar-v2.rst} | 25 +- src/astar/doc/pgr_astar.rst | 232 +- src/astar/sql/CMakeLists.txt | 10 +- src/astar/sql/_astar.sql | 108 + src/astar/sql/astar.sql | 124 +- src/astar/sql/astarCost.sql | 120 + .../sql/astarOneToOne.sql} | 56 +- .../sql/astarV2.0.sql} | 50 +- src/astar/src/CMakeLists.txt | 13 +- src/astar/src/astar.c | 504 - src/astar/src/astar.h | 41 - .../src/astarManyToMany.c} | 178 +- src/astar/src/astarManyToMany_driver.cpp | 172 + .../src/astarManyToMany_driver.h} | 45 +- .../src/astarManyToOne.c} | 181 +- .../src/astarOneToMany.c} | 178 +- src/astar/src/astarOneToMany_driver.cpp | 182 + .../src/astarOneToMany_driver.h} | 48 +- .../src/astarOneToOne.c} | 160 +- src/astar/src/astarOneToOne_driver.cpp | 167 + .../src/astarOneToOne_driver.h} | 44 +- src/astar/src/astar_boost_wrapper.cpp | 313 - src/astar/src/pgr_astar.hpp | 567 ++ src/astar/test/doc-astar-v2.result | 15 + src/astar/test/doc-astar-v2.test.sql | 13 + src/astar/test/doc-astar.result | 32 +- src/astar/test/doc-astar.test.sql | 28 +- .../test/pgtap/astarV2.0-compare-dijkstra.test.sql | 121 + ...r-types-check.sql => astarV2.0-types-check.sql} | 202 +- src/astar/test/pgtap/astarV2.0-types-check2.sql | 223 + .../pgtap/astar_oneToOne-compare-dijkstra.test.sql | 112 + .../astar_oneToOne-compare-dijkstra1.test.sql | 143 + .../test/pgtap/astar_oneToOne-types-check.sql | 216 + src/astar/test/spas-any-00.result | 5 - src/astar/test/spas-any-01.result | 2 - src/astar/test/spas-any-01.test.sql | 32 - src/astar/test/test.conf | 10 +- src/bd_astar/CMakeLists.txt | 6 - src/bd_astar/doc/pgr_bdAstar.rst | 4 +- src/bd_astar/src/BiDirAStar.cpp | 793 +- src/bd_astar/src/BiDirAStar.h | 132 +- src/bd_astar/src/CMakeLists.txt | 3 +- src/bd_astar/src/MinHeap.cpp | 220 +- src/bd_astar/src/MinHeap.h | 58 +- src/bd_astar/src/bdastar.c | 151 +- .../src/{bdastar_core.cpp => bdastar_driver.cpp} | 25 +- src/bd_astar/src/{bdastar.h => bdastar_driver.h} | 8 +- src/bd_astar/tester/BiDirAStar.cpp | 8 +- src/bd_dijkstra/CMakeLists.txt | 6 - src/bd_dijkstra/doc/doc-bdDijkstra.queries | 10 +- src/bd_dijkstra/doc/pgr_bdDijkstra.rst | 5 +- src/bd_dijkstra/src/BiDirDijkstra.cpp | 720 +- src/bd_dijkstra/src/BiDirDijkstra.h | 113 +- src/bd_dijkstra/src/CMakeLists.txt | 2 +- src/bd_dijkstra/src/bdsp.c | 174 +- .../src/{bdsp_core.cpp => bdsp_driver.cpp} | 40 +- src/bd_dijkstra/src/{bdsp.h => bdsp_driver.h} | 36 +- src/bd_dijkstra/test/doc-bdDijkstra.result | 20 +- src/common/CMakeLists.txt | 5 - src/common/doc/types/cost_result.rst | 2 - src/common/doc/types/geom_result.rst | 1 - src/common/doc/utilities/end_point.rst | 11 +- src/common/doc/utilities/get_column_name.rst | 16 +- src/common/doc/utilities/get_table_name.rst | 15 +- src/common/doc/utilities/index.rst | 44 - src/common/doc/utilities/is_column_in_table.rst | 14 +- src/common/doc/utilities/is_column_indexed.rst | 15 +- src/common/doc/utilities/point_to_id.rst | 18 +- src/common/doc/utilities/quote_ident.rst | 12 +- src/common/doc/utilities/start_point.rst | 11 +- src/common/doc/utilities/versionless.rst | 11 +- src/common/sql/CMakeLists.txt | 1 + src/common/sql/pgRouting-header.sql | 37 + src/common/sql/pgr_parameter_check.sql | 28 +- src/common/sql/pgrouting_utilities.sql | 10 +- src/common/sql/utilities_pgr.sql | 4 +- src/common/src/CMakeLists.txt | 12 + src/common/src/arrays_input.c | 99 +- src/common/src/arrays_input.h | 7 + src/common/src/baseGraph.hpp | 564 -- src/common/src/basePath_SSEC.cpp | 35 +- src/common/src/basePath_SSEC.hpp | 85 +- .../src/{postgres_connection.h => basic_edge.cpp} | 28 +- .../customers_input.h => common/src/basic_edge.h} | 43 +- src/common/src/basic_vertex.cpp | 146 + src/common/src/basic_vertex.h | 79 + src/common/src/ch_edge.cpp | 124 + src/common/src/ch_edge.h | 75 + src/common/src/ch_vertex.cpp | 120 + src/common/src/ch_vertex.h | 76 + .../src/coordinates_input.c} | 85 +- .../src/coordinates_input.h} | 20 +- src/common/src/debug_macro.h | 10 +- src/common/src/edges_input.c | 423 +- src/common/src/edges_input.h | 229 +- src/common/src/get_check_data.c | 9 +- src/common/src/get_check_data.h | 6 + src/common/src/identifiers.hpp | 350 + .../src/matrixRows_input.c} | 49 +- .../src/matrixRows_input.h} | 8 +- src/common/src/{memory_func.hpp => pgr_alloc.hpp} | 40 +- src/common/src/pgr_assert.cpp | 43 +- src/common/src/pgr_assert.h | 99 +- src/common/src/pgr_base_graph.hpp | 843 ++ src/common/src/pgr_logger.h | 2 +- src/common/src/pgr_types.h | 127 +- src/common/src/points_input.c | 16 +- src/common/src/points_input.h | 51 + src/common/src/postgres_connection.c | 8 +- src/common/src/postgres_connection.h | 8 +- src/common/src/restrictions_input.c | 27 +- src/common/src/restrictions_input.h | 4 + src/common/src/signalhandler.h | 4 +- src/common/src/time_msg.c | 34 +- src/common/src/time_msg.h | 30 + src/common/src/xy_vertex.cpp | 147 + src/common/src/xy_vertex.h | 95 + src/contraction/demo/dead_end_demo.sql | 56 + src/contraction/demo/linear_demo.sql | 44 + src/contraction/doc/contraction.rst | 630 +- src/contraction/doc/doc-contractGraph.queries | 56 + src/contraction/doc/doc-contraction.queries | 354 + src/contraction/doc/pgr_contractGraph.rst | 175 + src/contraction/doc/proof_of_concept.queries | 106 + src/{astar => contraction}/sql/CMakeLists.txt | 3 +- .../sql/contractGraph.sql} | 38 +- src/contraction/src/CMakeLists.txt | 4 + src/contraction/src/contractGraph.c | 267 + src/contraction/src/contractGraph_driver.cpp | 278 + .../contraction/src/contractGraph_driver.h | 43 +- src/contraction/src/contraction.dox | 579 ++ src/contraction/src/pgr_contract.hpp | 444 + src/contraction/src/pgr_contractionGraph.hpp | 530 ++ src/contraction/src/pgr_deadEndContraction.hpp | 229 + src/contraction/src/pgr_linearContraction.hpp | 259 + .../src/structs.h} | 33 +- src/contraction/test/directed-development.result | 50 + src/contraction/test/directed-development.test.sql | 107 + src/contraction/test/doc-contractGraph.result | 28 + src/contraction/test/doc-contractGraph.test.sql | 21 + src/contraction/test/doc-contraction.result | 128 + src/contraction/test/doc-contraction.test.sql | 212 + src/contraction/test/expand_graph.result | 78 + src/contraction/test/expand_graph.test.sql | 220 + .../test/expand_graph_without_function.result | 78 + .../test/expand_graph_without_function.test.sql | 86 + .../test/pgtap/contraction-types-check.sql | 237 + .../test/pgtap/contraction_cycle_directed.sql | 228 + .../test/pgtap/contraction_cycle_undirected.sql | 265 + src/contraction/test/pgtap/directed_dead_end.sql | 440 + src/contraction/test/pgtap/directed_linear.sql | 178 + src/contraction/test/pgtap/undirected_dead_end.sql | 301 + src/contraction/test/pgtap/undirected_linear.sql | 185 + src/contraction/test/proof_of_concept.result | 47 + src/contraction/test/proof_of_concept.test.sql | 90 + src/contraction/test/proof_of_concept_1.result | 68 + src/contraction/test/proof_of_concept_1.test.sql | 70 + src/contraction/test/return_types.result | 43 + src/contraction/test/return_types.test.sql | 71 + src/contraction/test/sampleData.result | 6 + src/contraction/test/sampleData.test.sql | 6 + src/contraction/test/test.conf | 32 + .../doc/doc-conversion.queries | 5 + .../doc/doc-matrix.queries | 20 +- .../doc/pgr_flipEdges.rst | 19 +- .../doc/pgr_pointToEdgeNode.rst | 14 +- .../doc/pgr_pointsToDMatrix.rst | 26 +- .../doc/pgr_pointsToVids.rst | 16 +- .../doc/pgr_textToPoints.rst | 22 +- .../doc/pgr_vidsToDMatrix.rst | 26 +- .../doc/pgr_vidsToDMatrix2.rst | 28 +- .../sql/CMakeLists.txt | 3 +- src/convenience/sql/pgr_fakeContraction.sql | 56 + src/convenience/sql/pgr_vidsToDMatrix.sql | 92 + .../sql/pgrouting_conversion_tools.sql | 2 + .../sql/pgrouting_dmatrix_tools.sql | 8 +- .../test/doc-conversion.result | 3 + .../test/doc-conversion.test.sql | 1 + src/convenience/test/doc-matrix.result | 39 + .../test/doc-matrix.test.sql | 2 + .../test/pgtap/flipEdges-types-check.sql | 0 .../test/pgtap/pointToEdgeNode-types-check.sql | 0 .../test/pgtap/pointsToDMatrix-types-check.sql | 0 .../test/pgtap/pointsToVids-types-check.sql | 0 .../test/pgtap/textToPoints-types-check.sql | 0 .../test/pgtap/vidsToDMatrix-types-check.sql | 0 src/{convinience => convenience}/test/test.conf | 1 - src/convenience/test/vidstodmatrix-any-01.result | 4 + .../test/vidstodmatrix-any-01.test.sql | 3 +- src/convinience/doc/convenience.rst | 61 - src/convinience/sql/pgr_vidsToDMatrix_dir.sql | 29 - src/convinience/test/doc-matrix.result | 25 - src/convinience/test/vidstodmatrix-any-01.result | 2 - src/costMatrix/doc/costMatrix.rst | 94 + src/costMatrix/doc/dmatrix_return_values.txt | 23 + src/costMatrix/doc/doc-pgr_fooDmatrix.queries | 132 + src/costMatrix/doc/pgr_dijkstraCostMatrix.rst | 144 + src/costMatrix/doc/pgr_withPointsCostMatrix.rst | 161 + src/costMatrix/sql/CMakeLists.txt | 14 + .../sql/astarCostMatrix.sql} | 44 +- .../sql/dijkstraCostMatrix.sql} | 39 +- src/costMatrix/sql/eucledianCostMatrix.sql | 92 + .../sql/withPointsCostMatrix.sql} | 44 +- src/costMatrix/test/doc-pgr_fooDmatrix-mac.result | 66 + .../test/doc-pgr_fooDmatrix-mac.test.sql | 51 + .../test/doc-pgr_fooDmatrix-windows.result | 66 + .../test/doc-pgr_fooDmatrix-windows.test.sql | 51 + src/costMatrix/test/doc-pgr_fooDmatrix.result | 66 + src/costMatrix/test/doc-pgr_fooDmatrix.test.sql | 51 + src/costMatrix/test/test.conf | 28 + src/dijkstra/demo/boost_demo.sql | 2 +- src/dijkstra/demo/hanoslav_demo.sql | 2 +- src/dijkstra/doc/CMakeLists.txt | 0 src/dijkstra/doc/dijkstra.rst | 20 +- src/dijkstra/doc/doc-pgr_dijkstra.queries | 10 + src/dijkstra/doc/doc-pgr_dijkstraVia.queries | 4 +- src/dijkstra/doc/pgr_dijkstra.rst | 115 +- src/dijkstra/doc/pgr_dijkstraCost.rst | 127 +- src/dijkstra/doc/pgr_dijkstraVia.rst | 72 +- src/dijkstra/doc/pgr_dijkstra_v2.rst | 19 +- src/dijkstra/sql/dijkstra.sql | 28 + src/dijkstra/sql/dijkstraVia.sql | 25 + src/dijkstra/src/dijkstraVia.c | 15 +- src/dijkstra/src/dijkstraVia_driver.cpp | 43 +- src/dijkstra/src/many_to_many_dijkstra.c | 19 +- src/dijkstra/src/many_to_many_dijkstra_driver.cpp | 19 +- src/dijkstra/src/many_to_one_dijkstra.c | 16 +- src/dijkstra/src/many_to_one_dijkstra_driver.cpp | 19 +- src/dijkstra/src/one_to_many_dijkstra.c | 15 +- src/dijkstra/src/one_to_many_dijkstra_driver.cpp | 20 +- src/dijkstra/src/one_to_one_dijkstra.c | 19 +- src/dijkstra/src/one_to_one_dijkstra_driver.cpp | 17 +- src/dijkstra/src/pgr_dijkstra.hpp | 47 +- src/dijkstra/test/dijkstra-v2.test.sql | 2 + src/dijkstra/test/doc-pgr_dijkstra.test.sql | 5 + src/dijkstra/test/doc-pgr_dijkstraVia.result | 4 +- src/driving_distance/CMakeLists.txt | 4 - .../doc/doc-pgr_drivingDistance.queries | 2 + .../doc/doc-pgr_drivingdistance-v2.queries | 2 + src/driving_distance/doc/drivingDistance.rst | 17 +- src/driving_distance/doc/pgr_drivingDistance.rst | 118 +- .../doc/pgr_drivingDistance_v2.rst | 20 +- src/driving_distance/sql/routing_dd.sql | 2 +- src/driving_distance/src/CMakeLists.txt | 1 - .../src/boost_interface_drivedist.cpp | 51 +- .../src/boost_interface_drivedist.h | 3 +- src/driving_distance/src/drivedist.c | 15 +- .../src/many_to_dist_driving_distance.c | 4 +- .../src/many_to_dist_withPointsDD.c | 21 +- src/driving_distance/src/withPoints_dd.c | 19 +- src/driving_distance/src/withPoints_dd_driver.cpp | 42 +- src/driving_distance/src/withPoints_dd_driver.h | 2 +- .../test/doc-pgr_drivingDistance.test.sql | 1 + .../test/doc-pgr_drivingdistance-v2.test.sql | 1 + .../test/drivingdistance-any-00.test.sql | 3 +- src/internalQueryTests/sql/CMakeLists.txt | 9 + .../sql/testXYedges.sql} | 17 +- .../sql/test_ch_edges.sql} | 14 +- .../sql/test_matrixRows.sql} | 14 +- src/internalQueryTests/src/CMakeLists.txt | 11 + src/internalQueryTests/src/testXYedges.c | 118 + src/internalQueryTests/src/testXYedges_driver.cpp | 208 + .../src/testXYedges_driver.h} | 28 +- src/internalQueryTests/src/test_c_edges.c | 113 + src/internalQueryTests/src/test_c_edges_driver.cpp | 381 + .../src/test_c_edges_driver.h} | 30 +- src/internalQueryTests/src/test_matrixRows.c | 120 + .../src/test_matrixRows_driver.cpp | 80 + .../src/test_matrixRows_driver.h} | 23 +- src/internalQueryTests/test/XYedge.result | 1 + src/internalQueryTests/test/XYedge.test.sql | 4 + .../test/pgtap/matrixRows_types_check.sql | 94 + .../test/pgtap/testXYedges_types_check.sql | 133 + .../test/test.conf | 19 +- src/internalQueryTests/test/testCHedges.result | 682 ++ src/internalQueryTests/test/testCHedges.test.sql | 5 + src/kdijkstra/CMakeLists.txt | 4 - src/kdijkstra/doc/CMakeLists.txt | 0 src/kdijkstra/doc/doc-kdijkstra.queries | 2 + src/kdijkstra/doc/pgr_kDijkstra.rst | 17 +- src/kdijkstra/src/CMakeLists.txt | 3 - src/kdijkstra/src/k_targets_boost_wrapper.cpp | 250 - src/kdijkstra/src/k_targets_boost_wrapper.h | 98 - src/kdijkstra/src/k_targets_sp.c | 486 - src/kdijkstra/test/doc-kdijkstra.test.sql | 1 + src/ksp/CMakeLists.txt | 4 - src/ksp/doc/CMakeLists.txt | 0 src/ksp/doc/doc-ksp-v2.queries | 2 + src/ksp/doc/doc-ksp.queries | 2 + src/ksp/doc/pgr_ksp.rst | 109 +- src/ksp/doc/pgr_ksp_v2.rst | 23 +- src/ksp/src/CMakeLists.txt | 1 - src/ksp/src/ksp.c | 22 +- src/ksp/src/ksp.h | 41 - src/ksp/src/ksp_driver.cpp | 34 +- src/ksp/src/ksp_driver.h | 4 +- src/ksp/src/pgr_ksp.cpp | 23 +- src/ksp/src/pgr_ksp.hpp | 9 +- src/ksp/src/withPoints_ksp.c | 19 +- src/ksp/src/withPoints_ksp_driver.cpp | 26 +- src/ksp/src/withPoints_ksp_driver.h | 4 +- src/ksp/test/doc-ksp-v2.test.sql | 2 + src/ksp/test/doc-ksp.test.sql | 1 + src/ksp/test/ksp-network.test.sql | 1 + src/label_graph/CMakeLists.txt | 4 - src/label_graph/doc/CMakeLists.txt | 0 src/label_graph/doc/pgr_labelGraph.rst | 18 +- src/label_graph/src/CMakeLists.txt | 0 src/linecommand/src/dijkstra.hpp | 84 +- src/linecommand/src/driving.cpp | 12 +- src/linecommand/src/ksp.cpp | 61 +- src/linecommand/src/pgRouting.cpp | 367 +- src/linecommand/src/warshall.hpp | 6 +- src/mainpage.dox | 73 +- src/max_flow/demo/slide_demo.sql | 45 + src/{allpairs => max_flow}/doc/CMakeLists.txt | 0 src/max_flow/doc/doc-pgr_edgeDisjointPaths.queries | 91 + .../doc/doc-pgr_maxFlowBoykovKolmogorov.queries | 107 + .../doc/doc-pgr_maxFlowEdmondsKarp.queries | 107 + .../doc/doc-pgr_maxFlowPushRelabel.queries | 114 + .../doc/doc-pgr_maximumCardinalityMatching.queries | 40 + src/max_flow/doc/maxFlow.rst | 90 + src/max_flow/doc/maxFlowApplications.rst | 60 + src/max_flow/doc/pgr_edgeDisjointPaths.rst | 225 + src/max_flow/doc/pgr_maxFlowBoykovKolmogorov.rst | 219 + src/max_flow/doc/pgr_maxFlowEdmondsKarp.rst | 209 + src/max_flow/doc/pgr_maxFlowPushRelabel.rst | 213 + .../doc/pgr_maximumCardinalityMatching.rst | 171 + src/max_flow/sql/CMakeLists.txt | 9 + src/max_flow/sql/edge_disjoint_paths.sql | 102 + src/max_flow/sql/max_flow.sql | 361 + .../sql/maximum_cardinality_matching.sql} | 36 +- src/max_flow/src/CMakeLists.txt | 25 + .../src/edge_disjoint_paths_many_to_many.c} | 156 +- .../edge_disjoint_paths_many_to_many_driver.cpp | 106 + .../src/edge_disjoint_paths_many_to_many_driver.h} | 45 +- .../src/edge_disjoint_paths_many_to_one.c} | 154 +- .../src/edge_disjoint_paths_many_to_one_driver.cpp | 103 + .../src/edge_disjoint_paths_many_to_one_driver.h} | 44 +- .../src/edge_disjoint_paths_one_to_many.c} | 153 +- .../src/edge_disjoint_paths_one_to_many_driver.cpp | 104 + .../src/edge_disjoint_paths_one_to_many_driver.h} | 44 +- .../src/edge_disjoint_paths_one_to_one.c} | 142 +- .../src/edge_disjoint_paths_one_to_one_driver.cpp | 99 + .../src/edge_disjoint_paths_one_to_one_driver.h} | 35 +- .../src/max_flow_many_to_many.c} | 164 +- src/max_flow/src/max_flow_many_to_many_driver.cpp | 116 + .../src/max_flow_many_to_many_driver.h} | 35 +- .../src/max_flow_many_to_one.c} | 158 +- src/max_flow/src/max_flow_many_to_one_driver.cpp | 117 + .../src/max_flow_many_to_one_driver.h} | 34 +- .../src/max_flow_one_to_many.c} | 158 +- src/max_flow/src/max_flow_one_to_many_driver.cpp | 117 + .../src/max_flow_one_to_many_driver.h} | 34 +- .../src/max_flow_one_to_one.c} | 144 +- src/max_flow/src/max_flow_one_to_one_driver.cpp | 114 + .../src/max_flow_one_to_one_driver.h} | 34 +- .../src/maximum_cardinality_matching.c} | 128 +- .../src/maximum_cardinality_matching_driver.cpp | 98 + .../src/maximum_cardinality_matching_driver.h} | 31 +- src/max_flow/src/pgr_edgedisjointpaths.hpp | 269 + src/max_flow/src/pgr_maxflow.hpp | 262 + .../src/pgr_maximumcardinalitymatching.hpp | 170 + src/{astar/doc => max_flow/test}/CMakeLists.txt | 0 src/max_flow/test/doc-pgr_edgeDisjointPaths.result | 44 + .../test/doc-pgr_edgeDisjointPaths.test.sql | 38 + .../test/doc-pgr_maxFlowBoykovKolmogorov.result | 41 + .../test/doc-pgr_maxFlowBoykovKolmogorov.test.sql | 60 + .../test/doc-pgr_maxFlowEdmondsKarp.result | 41 + .../test/doc-pgr_maxFlowEdmondsKarp.test.sql | 60 + .../test/doc-pgr_maxFlowPushRelabel.result | 48 + .../test/doc-pgr_maxFlowPushRelabel.test.sql | 62 + .../test/doc-pgr_maximumCardinalityMatching.result | 19 + .../doc-pgr_maximumCardinalityMatching.test.sql | 18 + src/max_flow/test/pgtap/flow-types-check.sql | 1368 +++ .../test/pgtap/flowapplications-types-check.sql | 740 ++ src/max_flow/test/sample_data_categories.sql | 33 + src/max_flow/test/test.conf | 24 + src/pickDeliver/CMakeLists.txt | 5 - src/pickDeliver/doc/doc-pickDeliver.queries | 245 + src/pickDeliver/doc/index.rst | 85 - src/pickDeliver/doc/pgr_pickDeliver.rst | 229 + src/pickDeliver/sql/CMakeLists.txt | 5 +- .../sql/pickDeliver.sql} | 38 +- src/pickDeliver/sql/routing_vrppdtw.sql | 43 - src/pickDeliver/src/CMakeLists.txt | 23 +- src/pickDeliver/src/Route.h | 257 - src/pickDeliver/src/Solution.h | 140 - src/pickDeliver/src/customers_input.c | 74 +- src/pickDeliver/src/customers_input.h | 28 +- src/pickDeliver/src/initial_solution.cpp | 559 ++ src/pickDeliver/src/initial_solution.h | 77 + src/pickDeliver/src/node.cpp | 81 + src/pickDeliver/src/node.h | 80 + src/pickDeliver/src/optimize.cpp | 497 + src/pickDeliver/src/optimize.h | 76 + src/pickDeliver/src/order.cpp | 190 + src/pickDeliver/src/order.h | 106 + src/pickDeliver/src/pdp.c | 170 - src/pickDeliver/src/pdp.h | 69 - src/pickDeliver/src/pdp.hpp | 69 - src/pickDeliver/src/pdp_solver.cpp | 355 - src/pickDeliver/src/pgr_pickDeliver.cpp | 357 + src/pickDeliver/src/pgr_pickDeliver.h | 108 + .../src/pickDeliver.c} | 192 +- src/pickDeliver/src/pickDeliver_driver.cpp | 127 + .../src/pickDeliver_driver.h} | 51 +- src/pickDeliver/src/solution.cpp | 225 + src/pickDeliver/src/solution.h | 125 + src/pickDeliver/src/tw_node.cpp | 279 + src/pickDeliver/src/tw_node.h | 299 + src/pickDeliver/src/vehicle.cpp | 516 + src/pickDeliver/src/vehicle.h | 325 + src/pickDeliver/src/vehicle_node.cpp | 154 + src/pickDeliver/src/vehicle_node.h | 183 + src/pickDeliver/src/vehicle_pickDeliver.cpp | 352 + src/pickDeliver/src/vehicle_pickDeliver.h | 155 + src/pickDeliver/test/CMakeLists.txt | 0 .../test/bencharkTest/README.vrpdptw-testdata | 33 + src/pickDeliver/test/bencharkTest/lc101_test.sql | 9 + .../test/bencharkTest/vrpdptw-testdata.sql.gz | Bin 0 -> 1996513 bytes src/pickDeliver/test/doc-pickDeliver.result | 233 + src/pickDeliver/test/doc-pickDeliver.test.sql | 8 + src/pickDeliver/test/pdp-any-01.result | 3 - .../test/pgtap/pickDeliver_types_check.sql | 39 + src/pickDeliver/test/pgtap/wrong_data.sql | 130 + .../test/{pdp-any-00.data => pickDeliver.data} | 26 +- src/{allpairs => pickDeliver}/test/test.conf | 18 +- src/proposed.rst | 96 +- src/proposedNext.rst | 67 +- src/routingFunctions.rst | 68 +- src/shooting_star/CMakeLists.txt | 5 - src/shooting_star/doc/CMakeLists.txt | 0 src/shooting_star/doc/index.rst | 155 - src/shooting_star/sql/CMakeLists.txt | 8 - src/shooting_star/sql/shooting_star.sql | 51 - src/shooting_star/src/CMakeLists.txt | 13 - src/shooting_star/src/edge_visitors.hpp | 66 - src/shooting_star/src/shooting_star.c | 574 -- src/shooting_star/src/shooting_star.h | 88 - .../src/shooting_star_boost_wrapper.cpp | 456 - src/shooting_star/src/shooting_star_relax.hpp | 197 - src/shooting_star/src/shooting_star_search.hpp | 643 -- src/shooting_star/test/CMakeLists.txt | 0 src/shooting_star/test/spss-any-00.data | 212 - src/topology/doc/doc-pgr_analyzeGraph.queries | 2 + src/topology/doc/doc-pgr_createTopology.queries | 2 + src/topology/doc/pgr_analyzeGraph.rst | 10 +- src/topology/doc/pgr_analyzeOneWay.rst | 6 +- src/topology/doc/pgr_createTopology.rst | 11 +- src/topology/doc/pgr_createVerticesTable.rst | 13 +- src/topology/doc/pgr_nodeNetwork.rst | 14 +- src/topology/sql/create_vertices_table.sql | 6 +- src/topology/sql/nodeNetwork.sql | 4 +- src/topology/sql/pgrouting_analytics.sql | 4 +- src/topology/sql/pgrouting_topology.sql | 10 +- src/topology/test/analyzeOneway-any.test.sql | 3 + src/topology/test/createVertTab-any.test.sql | 1 + src/topology/test/doc-pgr_analyzeGraph.test.sql | 1 + src/topology/test/doc-pgr_createTopology.test.sql | 2 + src/topology/test/nodeNetwork-any.result | 2 +- src/topology/test/nodeNetwork-any.test.sql | 2 + src/trsp/CMakeLists.txt | 4 - src/trsp/doc/CMakeLists.txt | 0 src/trsp/doc/pgr_trsp.rst | 13 +- src/trsp/sql/trsp_V2.2.sql | 4 +- src/trsp/src/CMakeLists.txt | 2 +- src/trsp/src/GraphDefinition.cpp | 16 +- src/trsp/src/GraphDefinition.h | 20 +- src/trsp/src/trsp.c | 20 +- src/trsp/src/{trsp_core.cpp => trsp_driver.cpp} | 3 +- src/trsp/src/{trsp.h => trsp_driver.h} | 10 - src/tsp/CMakeLists.txt | 4 - src/tsp/doc/CMakeLists.txt | 0 src/tsp/doc/doc-pgr_TSP.queries | 73 + src/tsp/doc/doc-pgr_eucledianTSP.queries | 94 + src/tsp/doc/doc-tsp.queries | 118 + src/tsp/doc/pgr_eucledianTSP.rst | 148 + src/tsp/doc/{pgr_tsp.rst => pgr_tsp-V2.0.rst} | 27 +- src/tsp/doc/pgr_tsp.rst | 260 +- src/tsp/doc/tsp.rst | 277 + src/tsp/doc/tsp_parameters.txt | 34 + src/tsp/doc/tsp_return_values.txt | 27 + src/tsp/sql/CMakeLists.txt | 11 + src/tsp/sql/TSP.sql | 26 + src/tsp/sql/_makeMatrix.sql | 69 + src/tsp/sql/eucledianTSP.sql | 27 + src/tsp/sql/routing_tsp_wrappers.sql | 4 +- src/tsp/sql/tsp_v2.0_coordinates.sql | 72 + src/tsp/sql/xyd_tsp.sql | 11 - src/tsp/src/CMakeLists.txt | 19 +- src/tsp/src/Dmatrix.cpp | 176 +- src/tsp/src/Dmatrix.h | 125 + src/tsp/src/Dmatrix.hpp | 39 - src/tsp/src/OBSOLETE/tsp.c | 545 -- src/tsp/src/eucledianDmatrix.cpp | 169 + src/tsp/src/eucledianDmatrix.h | 124 + src/tsp/src/{xyd_tsp.c => eucledianTSP.c} | 155 +- src/tsp/src/eucledianTSP_driver.cpp | 207 + .../src/{tsp_driver.h => eucledianTSP_driver.h} | 24 +- src/tsp/src/{xyd_tsp.c => newTSP.c} | 138 +- src/tsp/src/newTSP_driver.cpp | 223 + src/tsp/src/{tsp_driver.h => newTSP_driver.h} | 19 +- src/tsp/src/pgr_tsp.cpp | 720 +- src/tsp/src/pgr_tsp.hpp | 153 +- src/tsp/src/tour.cpp | 100 + src/tsp/src/tour.h | 160 + src/tsp/src/tsp.h | 18 +- src/tsp/src/tsp2.c | 79 +- src/tsp/src/tsp_driver.cpp | 234 - src/tsp/src/tsplib.c | 331 +- src/tsp/test/CMakeLists.txt | 0 src/tsp/test/development/gr9882-tsp.test.sql | 9903 ++++++++++++++++++++ .../test/development/qa194-tsp.result} | 0 src/tsp/test/development/qa194-tsp.test.sql | 272 + src/tsp/test/development/wi29-tsp.result | 226 + src/tsp/test/development/wi29-tsp.test.sql | 75 + src/tsp/test/doc-pgr_TSP-mac.result | 25 + src/tsp/test/doc-pgr_TSP-mac.test.sql | 41 + src/tsp/test/doc-pgr_TSP-windows.result | 25 + src/tsp/test/doc-pgr_TSP-windows.test.sql | 41 + src/tsp/test/doc-pgr_TSP.result | 25 + src/tsp/test/doc-pgr_TSP.test.sql | 41 + src/tsp/test/doc-pgr_eucledianTSP.result | 50 + src/tsp/test/doc-pgr_eucledianTSP.test.sql | 35 + src/tsp/test/doc-tsp-mac.result | 68 + src/tsp/test/doc-tsp-mac.test.sql | 40 + src/tsp/test/doc-tsp-windows.result | 68 + src/tsp/test/doc-tsp-windows.test.sql | 40 + src/tsp/test/doc-tsp.result | 68 + src/tsp/test/doc-tsp.test.sql | 40 + src/tsp/test/performance/dj38.sql | 84 + src/tsp/test/performance/qa194.sql | 239 + src/tsp/test/performance/wi29.sql | 71 + src/tsp/test/pgtap/pgr_TSP_types_check.sql | 213 + .../test/pgtap/pgr_eucledianTSP_types_check.sql | 210 + src/tsp/test/test.conf | 33 +- src/tsp/test/tsp-any-00.data | 32 - src/tsp/test/tsp-any-00.result | 1 - src/tsp/test/tsp-any-00.test.sql | 23 - src/tsp/test/tsp-any-01.result | 1 - src/tsp/test/tsp-any-01.test.sql | 23 - src/tsp/test/tsp-any-03.test.sql | 62 - src/tsp/test/tsp-any-04.result | 11 - src/tsp/test/tsp-any-04.test.sql | 23 - src/tsp/test/tsp-any-05.result | 34 - src/tsp/test/tsp-any-05.test.sql | 39 - src/tsp/test/tsp-any.result | 7 - src/tsp/test/tsp-any.test.sql | 14 - .../test/{tsp-any-03.result => tsp-v2-0.result} | 59 + src/tsp/test/tsp-v2-0.test.sql | 137 + src/tsp/test/tsp.data | 12 - src/vrp_basic/CMakeLists.txt | 6 - src/vrp_basic/doc/pgr_vrpOneDepot.rst | 10 +- src/vrp_basic/src/Orders.txt | 102 - src/vrp_basic/src/Tester.cpp | 432 +- src/vrp_basic/src/Utils.h | 140 +- src/vrp_basic/src/VRP.c | 1242 ++- src/vrp_basic/src/VRP.h | 80 +- src/vrp_basic/src/VRP_Solver.cpp | 1608 ++-- src/vrp_basic/src/VRP_Solver.h | 643 +- src/vrp_basic/src/VRP_core.cpp | 332 +- src/vrp_basic/src/Vehicles.txt | 21 - src/vrppdtw/CMakeLists.txt | 5 - src/vrppdtw/doc/CMakeLists.txt | 0 src/vrppdtw/doc/doc-gsoc_vrppdtw.queries | 76 + src/vrppdtw/doc/index.rst | 84 - src/vrppdtw/doc/pgr_gsoc_vrppdtw.rst | 134 + src/vrppdtw/sql/CMakeLists.txt | 3 +- src/vrppdtw/sql/gsoc_vrppdtw.sql | 19 + src/vrppdtw/sql/routing_vrppdtw.sql | 41 - src/vrppdtw/src/CMakeLists.txt | 6 - src/vrppdtw/src/Route.h | 348 - src/vrppdtw/src/Solution.h | 185 - src/vrppdtw/src/pdp.c | 478 - src/vrppdtw/src/pdp.h | 191 - src/vrppdtw/src/pdp_solver.cpp | 445 - src/vrppdtw/test/CMakeLists.txt | 0 src/vrppdtw/test/doc-gsoc_vrppdtw.result | 56 + src/vrppdtw/test/doc-gsoc_vrppdtw.test.sql | 14 + src/vrppdtw/test/pdp-any-01.result | 146 - src/vrppdtw/test/pdp-any-01.test.sql | 3 - src/vrppdtw/test/pdp-any-02.result | 114 + src/vrppdtw/test/pdp-any-02.test.sql | 3 + src/vrppdtw/test/test.conf | 27 +- src/withPoints/doc/CMakeLists.txt | 0 src/withPoints/doc/pgr_withPoints.rst | 56 +- src/withPoints/doc/pgr_withPointsCost.rst | 54 +- src/withPoints/doc/pgr_withPointsDD.rst | 42 +- src/withPoints/doc/pgr_withPointsKSP.rst | 38 +- src/withPoints/doc/pgr_withPointsVia.rst | 36 +- src/withPoints/doc/withPoints.rst | 43 +- src/withPoints/doc/withPoints_queries.txt | 51 - src/withPoints/src/get_new_queries.cpp | 11 +- src/withPoints/src/get_new_queries.h | 9 +- src/withPoints/src/many_to_many_withPoints.c | 54 +- .../src/many_to_many_withPoints_driver.cpp | 74 +- .../src/many_to_many_withPoints_driver.h | 30 +- src/withPoints/src/many_to_one_withPoints.c | 42 +- .../src/many_to_one_withPoints_driver.cpp | 44 +- src/withPoints/src/many_to_one_withPoints_driver.h | 28 +- src/withPoints/src/msg_logger.hpp | 6 +- src/withPoints/src/one_to_many_withPoints.c | 90 +- .../src/one_to_many_withPoints_driver.cpp | 113 +- src/withPoints/src/one_to_many_withPoints_driver.h | 31 +- src/withPoints/src/one_to_one_withPoints.c | 81 +- .../src/one_to_one_withPoints_driver.cpp | 113 +- src/withPoints/src/one_to_one_withPoints_driver.h | 34 +- src/withPoints/src/pgr_withPoints.cpp | 179 +- src/withPoints/src/pgr_withPoints.hpp | 11 +- src/withPoints/test/doc-pgr_withPoints.test.sql | 1 - src/withPoints/test/test.conf | 2 +- tools/clean/clean.sh | 66 + tools/doxygen/Makefile | 5 - tools/{ => git-tools}/pre-commit | 6 +- tools/licences/GNU_license.txt | 4 +- tools/licences/README.md | 9 + tools/licences/add-licenses | 19 +- tools/scripts/fix_typos.sh | 73 + tools/scripts/typos_whitelist.txt | 39 + tools/sigs/pgrouting--2.0.0.sig | 1 + tools/sigs/pgrouting--2.0.1.sig | 1 + tools/sigs/pgrouting--2.2.4.sig | 109 + tools/template/create.sh | 31 +- tools/template/src/function1.c | 65 +- tools/template/src/function1_driver.cpp | 110 +- tools/template/src/function1_driver.h | 22 +- tools/template/test/pgtap/types-check.sql | 79 +- tools/testers/algorithm-tester.pl | 245 +- tools/testers/contraction_data.sql | 61 + tools/testers/pg_prove_tests.sh | 26 +- .../testers/pickDeliver_pgtap_data.sql | 27 +- tools/testers/sampledata.sql | 109 +- .../{setup_db.sql => setup_contraction_db.sql} | 2 +- tools/testers/setup_db.sql | 1 + tools/testers/update-tester.sh | 113 + tools/travis/install-postgres9.5.sh | 19 - ...stall-postgres9.5.sh => install-postgres9.6.sh} | 25 +- tools/travis/pgrouting_build.sh | 5 +- tools/travis/pgrouting_test.sh | 2 +- tools/windows/makepgroutingw32.sh | 2 +- tools/windows/makepgroutingw64.sh | 2 +- tools/windows/msbuild_pgrouting.bat | 210 + tools/winnie/build_pgrouting.sh | 207 +- 715 files changed, 55153 insertions(+), 20675 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
