This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pgrouting.
commit 4e0e941308c47a83e2d29bcdcfaeb01853f6e43f Author: Bas Couwenberg <[email protected]> Date: Tue Apr 19 07:51:54 2016 +0200 Imported Upstream version 2.2.1 --- CMakeLists.txt | 4 +- VERSION | 2 +- doc/conf.py.in | 2 +- doc/src/tutorial/custom_query.rst | 6 +- doc/test/utilities-any.result | 2 +- src/allpairs/src/johnson_driver.cpp | 2 +- src/alpha_shape/src/alpha.c | 7 +- src/alpha_shape/src/alpha_drivedist.cpp | 33 ++++-- src/alpha_shape/test/pgtap/issue-544.sql | 61 +++++++++++ src/common/src/postgres_connection.c | 2 +- src/dijkstra/src/dijkstraVia_driver.cpp | 2 +- .../src/boost_interface_drivedist.cpp | 2 +- src/mainpage.dox | 2 +- src/withPoints/doc/doc-pgr_withPoints.queries | 52 +++++----- src/withPoints/doc/doc-pgr_withPointsCost.queries | 24 ++--- src/withPoints/doc/doc-pgr_withPointsDD.queries | 8 +- src/withPoints/doc/doc-pgr_withPointsKSP.queries | 114 +++++++++------------ .../src/one_to_one_withPoints_driver.cpp | 3 +- src/withPoints/src/pgr_withPoints.cpp | 8 +- src/withPoints/test/doc-pgr_withPoints.result | 52 +++++----- src/withPoints/test/doc-pgr_withPointsCost.result | 24 ++--- src/withPoints/test/doc-pgr_withPointsDD.result | 8 +- src/withPoints/test/doc-pgr_withPointsKSP.result | 108 +++++++++---------- tools/template/src/function1_driver.cpp | 2 +- tools/testers/pg_prove_tests.sh | 1 + 25 files changed, 292 insertions(+), 239 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a80c25c..c59ef40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ SET(POSTGRESQL_BIN "" CACHE STRING "Define optional path to PostgreSQL binaries # PGROUTING version number. set(PGROUTING_VERSION_MAJOR "2") set(PGROUTING_VERSION_MINOR "2") -set(PGROUTING_VERSION_PATCH "0") +set(PGROUTING_VERSION_PATCH "1") set(PGROUTING_VERSION_STRING "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}.${PGROUTING_VERSION_PATCH}") set(PGROUTING_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}") @@ -41,7 +41,7 @@ set(POSTGIS_MINIMUM_VERSION "2.0.0") file(STRINGS "${PGROUTING_SOURCE_DIR}/VERSION" PGROUTING_BUILD_STRING) -set(PGROUTING_GIT_TAG "pgrouting-2.2.0") +set(PGROUTING_GIT_TAG "pgrouting-2.2.1") #string(REGEX REPLACE "^(.+)-([0-9]+)-g([0-9a-f]+) (.*)$" "\\1" PGROUTING_GIT_TAG ${PGROUTING_BUILD_STRING}) string(REGEX REPLACE "^(.+)-([^-]+)-[0-9]+-g([0-9a-f]+) (.*)$" "\\2" PGROUTING_GIT_BUILD ${PGROUTING_BUILD_STRING}) string(REGEX REPLACE "^(.+)-([0-9]+)-g([0-9a-f]+) (.*)$" "\\3" PGROUTING_GIT_HASH ${PGROUTING_BUILD_STRING}) diff --git a/VERSION b/VERSION index 4a204e8..1ad8e5a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -pgrouting-2.2.0-RC1-13-gafc622e master +pgrouting-v2.2.1-12-g91c70b8 master diff --git a/doc/conf.py.in b/doc/conf.py.in index 48e1e5a..32608af 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -115,7 +115,7 @@ html_theme_path = ['@SPHINX_THEME_DIR@'] # The name for this set of Sphinx documents. If None, it defaults to # "<project> v<release> documentation". -html_title = "pgRouting Manual (@PGROUTING_VERSION_STRING@)" +html_title = "pgRouting Manual (@PGROUTING_VERSION@)" # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None diff --git a/doc/src/tutorial/custom_query.rst b/doc/src/tutorial/custom_query.rst index 1a2502e..0887289 100644 --- a/doc/src/tutorial/custom_query.rst +++ b/doc/src/tutorial/custom_query.rst @@ -121,9 +121,9 @@ When the columns required have the default names this can be used (pgr_func is t .. code-block:: sql - pgr_func('edge_table') -- when tolerance is not requiered - pgr_func('edge_table',0.001) -- when tolerance is requiered - -- s_in_rule, s_out_rule, st_in_rules, t_out_rules are requiered + pgr_func('edge_table') -- when tolerance is not required + pgr_func('edge_table',0.001) -- when tolerance is required + -- s_in_rule, s_out_rule, st_in_rules, t_out_rules are required SELECT pgr_analyzeOneway('edge_table', ARRAY['', 'B', 'TF'], ARRAY['', 'B', 'FT'], ARRAY['', 'B', 'FT'], ARRAY['', 'B', 'TF']) diff --git a/doc/test/utilities-any.result b/doc/test/utilities-any.result index ccbccc3..c043eea 100644 --- a/doc/test/utilities-any.result +++ b/doc/test/utilities-any.result @@ -1 +1 @@ -2.2.0 +2.2.1 diff --git a/src/allpairs/src/johnson_driver.cpp b/src/allpairs/src/johnson_driver.cpp index 5581ec5..7425f12 100644 --- a/src/allpairs/src/johnson_driver.cpp +++ b/src/allpairs/src/johnson_driver.cpp @@ -57,7 +57,7 @@ do_pgr_johnson( std::ostringstream log; try { if (total_tuples == 1) { - log << "Requiered: more than one tuple\n"; + log << "Required: more than one tuple\n"; (*return_tuples) = NULL; (*return_count) = 0; *err_msg = strdup(log.str().c_str()); diff --git a/src/alpha_shape/src/alpha.c b/src/alpha_shape/src/alpha.c index 6854b83..733a9d1 100644 --- a/src/alpha_shape/src/alpha.c +++ b/src/alpha_shape/src/alpha.c @@ -250,8 +250,9 @@ static int compute_alpha_shape(char* sql, float8 alpha, vertex_t **res, size_t * // TODO: report this as a bug to the pgrouting project // the CGAL alpha-shape function crashes if called with less than three points!!! - if (total_tuples == 0) { - elog(ERROR, "Distance is too short. no vertex for alpha shape calculation. alpha shape calculation needs at least 3 vertices."); + if (total_tuples < 3) { + elog(ERROR, "Less than 3 vertices. Alpha shape calculation needs at least 3 vertices."); + return finish(SPIcode, ret); } if (total_tuples == 1) { elog(ERROR, "Distance is too short. only 1 vertex for alpha shape calculation. alpha shape calculation needs at least 3 vertices."); @@ -278,7 +279,7 @@ static int compute_alpha_shape(char* sql, float8 alpha, vertex_t **res, size_t * if (ret < 0) { //elog(ERROR, "Error computing shape: %s", err_msg); - ereport(ERROR, (errcode(ERRCODE_E_R_E_CONTAINING_SQL_NOT_PERMITTED), errmsg("Error computing shape: %s", err_msg))); + ereport(ERROR, (errcode(ERRCODE_E_R_E_CONTAINING_SQL_NOT_PERMITTED), errmsg("%s", err_msg))); } return finish(SPIcode, ret); diff --git a/src/alpha_shape/src/alpha_drivedist.cpp b/src/alpha_shape/src/alpha_drivedist.cpp index 2d02381..58046d5 100644 --- a/src/alpha_shape/src/alpha_drivedist.cpp +++ b/src/alpha_shape/src/alpha_drivedist.cpp @@ -190,16 +190,32 @@ alpha_edges( const Alpha_shape_2& A, int alpha_shape(vertex_t *vertices, size_t count, double alpha, vertex_t **res, size_t *res_count, char **err_msg) { + try { std::list<Point> points; - //std::copy(begin(vertices), end(vertices), std::back_inserter(points)); - - for (std::size_t j = 0; j < count; ++j) { - Point p(vertices[j].x, vertices[j].y); - points.push_back(p); + std::vector<Point> pv; + + for (std::size_t j = 0; j < count; ++j) { + Point p(vertices[j].x, vertices[j].y); + pv.push_back(p); + } + + std::sort(pv.begin(), pv.end(), + [](const Point &e1, const Point &e2)->bool { + return e2.y() < e1.y(); + }); + std::stable_sort(pv.begin(), pv.end(), + [](const Point &e1, const Point &e2)->bool { + return e2.x() < e1.x(); + }); + pv.erase(std::unique(pv.begin(), pv.end()), pv.end()); + if (pv.size() != count && pv.size() < 3) { + *err_msg = strdup("After eliminating duplicated points, less than 3 points remain!!. Alpha shape calculation needs at least 3 vertices."); + return -1; + } + points.insert(points.begin(), pv.begin(), pv.end()); } - Alpha_shape_2 A(points.begin(), points.end(), coord_type(10000), @@ -277,4 +293,9 @@ int alpha_shape(vertex_t *vertices, size_t count, double alpha, *err_msg = NULL; return EXIT_SUCCESS; + } catch ( ... ) { + *err_msg = strdup("Caught unknown expection!"); + } + return -1; + } diff --git a/src/alpha_shape/test/pgtap/issue-544.sql b/src/alpha_shape/test/pgtap/issue-544.sql new file mode 100644 index 0000000..4691600 --- /dev/null +++ b/src/alpha_shape/test/pgtap/issue-544.sql @@ -0,0 +1,61 @@ +\i setup.sql + +SELECT plan(3); + +--DROP TABLE nodes; +CREATE TABLE nodes ( +id integer, +x float8, +y float8); + +copy nodes(id,x,y) FROM stdin WITH DELIMITER '|'; +156|351885.927|739332.781 +156|351893|739579 +156|352004.408|739375.19 +126|352004.408|739375.19 +125|352473|739498 +126|352473|739498 +150|352543|741610 +161|352893.205|740082.415 +160|352893.205|740082.415 +280|352893.205|740082.415 +146|352984.15|739941.023 +160|352984.15|739941.023 +125|352984.15|739941.023 +150|353370|740397 +151|353370|740397 +146|353370|740397 +151|353400|740376 +154|353400.927|741347.893 +251|353486.777|740517.047 +154|353486.777|740517.047 +151|353486.777|740517.047 +251|353752.373|740768.525 +\. + + +PREPARE q1 AS +SELECT * FROM pgr_alphaShape('select * from nodes where id = 161'); +-- ERROR: Distance is too short. only 1 vertex for alpha shape calculation. alpha shape calculation needs at least 3 vertices. + +PREPARE q2 AS +SELECT * FROM pgr_alphaShape('select * from nodes where id in (160,161)'); +-- ERROR: Error computing shape: After eliminating duplicated points, less than 3 points remain!! + +PREPARE q3 AS +SELECT * FROM pgr_alphaShape('select * from nodes'); + +SELECT throws_ok('q1', + 'XX000', 'Less than 3 vertices. Alpha shape calculation needs at least 3 vertices.', + 'SHOULD THROW, because there is only one point'); + +SELECT throws_ok('q2', + '38001','After eliminating duplicated points, less than 3 points remain!!. Alpha shape calculation needs at least 3 vertices.', + 'SHOULD THROW, because there are less than 3 distinc points'); + +SELECT lives_ok('q3', 'SHOULD LIVE because ater eliminating duplicates there are enough points to work with'); + + +-- Finish the tests and clean up. +SELECT * FROM finish(); +ROLLBACK; diff --git a/src/common/src/postgres_connection.c b/src/common/src/postgres_connection.c index ae457d1..478c604 100644 --- a/src/common/src/postgres_connection.c +++ b/src/common/src/postgres_connection.c @@ -38,7 +38,7 @@ pgr_send_error(int errcode) { elog(ERROR, "Unexpected point(s) with same pid but different edge/fraction/side combination found."); break; case 2: - elog(ERROR, "Internal: Unexpected missmatch count and sequence number on results"); + elog(ERROR, "Internal: Unexpected mismatch count and sequence number on results"); break; default: elog(ERROR, "Unknown exception"); diff --git a/src/dijkstra/src/dijkstraVia_driver.cpp b/src/dijkstra/src/dijkstraVia_driver.cpp index 846f2ab..26b01aa 100644 --- a/src/dijkstra/src/dijkstraVia_driver.cpp +++ b/src/dijkstra/src/dijkstraVia_driver.cpp @@ -183,7 +183,7 @@ do_pgr_dijkstraViaVertex( try { if (total_tuples == 1) { - log << "Requiered: more than one tuple\n"; + log << "Required: more than one tuple\n"; (*return_tuples) = NULL; (*return_count) = 0; *err_msg = strdup(log.str().c_str()); diff --git a/src/driving_distance/src/boost_interface_drivedist.cpp b/src/driving_distance/src/boost_interface_drivedist.cpp index 61cbac1..58b1d76 100644 --- a/src/driving_distance/src/boost_interface_drivedist.cpp +++ b/src/driving_distance/src/boost_interface_drivedist.cpp @@ -140,7 +140,7 @@ do_pgr_driving_distance( log << "Returning number of tuples" << path.size() << "\n"; if (path.empty()) { - log << "NOTICE: it shoud have at least the one for it self"; + log << "NOTICE: it should have at least the one for it self"; *err_msg = strdup(log.str().c_str()); *ret_path = noResult(path_count, (*ret_path)); return; diff --git a/src/mainpage.dox b/src/mainpage.dox index 89f10e5..931f4d2 100644 --- a/src/mainpage.dox +++ b/src/mainpage.dox @@ -56,7 +56,7 @@ Step by Step processing ~~~~{.c} git remote -v ~~~~ - - Now you shoud have something like this: + - Now you should have something like this: ~~~~{.c} origin https://github.com/acountName/pgrouting (fetch) origin https://github.com/acountName/pgrouting (push) diff --git a/src/withPoints/doc/doc-pgr_withPoints.queries b/src/withPoints/doc/doc-pgr_withPoints.queries index 7a7004a..cfc6332 100644 --- a/src/withPoints/doc/doc-pgr_withPoints.queries +++ b/src/withPoints/doc/doc-pgr_withPoints.queries @@ -9,9 +9,9 @@ SELECT * FROM pgr_withPoints( -----+----------+------+------+------+---------- 1 | 1 | -1 | 1 | 0.6 | 0 2 | 2 | 2 | 4 | 1 | 0.6 - 3 | 3 | 5 | 7 | 1 | 1.6 - 4 | 4 | 8 | 6 | 0.7 | 2.6 - 5 | 5 | -3 | -1 | 0 | 3.3 + 3 | 3 | 5 | 10 | 1 | 1.6 + 4 | 4 | 10 | 12 | 0.6 | 2.6 + 5 | 5 | -3 | -1 | 0 | 3.2 (5 rows) --e2 @@ -41,9 +41,9 @@ SELECT * FROM pgr_withPoints( -----+----------+---------+------+------+------+---------- 1 | 1 | -3 | -1 | 1 | 0.6 | 0 2 | 2 | -3 | 2 | 4 | 1 | 0.6 - 3 | 3 | -3 | 5 | 7 | 1 | 1.6 - 4 | 4 | -3 | 8 | 6 | 0.7 | 2.6 - 5 | 5 | -3 | -3 | -1 | 0 | 3.3 + 3 | 3 | -3 | 5 | 10 | 1 | 1.6 + 4 | 4 | -3 | 10 | 12 | 0.6 | 2.6 + 5 | 5 | -3 | -3 | -1 | 0 | 3.2 6 | 1 | 5 | -1 | 1 | 0.6 | 0 7 | 2 | 5 | 2 | 4 | 1 | 0.6 8 | 3 | 5 | 5 | -1 | 0 | 1.6 @@ -58,13 +58,13 @@ SELECT * FROM pgr_withPoints( -----+----------+-----------+------+------+------+---------- 1 | 1 | -1 | -1 | 1 | 0.6 | 0 2 | 2 | -1 | 2 | 4 | 1 | 0.6 - 3 | 3 | -1 | 5 | 7 | 1 | 1.6 - 4 | 4 | -1 | 8 | 6 | 0.7 | 2.6 - 5 | 5 | -1 | -3 | -1 | 0 | 3.3 + 3 | 3 | -1 | 5 | 10 | 1 | 1.6 + 4 | 4 | -1 | 10 | 12 | 0.6 | 2.6 + 5 | 5 | -1 | -3 | -1 | 0 | 3.2 6 | 1 | 2 | 2 | 4 | 1 | 0 - 7 | 2 | 2 | 5 | 7 | 1 | 1 - 8 | 3 | 2 | 8 | 6 | 0.7 | 2 - 9 | 4 | 2 | -3 | -1 | 0 | 2.7 + 7 | 2 | 2 | 5 | 10 | 1 | 1 + 8 | 3 | 2 | 10 | 12 | 0.6 | 2 + 9 | 4 | 2 | -3 | -1 | 0 | 2.6 (9 rows) --e5 @@ -76,18 +76,18 @@ SELECT * FROM pgr_withPoints( -----+----------+-----------+---------+------+------+------+---------- 1 | 1 | -1 | -3 | -1 | 1 | 0.6 | 0 2 | 2 | -1 | -3 | 2 | 4 | 1 | 0.6 - 3 | 3 | -1 | -3 | 5 | 7 | 1 | 1.6 - 4 | 4 | -1 | -3 | 8 | 6 | 0.7 | 2.6 - 5 | 5 | -1 | -3 | -3 | -1 | 0 | 3.3 + 3 | 3 | -1 | -3 | 5 | 10 | 1 | 1.6 + 4 | 4 | -1 | -3 | 10 | 12 | 0.6 | 2.6 + 5 | 5 | -1 | -3 | -3 | -1 | 0 | 3.2 6 | 1 | -1 | 7 | -1 | 1 | 0.6 | 0 7 | 2 | -1 | 7 | 2 | 4 | 1 | 0.6 8 | 3 | -1 | 7 | 5 | 7 | 1 | 1.6 9 | 4 | -1 | 7 | 8 | 6 | 1 | 2.6 10 | 5 | -1 | 7 | 7 | -1 | 0 | 3.6 11 | 1 | 2 | -3 | 2 | 4 | 1 | 0 - 12 | 2 | 2 | -3 | 5 | 7 | 1 | 1 - 13 | 3 | 2 | -3 | 8 | 6 | 0.7 | 2 - 14 | 4 | 2 | -3 | -3 | -1 | 0 | 2.7 + 12 | 2 | 2 | -3 | 5 | 10 | 1 | 1 + 13 | 3 | 2 | -3 | 10 | 12 | 0.6 | 2 + 14 | 4 | 2 | -3 | -3 | -1 | 0 | 2.6 15 | 1 | 2 | 7 | 2 | 4 | 1 | 0 16 | 2 | 2 | 7 | 5 | 7 | 1 | 1 17 | 3 | 2 | 7 | 8 | 6 | 1 | 2 @@ -178,26 +178,26 @@ SELECT * FROM pgr_withPoints( 1 | 1 | -1 | -3 | -1 | 1 | 0.6 | 0 2 | 2 | -1 | -3 | 2 | 4 | 0.7 | 0.6 3 | 3 | -1 | -3 | -6 | 4 | 0.3 | 1.3 - 4 | 4 | -1 | -3 | 5 | 7 | 1 | 1.6 - 5 | 5 | -1 | -3 | 8 | 6 | 0.7 | 2.6 - 6 | 6 | -1 | -3 | -3 | -1 | 0 | 3.3 + 4 | 4 | -1 | -3 | 5 | 10 | 1 | 1.6 + 5 | 5 | -1 | -3 | 10 | 12 | 0.6 | 2.6 + 6 | 6 | -1 | -3 | -3 | -1 | 0 | 3.2 7 | 1 | -1 | 7 | -1 | 1 | 0.6 | 0 8 | 2 | -1 | 7 | 2 | 4 | 0.7 | 0.6 9 | 3 | -1 | 7 | -6 | 4 | 0.3 | 1.3 10 | 4 | -1 | 7 | 5 | 7 | 1 | 1.6 11 | 5 | -1 | 7 | 8 | 6 | 0.7 | 2.6 - 12 | 6 | -1 | 7 | -3 | 6 | 0.3 | 3.3 + 12 | 6 | -1 | 7 | -4 | 6 | 0.3 | 3.3 13 | 7 | -1 | 7 | 7 | -1 | 0 | 3.6 14 | 1 | 2 | -3 | 2 | 4 | 0.7 | 0 15 | 2 | 2 | -3 | -6 | 4 | 0.3 | 0.7 - 16 | 3 | 2 | -3 | 5 | 7 | 1 | 1 - 17 | 4 | 2 | -3 | 8 | 6 | 0.7 | 2 - 18 | 5 | 2 | -3 | -3 | -1 | 0 | 2.7 + 16 | 3 | 2 | -3 | 5 | 10 | 1 | 1 + 17 | 4 | 2 | -3 | 10 | 12 | 0.6 | 2 + 18 | 5 | 2 | -3 | -3 | -1 | 0 | 2.6 19 | 1 | 2 | 7 | 2 | 4 | 0.7 | 0 20 | 2 | 2 | 7 | -6 | 4 | 0.3 | 0.7 21 | 3 | 2 | 7 | 5 | 7 | 1 | 1 22 | 4 | 2 | 7 | 8 | 6 | 0.7 | 2 - 23 | 5 | 2 | 7 | -3 | 6 | 0.3 | 2.7 + 23 | 5 | 2 | 7 | -4 | 6 | 0.3 | 2.7 24 | 6 | 2 | 7 | 7 | -1 | 0 | 3 (24 rows) diff --git a/src/withPoints/doc/doc-pgr_withPointsCost.queries b/src/withPoints/doc/doc-pgr_withPointsCost.queries index bfc9f4e..e911c9b 100644 --- a/src/withPoints/doc/doc-pgr_withPointsCost.queries +++ b/src/withPoints/doc/doc-pgr_withPointsCost.queries @@ -7,7 +7,7 @@ SELECT * FROM pgr_withPointsCost( -1, -3); start_pid | end_pid | agg_cost -----------+---------+---------- - -1 | -3 | 3.3 + -1 | -3 | 3.2 (1 row) --e2 @@ -28,7 +28,7 @@ SELECT * FROM pgr_withPointsCost( -1, ARRAY[-3,5]); start_pid | end_pid | agg_cost -----------+---------+---------- - -1 | -3 | 3.3 + -1 | -3 | 3.2 -1 | 5 | 1.6 (2 rows) @@ -39,8 +39,8 @@ SELECT * FROM pgr_withPointsCost( ARRAY[-1,2], -3); start_pid | end_pid | agg_cost -----------+---------+---------- - -1 | -3 | 3.3 - 2 | -3 | 2.7 + -1 | -3 | 3.2 + 2 | -3 | 2.6 (2 rows) --e5 @@ -50,9 +50,9 @@ SELECT * FROM pgr_withPointsCost( ARRAY[-1,2], ARRAY[-3,7]); start_pid | end_pid | agg_cost -----------+---------+---------- - -1 | -3 | 3.3 + -1 | -3 | 3.2 -1 | 7 | 3.6 - 2 | -3 | 2.7 + 2 | -3 | 2.6 2 | 7 | 3 (4 rows) @@ -64,9 +64,9 @@ SELECT * FROM pgr_withPointsCost( driving_side := 'l'); start_pid | end_pid | agg_cost -----------+---------+---------- - -1 | -3 | 3.3 + -1 | -3 | 3.2 -1 | 7 | 3.6 - 2 | -3 | 2.7 + 2 | -3 | 2.6 2 | 7 | 3 (4 rows) @@ -78,9 +78,9 @@ SELECT * FROM pgr_withPointsCost( driving_side := 'r'); start_pid | end_pid | agg_cost -----------+---------+---------- - -1 | -3 | 4.7 + -1 | -3 | 4 -1 | 7 | 4.4 - 2 | -3 | 3.3 + 2 | -3 | 2.6 2 | 7 | 3 (4 rows) @@ -92,9 +92,9 @@ SELECT * FROM pgr_withPointsCost( driving_side := 'b'); start_pid | end_pid | agg_cost -----------+---------+---------- - -1 | -3 | 3.3 + -1 | -3 | 3.2 -1 | 7 | 3.6 - 2 | -3 | 2.7 + 2 | -3 | 2.6 2 | 7 | 3 (4 rows) diff --git a/src/withPoints/doc/doc-pgr_withPointsDD.queries b/src/withPoints/doc/doc-pgr_withPointsDD.queries index 266a9b4..c9b4fa5 100644 --- a/src/withPoints/doc/doc-pgr_withPointsDD.queries +++ b/src/withPoints/doc/doc-pgr_withPointsDD.queries @@ -56,8 +56,8 @@ SELECT * FROM pgr_withPointsDD( 6 | 6 | 8 | 1 | 2.6 7 | 8 | 7 | 1 | 2.6 8 | 10 | 10 | 1 | 2.6 - 9 | -5 | 12 | 0.6 | 3.2 - 10 | -3 | 6 | 0.7 | 3.3 + 9 | -3 | 12 | 0.6 | 3.2 + 10 | -4 | 6 | 0.7 | 3.3 11 | 7 | 6 | 0.3 | 3.6 12 | 9 | 9 | 1 | 3.6 13 | 11 | 11 | 1 | 3.6 @@ -81,8 +81,8 @@ SELECT * FROM pgr_withPointsDD( 6 | 6 | 8 | 1 | 2.6 7 | 8 | 7 | 1 | 2.6 8 | 10 | 10 | 1 | 2.6 - 9 | -5 | 12 | 0.6 | 3.2 - 10 | -3 | 6 | 0.7 | 3.3 + 9 | -3 | 12 | 0.6 | 3.2 + 10 | -4 | 6 | 0.7 | 3.3 11 | 7 | 6 | 0.3 | 3.6 12 | 9 | 9 | 1 | 3.6 13 | 11 | 11 | 1 | 3.6 diff --git a/src/withPoints/doc/doc-pgr_withPointsKSP.queries b/src/withPoints/doc/doc-pgr_withPointsKSP.queries index ae6f150..2e1a849 100644 --- a/src/withPoints/doc/doc-pgr_withPointsKSP.queries +++ b/src/withPoints/doc/doc-pgr_withPointsKSP.queries @@ -11,21 +11,16 @@ SELECT * FROM pgr_withPointsKSP( 2 | 1 | 2 | 2 | 4 | 1 | 0.6 3 | 1 | 3 | 5 | 8 | 1 | 1.6 4 | 1 | 4 | 6 | 9 | 1 | 2.6 - 5 | 1 | 5 | 9 | 16 | 1 | 3.6 - 6 | 1 | 6 | 4 | 3 | 1 | 4.6 - 7 | 1 | 7 | 3 | 5 | 0.8 | 5.6 - 8 | 1 | 8 | -2 | -1 | 0 | 6.4 - 9 | 2 | 1 | -1 | 1 | 0.6 | 0 - 10 | 2 | 2 | 2 | 4 | 1 | 0.6 - 11 | 2 | 3 | 5 | 8 | 1 | 1.6 - 12 | 2 | 4 | 6 | 11 | 1 | 2.6 - 13 | 2 | 5 | 11 | 13 | 1 | 3.6 - 14 | 2 | 6 | 12 | 15 | 1 | 4.6 - 15 | 2 | 7 | 9 | 16 | 1 | 5.6 - 16 | 2 | 8 | 4 | 3 | 1 | 6.6 - 17 | 2 | 9 | 3 | 5 | 0.8 | 7.6 - 18 | 2 | 10 | -2 | -1 | 0 | 8.4 -(18 rows) + 5 | 1 | 5 | 9 | 15 | 0.4 | 3.6 + 6 | 1 | 6 | -2 | -1 | 0 | 4 + 7 | 2 | 1 | -1 | 1 | 0.6 | 0 + 8 | 2 | 2 | 2 | 4 | 1 | 0.6 + 9 | 2 | 3 | 5 | 8 | 1 | 1.6 + 10 | 2 | 4 | 6 | 11 | 1 | 2.6 + 11 | 2 | 5 | 11 | 13 | 1 | 3.6 + 12 | 2 | 6 | 12 | 15 | 0.6 | 4.6 + 13 | 2 | 7 | -2 | -1 | 0 | 5.2 +(13 rows) --q2 SELECT * FROM pgr_withPointsKSP( @@ -44,10 +39,10 @@ SELECT * FROM pgr_withPointsKSP( 8 | 2 | 3 | -6 | 4 | 0.3 | 1.3 9 | 2 | 4 | 5 | 10 | 1 | 1.6 10 | 2 | 5 | 10 | 12 | 0.6 | 2.6 - 11 | 2 | 6 | -5 | 12 | 0.4 | 3.2 + 11 | 2 | 6 | -3 | 12 | 0.4 | 3.2 12 | 2 | 7 | 11 | 13 | 1 | 3.6 13 | 2 | 8 | 12 | 15 | 0.6 | 4.6 - 14 | 2 | 9 | -4 | 15 | 0.4 | 5.2 + 14 | 2 | 9 | -2 | 15 | 0.4 | 5.2 15 | 2 | 10 | 9 | 9 | 1 | 5.6 16 | 2 | 11 | 6 | -1 | 0 | 6.6 (16 rows) @@ -64,24 +59,19 @@ SELECT * FROM pgr_withPointsKSP( 2 | 1 | 2 | 2 | 4 | 0.7 | 0.6 3 | 1 | 3 | -6 | 4 | 0.3 | 1.3 4 | 1 | 4 | 5 | 8 | 1 | 1.6 - 5 | 1 | 5 | 6 | 9 | 1 | 2.6 - 6 | 1 | 6 | 9 | 16 | 1 | 3.6 - 7 | 1 | 7 | 4 | 3 | 1 | 4.6 - 8 | 1 | 8 | 3 | 5 | 0.8 | 5.6 - 9 | 1 | 9 | -2 | -1 | 0 | 6.4 - 10 | 2 | 1 | -1 | 1 | 0.6 | 0 - 11 | 2 | 2 | 2 | 4 | 0.7 | 0.6 - 12 | 2 | 3 | -6 | 4 | 0.3 | 1.3 - 13 | 2 | 4 | 5 | 8 | 1 | 1.6 - 14 | 2 | 5 | 6 | 11 | 1 | 2.6 - 15 | 2 | 6 | 11 | 13 | 1 | 3.6 - 16 | 2 | 7 | 12 | 15 | 0.6 | 4.6 - 17 | 2 | 8 | -4 | 15 | 0.4 | 5.2 - 18 | 2 | 9 | 9 | 16 | 1 | 5.6 - 19 | 2 | 10 | 4 | 3 | 1 | 6.6 - 20 | 2 | 11 | 3 | 5 | 0.8 | 7.6 - 21 | 2 | 12 | -2 | -1 | 0 | 8.4 -(21 rows) + 5 | 1 | 5 | 6 | 11 | 1 | 2.6 + 6 | 1 | 6 | 11 | 13 | 1 | 3.6 + 7 | 1 | 7 | 12 | 15 | 0.6 | 4.6 + 8 | 1 | 8 | -2 | -1 | 0 | 5.2 + 9 | 2 | 1 | -1 | 1 | 0.6 | 0 + 10 | 2 | 2 | 2 | 4 | 0.7 | 0.6 + 11 | 2 | 3 | -6 | 4 | 0.3 | 1.3 + 12 | 2 | 4 | 5 | 8 | 1 | 1.6 + 13 | 2 | 5 | 6 | 9 | 1 | 2.6 + 14 | 2 | 6 | 9 | 15 | 1 | 3.6 + 15 | 2 | 7 | 12 | 15 | 0.6 | 4.6 + 16 | 2 | 8 | -2 | -1 | 0 | 5.2 +(16 rows) --q4 SELECT * FROM pgr_withPointsKSP( @@ -97,36 +87,30 @@ SELECT * FROM pgr_withPointsKSP( 4 | 1 | 4 | -6 | 4 | 0.3 | 2.1 5 | 1 | 5 | 5 | 8 | 1 | 2.4 6 | 1 | 6 | 6 | 9 | 1 | 3.4 - 7 | 1 | 7 | 9 | 16 | 1 | 4.4 - 8 | 1 | 8 | 4 | 3 | 1 | 5.4 - 9 | 1 | 9 | 3 | 5 | 0.8 | 6.4 - 10 | 1 | 10 | -2 | -1 | 0 | 7.2 - 11 | 2 | 1 | -1 | 1 | 0.4 | 0 - 12 | 2 | 2 | 1 | 1 | 1 | 0.4 - 13 | 2 | 3 | 2 | 4 | 0.7 | 1.4 - 14 | 2 | 4 | -6 | 4 | 0.3 | 2.1 - 15 | 2 | 5 | 5 | 8 | 1 | 2.4 - 16 | 2 | 6 | 6 | 11 | 1 | 3.4 - 17 | 2 | 7 | 11 | 13 | 1 | 4.4 - 18 | 2 | 8 | 12 | 15 | 1 | 5.4 - 19 | 2 | 9 | 9 | 16 | 1 | 6.4 - 20 | 2 | 10 | 4 | 3 | 1 | 7.4 - 21 | 2 | 11 | 3 | 5 | 0.8 | 8.4 - 22 | 2 | 12 | -2 | -1 | 0 | 9.2 - 23 | 3 | 1 | -1 | 1 | 0.4 | 0 - 24 | 3 | 2 | 1 | 1 | 1 | 0.4 - 25 | 3 | 3 | 2 | 4 | 0.7 | 1.4 - 26 | 3 | 4 | -6 | 4 | 0.3 | 2.1 - 27 | 3 | 5 | 5 | 10 | 1 | 2.4 - 28 | 3 | 6 | 10 | 12 | 0.6 | 3.4 - 29 | 3 | 7 | -5 | 12 | 0.4 | 4 - 30 | 3 | 8 | 11 | 13 | 1 | 4.4 - 31 | 3 | 9 | 12 | 15 | 1 | 5.4 - 32 | 3 | 10 | 9 | 16 | 1 | 6.4 - 33 | 3 | 11 | 4 | 3 | 1 | 7.4 - 34 | 3 | 12 | 3 | 5 | 0.8 | 8.4 - 35 | 3 | 13 | -2 | -1 | 0 | 9.2 -(35 rows) + 7 | 1 | 7 | 9 | 15 | 0.4 | 4.4 + 8 | 1 | 8 | -2 | -1 | 0 | 4.8 + 9 | 2 | 1 | -1 | 1 | 0.4 | 0 + 10 | 2 | 2 | 1 | 1 | 1 | 0.4 + 11 | 2 | 3 | 2 | 4 | 0.7 | 1.4 + 12 | 2 | 4 | -6 | 4 | 0.3 | 2.1 + 13 | 2 | 5 | 5 | 8 | 1 | 2.4 + 14 | 2 | 6 | 6 | 11 | 1 | 3.4 + 15 | 2 | 7 | 11 | 13 | 1 | 4.4 + 16 | 2 | 8 | 12 | 15 | 1 | 5.4 + 17 | 2 | 9 | 9 | 15 | 0.4 | 6.4 + 18 | 2 | 10 | -2 | -1 | 0 | 6.8 + 19 | 3 | 1 | -1 | 1 | 0.4 | 0 + 20 | 3 | 2 | 1 | 1 | 1 | 0.4 + 21 | 3 | 3 | 2 | 4 | 0.7 | 1.4 + 22 | 3 | 4 | -6 | 4 | 0.3 | 2.1 + 23 | 3 | 5 | 5 | 10 | 1 | 2.4 + 24 | 3 | 6 | 10 | 12 | 0.6 | 3.4 + 25 | 3 | 7 | -3 | 12 | 0.4 | 4 + 26 | 3 | 8 | 11 | 13 | 1 | 4.4 + 27 | 3 | 9 | 12 | 15 | 1 | 5.4 + 28 | 3 | 10 | 9 | 15 | 0.4 | 6.4 + 29 | 3 | 11 | -2 | -1 | 0 | 6.8 +(29 rows) --q5 ROLLBACK; diff --git a/src/withPoints/src/one_to_one_withPoints_driver.cpp b/src/withPoints/src/one_to_one_withPoints_driver.cpp index 90cc511..9ed018f 100644 --- a/src/withPoints/src/one_to_one_withPoints_driver.cpp +++ b/src/withPoints/src/one_to_one_withPoints_driver.cpp @@ -103,7 +103,8 @@ do_pgr_withPoints( int64_t start_vid(start_pid); int64_t end_vid(end_pid); -#if 0 + +#ifdef DEBUG for (const auto point : points) { if (point.pid == start_pid) { start_vid = point.vertex_id; diff --git a/src/withPoints/src/pgr_withPoints.cpp b/src/withPoints/src/pgr_withPoints.cpp index 9d7f9e5..fb9c2cf 100644 --- a/src/withPoints/src/pgr_withPoints.cpp +++ b/src/withPoints/src/pgr_withPoints.cpp @@ -261,7 +261,7 @@ create_new_edges( } } if (points_on_edge.empty()) { - log << "For some reason we didnt find a point belonging to the edge, must be an error\n"; + log << "For some reason we didn't find a point belonging to the edge, must be an error\n"; return false; } #if 0 @@ -290,7 +290,7 @@ create_new_edges( * vertex_id = -newnumber */ log << "\npid" << point.pid << "\teid" << point.edge_id << "/t" << point.fraction << "\t" << point.side << "\n"; - if (point.fraction < 0 || point.fraction > 1) { + if (point.fraction <= 0 || point.fraction >= 1) { log << "For some reason an invalid fraction was accepted, must be an error\n"; return false; } @@ -303,8 +303,8 @@ create_new_edges( point.vertex_id = edge.target; } if (point.fraction > 0 && point.fraction < 1) { - log << "vertex_id of the point is " << - vertex_id << "\n"; - point.vertex_id = -vertex_id; + log << "vertex_id of the point is " << -point.pid << "\n"; + point.vertex_id = -point.pid; ++vertex_id; } new_points.push_back(point); diff --git a/src/withPoints/test/doc-pgr_withPoints.result b/src/withPoints/test/doc-pgr_withPoints.result index c113090..bf762de 100644 --- a/src/withPoints/test/doc-pgr_withPoints.result +++ b/src/withPoints/test/doc-pgr_withPoints.result @@ -1,9 +1,9 @@ --e1 1|1|-1|1|0.6|0 2|2|2|4|1|0.6 -3|3|5|7|1|1.6 -4|4|8|6|0.7|2.6 -5|5|-3|-1|0|3.3 +3|3|5|10|1|1.6 +4|4|10|12|0.6|2.6 +5|5|-3|-1|0|3.2 --e2 1|1|-1|1|0.6|0 2|2|2|4|0.7|0.6 @@ -16,37 +16,37 @@ --e3 1|1|-3|-1|1|0.6|0 2|2|-3|2|4|1|0.6 -3|3|-3|5|7|1|1.6 -4|4|-3|8|6|0.7|2.6 -5|5|-3|-3|-1|0|3.3 +3|3|-3|5|10|1|1.6 +4|4|-3|10|12|0.6|2.6 +5|5|-3|-3|-1|0|3.2 6|1|5|-1|1|0.6|0 7|2|5|2|4|1|0.6 8|3|5|5|-1|0|1.6 --e4 1|1|-1|-1|1|0.6|0 2|2|-1|2|4|1|0.6 -3|3|-1|5|7|1|1.6 -4|4|-1|8|6|0.7|2.6 -5|5|-1|-3|-1|0|3.3 +3|3|-1|5|10|1|1.6 +4|4|-1|10|12|0.6|2.6 +5|5|-1|-3|-1|0|3.2 6|1|2|2|4|1|0 -7|2|2|5|7|1|1 -8|3|2|8|6|0.7|2 -9|4|2|-3|-1|0|2.7 +7|2|2|5|10|1|1 +8|3|2|10|12|0.6|2 +9|4|2|-3|-1|0|2.6 --e5 1|1|-1|-3|-1|1|0.6|0 2|2|-1|-3|2|4|1|0.6 -3|3|-1|-3|5|7|1|1.6 -4|4|-1|-3|8|6|0.7|2.6 -5|5|-1|-3|-3|-1|0|3.3 +3|3|-1|-3|5|10|1|1.6 +4|4|-1|-3|10|12|0.6|2.6 +5|5|-1|-3|-3|-1|0|3.2 6|1|-1|7|-1|1|0.6|0 7|2|-1|7|2|4|1|0.6 8|3|-1|7|5|7|1|1.6 9|4|-1|7|8|6|1|2.6 10|5|-1|7|7|-1|0|3.6 11|1|2|-3|2|4|1|0 -12|2|2|-3|5|7|1|1 -13|3|2|-3|8|6|0.7|2 -14|4|2|-3|-3|-1|0|2.7 +12|2|2|-3|5|10|1|1 +13|3|2|-3|10|12|0.6|2 +14|4|2|-3|-3|-1|0|2.6 15|1|2|7|2|4|1|0 16|2|2|7|5|7|1|1 17|3|2|7|8|6|1|2 @@ -89,25 +89,25 @@ 1|1|-1|-3|-1|1|0.6|0 2|2|-1|-3|2|4|0.7|0.6 3|3|-1|-3|-6|4|0.3|1.3 -4|4|-1|-3|5|7|1|1.6 -5|5|-1|-3|8|6|0.7|2.6 -6|6|-1|-3|-3|-1|0|3.3 +4|4|-1|-3|5|10|1|1.6 +5|5|-1|-3|10|12|0.6|2.6 +6|6|-1|-3|-3|-1|0|3.2 7|1|-1|7|-1|1|0.6|0 8|2|-1|7|2|4|0.7|0.6 9|3|-1|7|-6|4|0.3|1.3 10|4|-1|7|5|7|1|1.6 11|5|-1|7|8|6|0.7|2.6 -12|6|-1|7|-3|6|0.3|3.3 +12|6|-1|7|-4|6|0.3|3.3 13|7|-1|7|7|-1|0|3.6 14|1|2|-3|2|4|0.7|0 15|2|2|-3|-6|4|0.3|0.7 -16|3|2|-3|5|7|1|1 -17|4|2|-3|8|6|0.7|2 -18|5|2|-3|-3|-1|0|2.7 +16|3|2|-3|5|10|1|1 +17|4|2|-3|10|12|0.6|2 +18|5|2|-3|-3|-1|0|2.6 19|1|2|7|2|4|0.7|0 20|2|2|7|-6|4|0.3|0.7 21|3|2|7|5|7|1|1 22|4|2|7|8|6|0.7|2 -23|5|2|7|-3|6|0.3|2.7 +23|5|2|7|-4|6|0.3|2.7 24|6|2|7|7|-1|0|3 --q5 diff --git a/src/withPoints/test/doc-pgr_withPointsCost.result b/src/withPoints/test/doc-pgr_withPointsCost.result index cb2f816..244d354 100644 --- a/src/withPoints/test/doc-pgr_withPointsCost.result +++ b/src/withPoints/test/doc-pgr_withPointsCost.result @@ -1,31 +1,31 @@ --e1 --1|-3|3.3 +-1|-3|3.2 --e2 -1|3|1.6 --e3 --1|-3|3.3 +-1|-3|3.2 -1|5|1.6 --e4 --1|-3|3.3 -2|-3|2.7 +-1|-3|3.2 +2|-3|2.6 --e5 --1|-3|3.3 +-1|-3|3.2 -1|7|3.6 -2|-3|2.7 +2|-3|2.6 2|7|3 --q2 --1|-3|3.3 +-1|-3|3.2 -1|7|3.6 -2|-3|2.7 +2|-3|2.6 2|7|3 --q3 --1|-3|4.7 +-1|-3|4 -1|7|4.4 -2|-3|3.3 +2|-3|2.6 2|7|3 --q4 --1|-3|3.3 +-1|-3|3.2 -1|7|3.6 -2|-3|2.7 +2|-3|2.6 2|7|3 --q5 diff --git a/src/withPoints/test/doc-pgr_withPointsDD.result b/src/withPoints/test/doc-pgr_withPointsDD.result index 8d0c284..c14b1f5 100644 --- a/src/withPoints/test/doc-pgr_withPointsDD.result +++ b/src/withPoints/test/doc-pgr_withPointsDD.result @@ -28,8 +28,8 @@ 6|6|8|1|2.6 7|8|7|1|2.6 8|10|10|1|2.6 -9|-5|12|0.6|3.2 -10|-3|6|0.7|3.3 +9|-3|12|0.6|3.2 +10|-4|6|0.7|3.3 11|7|6|0.3|3.6 12|9|9|1|3.6 13|11|11|1|3.6 @@ -43,8 +43,8 @@ 6|6|8|1|2.6 7|8|7|1|2.6 8|10|10|1|2.6 -9|-5|12|0.6|3.2 -10|-3|6|0.7|3.3 +9|-3|12|0.6|3.2 +10|-4|6|0.7|3.3 11|7|6|0.3|3.6 12|9|9|1|3.6 13|11|11|1|3.6 diff --git a/src/withPoints/test/doc-pgr_withPointsKSP.result b/src/withPoints/test/doc-pgr_withPointsKSP.result index 5bceb72..0fd3968 100644 --- a/src/withPoints/test/doc-pgr_withPointsKSP.result +++ b/src/withPoints/test/doc-pgr_withPointsKSP.result @@ -3,20 +3,15 @@ 2|1|2|2|4|1|0.6 3|1|3|5|8|1|1.6 4|1|4|6|9|1|2.6 -5|1|5|9|16|1|3.6 -6|1|6|4|3|1|4.6 -7|1|7|3|5|0.8|5.6 -8|1|8|-2|-1|0|6.4 -9|2|1|-1|1|0.6|0 -10|2|2|2|4|1|0.6 -11|2|3|5|8|1|1.6 -12|2|4|6|11|1|2.6 -13|2|5|11|13|1|3.6 -14|2|6|12|15|1|4.6 -15|2|7|9|16|1|5.6 -16|2|8|4|3|1|6.6 -17|2|9|3|5|0.8|7.6 -18|2|10|-2|-1|0|8.4 +5|1|5|9|15|0.4|3.6 +6|1|6|-2|-1|0|4 +7|2|1|-1|1|0.6|0 +8|2|2|2|4|1|0.6 +9|2|3|5|8|1|1.6 +10|2|4|6|11|1|2.6 +11|2|5|11|13|1|3.6 +12|2|6|12|15|0.6|4.6 +13|2|7|-2|-1|0|5.2 --q2 1|1|1|-1|1|0.6|0 2|1|2|2|4|0.7|0.6 @@ -28,10 +23,10 @@ 8|2|3|-6|4|0.3|1.3 9|2|4|5|10|1|1.6 10|2|5|10|12|0.6|2.6 -11|2|6|-5|12|0.4|3.2 +11|2|6|-3|12|0.4|3.2 12|2|7|11|13|1|3.6 13|2|8|12|15|0.6|4.6 -14|2|9|-4|15|0.4|5.2 +14|2|9|-2|15|0.4|5.2 15|2|10|9|9|1|5.6 16|2|11|6|-1|0|6.6 --q3 @@ -39,23 +34,18 @@ 2|1|2|2|4|0.7|0.6 3|1|3|-6|4|0.3|1.3 4|1|4|5|8|1|1.6 -5|1|5|6|9|1|2.6 -6|1|6|9|16|1|3.6 -7|1|7|4|3|1|4.6 -8|1|8|3|5|0.8|5.6 -9|1|9|-2|-1|0|6.4 -10|2|1|-1|1|0.6|0 -11|2|2|2|4|0.7|0.6 -12|2|3|-6|4|0.3|1.3 -13|2|4|5|8|1|1.6 -14|2|5|6|11|1|2.6 -15|2|6|11|13|1|3.6 -16|2|7|12|15|0.6|4.6 -17|2|8|-4|15|0.4|5.2 -18|2|9|9|16|1|5.6 -19|2|10|4|3|1|6.6 -20|2|11|3|5|0.8|7.6 -21|2|12|-2|-1|0|8.4 +5|1|5|6|11|1|2.6 +6|1|6|11|13|1|3.6 +7|1|7|12|15|0.6|4.6 +8|1|8|-2|-1|0|5.2 +9|2|1|-1|1|0.6|0 +10|2|2|2|4|0.7|0.6 +11|2|3|-6|4|0.3|1.3 +12|2|4|5|8|1|1.6 +13|2|5|6|9|1|2.6 +14|2|6|9|15|1|3.6 +15|2|7|12|15|0.6|4.6 +16|2|8|-2|-1|0|5.2 --q4 1|1|1|-1|1|0.4|0 2|1|2|1|1|1|0.4 @@ -63,33 +53,27 @@ 4|1|4|-6|4|0.3|2.1 5|1|5|5|8|1|2.4 6|1|6|6|9|1|3.4 -7|1|7|9|16|1|4.4 -8|1|8|4|3|1|5.4 -9|1|9|3|5|0.8|6.4 -10|1|10|-2|-1|0|7.2 -11|2|1|-1|1|0.4|0 -12|2|2|1|1|1|0.4 -13|2|3|2|4|0.7|1.4 -14|2|4|-6|4|0.3|2.1 -15|2|5|5|8|1|2.4 -16|2|6|6|11|1|3.4 -17|2|7|11|13|1|4.4 -18|2|8|12|15|1|5.4 -19|2|9|9|16|1|6.4 -20|2|10|4|3|1|7.4 -21|2|11|3|5|0.8|8.4 -22|2|12|-2|-1|0|9.2 -23|3|1|-1|1|0.4|0 -24|3|2|1|1|1|0.4 -25|3|3|2|4|0.7|1.4 -26|3|4|-6|4|0.3|2.1 -27|3|5|5|10|1|2.4 -28|3|6|10|12|0.6|3.4 -29|3|7|-5|12|0.4|4 -30|3|8|11|13|1|4.4 -31|3|9|12|15|1|5.4 -32|3|10|9|16|1|6.4 -33|3|11|4|3|1|7.4 -34|3|12|3|5|0.8|8.4 -35|3|13|-2|-1|0|9.2 +7|1|7|9|15|0.4|4.4 +8|1|8|-2|-1|0|4.8 +9|2|1|-1|1|0.4|0 +10|2|2|1|1|1|0.4 +11|2|3|2|4|0.7|1.4 +12|2|4|-6|4|0.3|2.1 +13|2|5|5|8|1|2.4 +14|2|6|6|11|1|3.4 +15|2|7|11|13|1|4.4 +16|2|8|12|15|1|5.4 +17|2|9|9|15|0.4|6.4 +18|2|10|-2|-1|0|6.8 +19|3|1|-1|1|0.4|0 +20|3|2|1|1|1|0.4 +21|3|3|2|4|0.7|1.4 +22|3|4|-6|4|0.3|2.1 +23|3|5|5|10|1|2.4 +24|3|6|10|12|0.6|3.4 +25|3|7|-3|12|0.4|4 +26|3|8|11|13|1|4.4 +27|3|9|12|15|1|5.4 +28|3|10|9|15|0.4|6.4 +29|3|11|-2|-1|0|6.8 --q5 diff --git a/tools/template/src/function1_driver.cpp b/tools/template/src/function1_driver.cpp index 6e65bbe..660cbed 100644 --- a/tools/template/src/function1_driver.cpp +++ b/tools/template/src/function1_driver.cpp @@ -66,7 +66,7 @@ do_pgr_MY_FUNCTION_NAME( try { if (total_tuples == 1) { - log << "Requiered: more than one tuple\n"; + log << "Required: more than one tuple\n"; (*return_tuples) = NULL; (*return_count) = 0; *err_msg = strdup(log.str().c_str()); diff --git a/tools/testers/pg_prove_tests.sh b/tools/testers/pg_prove_tests.sh index af649a3..d6d6bf4 100755 --- a/tools/testers/pg_prove_tests.sh +++ b/tools/testers/pg_prove_tests.sh @@ -30,6 +30,7 @@ run_psql -f setup_db.sql #pg_prove ../../src/funnyDijkstra/test/pgtap/* -d $PGDATABASE pg_prove ../../src/allpairs/test/pgtap/* -d $PGDATABASE -U $PGUSER +pg_prove ../../src/alpha_shape/test/pgtap/* -d $PGDATABASE -U $PGUSER pg_prove ../../src/apsp_johnson/test/pgtap/* -d $PGDATABASE -U $PGUSER pg_prove ../../src/apsp_warshall/test/pgtap/* -d $PGDATABASE -U $PGUSER pg_prove ../../src/ksp/test/pgtap/* -d $PGDATABASE -U $PGUSER -- 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
