[pgRouting#1153] adding some missing changes

modified: doc/astar/pgr_aStarCostMatrix.rst modified: doc/bdAstar/pgr_bdAstarCostMatrix.rst modified: doc/queries/doc-pgr_fooDmatrix.queries modified: test/costMatrix/doc-pgr_fooDmatrix.result modified: test/costMatrix/doc-pgr_fooDmatrix.test.sql
cvvergara · Dec 31, 2018 · b3b9309 · b3b9309
1 parent 0e29bd3
commit b3b9309
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/doc/astar/pgr_aStarCostMatrix.rst b/doc/astar/pgr_aStarCostMatrix.rst
@@ -121,7 +121,7 @@ Result Columns
 Additional Examples
 -------------------------------------------------------------------------------
 
-:Example: Use with :doc:`pgr_TSP`
+:Example: Use with :doc:`pgr_TSPannealing`
 
 .. literalinclude:: doc-pgr_fooDmatrix.queries
    :start-after: -- astar q3

diff --git a/doc/bdAstar/pgr_bdAstarCostMatrix.rst b/doc/bdAstar/pgr_bdAstarCostMatrix.rst
@@ -123,7 +123,7 @@ Result Columns
 Additional Examples
 -------------------------------------------------------------------------------
 
-:Example: Use with :doc:`pgr_TSP`
+:Example: Use with :doc:`pgr_TSPannealing`
 
 .. literalinclude:: doc-pgr_fooDmatrix.queries
    :start-after: -- astar q3

diff --git a/doc/queries/doc-pgr_fooDmatrix.queries b/doc/queries/doc-pgr_fooDmatrix.queries
@@ -46,7 +46,7 @@ SELECT * FROM pgr_dijkstraCostMatrix(
 (12 rows)
 
 -- dijkstra q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_dijkstraCostMatrix(
         'SELECT id, source, target, cost, reverse_cost FROM edge_table',
@@ -109,7 +109,7 @@ SELECT * FROM pgr_withPointsCostMatrix(
 (12 rows)
 
 -- withPoints q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_withPointsCostMatrix(
         'SELECT id, source, target, cost, reverse_cost FROM edge_table ORDER BY id',
@@ -172,7 +172,7 @@ SELECT * FROM pgr_aStarCostMatrix(
 (12 rows)
 
 -- astar q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_aStarCostMatrix(
         'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
@@ -236,7 +236,7 @@ SELECT * FROM pgr_bdDijkstraCostMatrix(
 (12 rows)
 
 -- bdDijkstra q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_bdDijkstraCostMatrix(
         'SELECT id, source, target, cost, reverse_cost FROM edge_table',
@@ -300,7 +300,7 @@ SELECT * FROM pgr_bdAstarCostMatrix(
 (12 rows)
 
 -- bdAstar q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_bdAstarCostMatrix(
         'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',

diff --git a/test/costMatrix/doc-pgr_fooDmatrix.result b/test/costMatrix/doc-pgr_fooDmatrix.result
@@ -46,7 +46,7 @@ SELECT * FROM pgr_dijkstraCostMatrix(
 (12 rows)
 
 -- dijkstra q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_dijkstraCostMatrix(
         'SELECT id, source, target, cost, reverse_cost FROM edge_table',
@@ -109,7 +109,7 @@ SELECT * FROM pgr_withPointsCostMatrix(
 (12 rows)
 
 -- withPoints q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_withPointsCostMatrix(
         'SELECT id, source, target, cost, reverse_cost FROM edge_table ORDER BY id',
@@ -172,7 +172,7 @@ SELECT * FROM pgr_aStarCostMatrix(
 (12 rows)
 
 -- astar q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_aStarCostMatrix(
         'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
@@ -236,7 +236,7 @@ SELECT * FROM pgr_bdDijkstraCostMatrix(
 (12 rows)
 
 -- bdDijkstra q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_bdDijkstraCostMatrix(
         'SELECT id, source, target, cost, reverse_cost FROM edge_table',
@@ -300,7 +300,7 @@ SELECT * FROM pgr_bdAstarCostMatrix(
 (12 rows)
 
 -- bdAstar q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_bdAstarCostMatrix(
         'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',

diff --git a/test/costMatrix/doc-pgr_fooDmatrix.test.sql b/test/costMatrix/doc-pgr_fooDmatrix.test.sql
@@ -14,7 +14,7 @@ SELECT * FROM pgr_dijkstraCostMatrix(
     false
 );
 \echo -- dijkstra q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_dijkstraCostMatrix(
         'SELECT id, source, target, cost, reverse_cost FROM edge_table',
@@ -40,7 +40,7 @@ SELECT * FROM pgr_withPointsCostMatrix(
     'SELECT pid, edge_id, fraction from pointsOfInterest',
     array[-1, 3, 6, -6], directed := false);
 \echo -- withPoints q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_withPointsCostMatrix(
         'SELECT id, source, target, cost, reverse_cost FROM edge_table ORDER BY id',
@@ -67,7 +67,7 @@ SELECT * FROM pgr_aStarCostMatrix(
     directed := false, heuristic := 2
 );
 \echo -- astar q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_aStarCostMatrix(
         'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
@@ -95,7 +95,7 @@ SELECT * FROM pgr_bdDijkstraCostMatrix(
     false
 );
 \echo -- bdDijkstra q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_bdDijkstraCostMatrix(
         'SELECT id, source, target, cost, reverse_cost FROM edge_table',
@@ -122,7 +122,7 @@ SELECT * FROM pgr_bdAstarCostMatrix(
     false
 );
 \echo -- bdAstar q3
-SELECT * FROM pgr_TSP(
+SELECT * FROM pgr_TSPannealing(
     $$
     SELECT * FROM pgr_bdAstarCostMatrix(
         'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',