[docqueries][tsp] adjusting queries/results

pgRouting · Jul 28, 2021 · 6d39558 · 6d39558
1 parent fa4f568
commit 6d39558
Show file tree

Hide file tree

Showing 22 changed files with 239 additions and 10,792 deletions.
diff --git a/docqueries/bdAstar/doc-pgr_bdAstarCostMatrix.result b/docqueries/bdAstar/doc-pgr_bdAstarCostMatrix.result
@@ -2,6 +2,8 @@ BEGIN;
 BEGIN
 SET client_min_messages TO NOTICE;
 SET
+SET client_min_messages TO WARNING;
+SET
 -- bdAstar q1
 SELECT * FROM pgr_bdAstarCostMatrix(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
@@ -58,11 +60,11 @@ SELECT * FROM pgr_TSP(
 );
  seq | node | cost | agg_cost
 -----+------+------+----------
-   1 |    1 |    1 |        0
+   1 |    1 |    0 |        0
    2 |    2 |    1 |        1
    3 |    3 |    1 |        2
-   4 |    4 |    3 |        3
-   5 |    1 |    0 |        6
+   4 |    4 |    1 |        3
+   5 |    1 |    3 |        6
 (5 rows)
 
 -- bdAstar q4

diff --git a/docqueries/bdAstar/doc-pgr_bdAstarCostMatrix.test.sql b/docqueries/bdAstar/doc-pgr_bdAstarCostMatrix.test.sql
@@ -1,3 +1,4 @@
+SET client_min_messages TO WARNING;
 ------------------------
 -- bdAstarCostMatrix
 ------------------------

diff --git a/docqueries/bdDijkstra/doc-pgr_bdDijkstraCostMatrix.result b/docqueries/bdDijkstra/doc-pgr_bdDijkstraCostMatrix.result
@@ -2,6 +2,8 @@ BEGIN;
 BEGIN
 SET client_min_messages TO NOTICE;
 SET
+SET client_min_messages TO WARNING;
+SET
 -- bdDijkstra q1
 SELECT * FROM pgr_bdDijkstraCostMatrix(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table',
@@ -58,11 +60,11 @@ SELECT * FROM pgr_TSP(
 );
  seq | node | cost | agg_cost
 -----+------+------+----------
-   1 |    1 |    1 |        0
+   1 |    1 |    0 |        0
    2 |    2 |    1 |        1
    3 |    3 |    1 |        2
-   4 |    4 |    3 |        3
-   5 |    1 |    0 |        6
+   4 |    4 |    1 |        3
+   5 |    1 |    3 |        6
 (5 rows)
 
 -- bdDijkstra q4

diff --git a/docqueries/bdDijkstra/doc-pgr_bdDijkstraCostMatrix.test.sql b/docqueries/bdDijkstra/doc-pgr_bdDijkstraCostMatrix.test.sql
@@ -1,3 +1,4 @@
+SET client_min_messages TO WARNING;
 ------------------------
 -- bddijkstraCostMatrix
 ------------------------

diff --git a/docqueries/dijkstra/doc-pgr_dijkstraCostMatrix.result b/docqueries/dijkstra/doc-pgr_dijkstraCostMatrix.result
@@ -2,6 +2,8 @@ BEGIN;
 BEGIN
 SET client_min_messages TO NOTICE;
 SET
+SET client_min_messages TO WARNING;
+SET
 -- dijkstra q1
 SELECT * FROM pgr_dijkstraCostMatrix(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table',
@@ -58,11 +60,11 @@ SELECT * FROM pgr_TSP(
 );
  seq | node | cost | agg_cost
 -----+------+------+----------
-   1 |    1 |    1 |        0
+   1 |    1 |    0 |        0
    2 |    2 |    1 |        1
    3 |    3 |    1 |        2
-   4 |    4 |    3 |        3
-   5 |    1 |    0 |        6
+   4 |    4 |    1 |        3
+   5 |    1 |    3 |        6
 (5 rows)
 
 -- dijkstra q4

diff --git a/docqueries/dijkstra/doc-pgr_dijkstraCostMatrix.test.sql b/docqueries/dijkstra/doc-pgr_dijkstraCostMatrix.test.sql
@@ -1,4 +1,4 @@
-
+SET client_min_messages TO WARNING;
 ------------------------
 -- dijkstra
 ------------------------

diff --git a/docqueries/tsp/CMakeLists.txt b/docqueries/tsp/CMakeLists.txt
@@ -4,6 +4,8 @@ SET(LOCAL_FILES
     doc-pgr_TSP
     )
 
+configure_file("wi29.sql" "${PGR_DOCUMENTATION_SOURCE_DIR}/wi29.queries")
+
 foreach (f ${LOCAL_FILES})
     configure_file("${f}.result" "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}.queries")
     list(APPEND LOCAL_DOC_FILES  "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}.queries")