adding missing files

CMakeLists.txt

@@ -76,6 +76,8 @@ set(PgRouting_SOURCE_NAMES
     "ksp"
     "allpairs"
     "withPoints"
+
+    "funnyDijkstra"
 
     "astar" "bd_astar"
     "bd_dijkstra" 

VERSION

@@ -1 +1 @@
-pgrouting-2.1.0-rc3-577-gb5c2b88 cmake-improve-2.2
+pgrouting-2.1.0-rc3-578-g8665914 cmake-improve-2.2

src/apsp_warshall/doc/doc-apspWarshall.queries

@@ -5,14 +5,7 @@ SELECT seq, id1 AS FROM, id2 AS to, cost
         false, false
     );
 NOTICE:  Deprecated function: Use pgr_floydWarshall instead
- seq | from | to | cost 
------+------+----+------
-   0 |    1 |  2 |    1
-   1 |    1 |  5 |    2
-   2 |    2 |  1 |    1
-   3 |    2 |  5 |    1
-   4 |    5 |  1 |    2
-   5 |    5 |  2 |    1
-(6 rows)
-
+ERROR:  Could not execute query please verify syntax of: 
+HINT:  SELECT id, source, target, cost FROM edge_table WHERE id < 5 ORDER BY id
+CONTEXT:  PL/pgSQL function pgr_apspwarshall(text,boolean,boolean) line 7 at assignment
 --q2

src/dijkstra/doc/dijkstra.rst

@@ -7,7 +7,7 @@
     Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
    ****************************************************************************
 
-.. _pgr_dijkstra:
+.. _dijkstra:
 
 pgr_dijkstra - Shortest Path Dijkstra
 ===============================================================================

src/dijkstra/doc/dijkstra_v2.rst

@@ -36,7 +36,7 @@ Dijkstra's algorithm, conceived by Dutch computer scientist Edsger Dijkstra in 1
 
              ``pgr_dijkstra(sql, source, target, directed)``
 
-             See :ref:`pgr_dijkstra_v3`
+             See :ref:`pgr_dijkstra`
 
 Description
 -------------------------------------------------------------------------------

src/dijkstra/doc/pgr_dijkstra.rst

@@ -7,7 +7,7 @@
     Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
    ****************************************************************************
 
-.. _pgr_dijkstra_v3:
+.. _pgr_dijkstra:
 
 pgr_dijkstra
 ===============================================================================
@@ -45,14 +45,13 @@ The main Characteristics are:
 
       - The `agg_cost` the non included values `(u, v)` is :math:`\infty`
 
-  - For optimization purposes, any duplicated value in the `start_vids` or `end_vids` is ignored.
+  - For optimization purposes, any duplicated value in the `start_vids` or `end_vids` are ignored.
 
   - The returned values are ordered:
 
     - `start_vid` ascending
     - `end_vid` ascending
 
-
   - Runing time: :math:`O(| start\_vids | * (V \log V + E))`
 
 

src/driving_distance/doc/pgr_withPoints_dd.rst

@@ -21,9 +21,6 @@ Name
 .. note::  This is a proposed function for version 2.3.
 
      - Is not officially in the version 2.2 release.
-     - Name could change.
-     - Signature could change.
-     - Functionality will remain.
 
 
 .. figure:: ../../../doc/src/introduction/images/boost-inside.jpeg

src/kdijkstra/doc/index.rst

@@ -28,7 +28,7 @@ Name
 * ``pgr_kdijkstraPath`` - Returns the paths for K shortest paths using Dijkstra algorithm.
 
 .. warning:: This function is deprecated in 2.2.
-    Use :ref:`pgr_dijkstra_v3` instead.
+    Use :ref:`pgr_dijkstra` instead.
 
 
 Synopsis

src/proposed.rst

@@ -82,9 +82,16 @@ Experimental functions: by GSoC Students
   -  :ref:`pgr_vrp_basic` - VRP One Depot
   -  :ref:`pgr_gsocvrppdtw` -  Pickup and Delivery problem
 
+
+The template
+------------
+
+  - :ref:`pgr_funnyDijkstra`
+
 .. toctree::
     :hidden:
 
     ../src/vrp_basic/doc/index.rst
     ../src/vrppdtw/doc/index.rst
+    ../src/funnyDijkstra/doc/pgr_funnyDijkstra.rst
 

src/routingFunctions.rst

@@ -23,7 +23,7 @@ Routing Functions
   - :ref:`pgr_astar<pgr_astar>` - Shortest Path A*
   - :ref:`pgr_bdAstar<bd_astar>` - Bi-directional A* Shortest Path
   - :ref:`pgr_bdDijkstra<bd_dijkstra>` - Bi-directional Dijkstra Shortest Path
-  - :ref:`pgr_dijkstra<pgr_dijkstra>` - Dijkstra family functions
+  - :ref:`dijkstra<dijkstra>` - Dijkstra family functions
 
     - :ref:`pgr_dijkstra` - Dijkstra's shortest path algorithm.
     - :ref:`pgr_dijkstraCost` - Use pgr_dijkstra to calculate the costs of the shortest paths.

src/topology/doc/doc-createTopology.queries

@@ -33,228 +33,5 @@ NOTICE:  PROCESSING:
 NOTICE:  pgr_createTopology('edge_table', 0.001, 'the_geom', 'id', 'source', 'target', rows_where := 'true', clean := f)
 NOTICE:  Performing checks, please wait .....
 NOTICE:  Creating Topology, Please wait...
-NOTICE:  -------------> TOPOLOGY CREATED FOR  18 edges
-NOTICE:  Rows with NULL geometry or NULL id: 0
-NOTICE:  Vertices table for table public.edge_table is: public.edge_table_vertices_pgr
-NOTICE:  ----------------------------------------------
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
---q2.1
-SET client_min_messages TO NOTICE;
-SET
---q3
-SELECT  pgr_createTopology('edge_table', 0.001,
-        'id', 'the_geom');
-NOTICE:  PROCESSING:
-NOTICE:  pgr_createTopology('edge_table', 0.001, 'id', 'the_geom', 'source', 'target', rows_where := 'true', clean := f)
-NOTICE:  Performing checks, please wait .....
-NOTICE:  ----> PGR ERROR in pgr_createTopology: Wrong type of Column id:the_geom
-NOTICE:  Unexpected error raise_exception
- pgr_createtopology 
---------------------
- FAIL
-(1 row)
-
---q3.1
-SET client_min_messages TO WARNING;
-SET
-DROP TABLE edge_table_vertices_pgr;
-DROP TABLE
-UPDATE edge_table SET source = NULL,  target = NULL;
-UPDATE 18
---q4
-SELECT  pgr_createTopology('edge_table', 0.001,
-        the_geom:='the_geom', id:='id', source:='source', target:='target');
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
---q4.1
-DROP TABLE edge_table_vertices_pgr;
-DROP TABLE
-UPDATE edge_table SET source = NULL,  target = NULL;
-UPDATE 18
---q5
-SELECT  pgr_createTopology('edge_table', 0.001,
-        source:='source', id:='id', target:='target', the_geom:='the_geom');
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
---q5.1
-DROP TABLE edge_table_vertices_pgr;
-DROP TABLE
-UPDATE edge_table SET source = NULL,  target = NULL;
-UPDATE 18
---q6
-SELECT  pgr_createTopology('edge_table', 0.001, source:='source');
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
---q6.1
---q7
-SELECT  pgr_createTopology('edge_table', 0.001, rows_where:='id < 10');
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
---q7.1
---q8
-SELECT  pgr_createTopology('edge_table', 0.001,
-        rows_where:='the_geom && (SELECT st_buffer(the_geom, 0.05) FROM edge_table WHERE id=5)');
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
---q8.1
---q9
-CREATE TABLE otherTable AS  (SELECT 100 AS gid,  st_point(2.5, 2.5) AS other_geom);
-SELECT 1
-SELECT  pgr_createTopology('edge_table', 0.001,
-        rows_where:='the_geom && (SELECT st_buffer(other_geom, 1) FROM otherTable WHERE gid=100)');
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
---q9.1
---q10
-CREATE TABLE mytable AS (SELECT id AS gid,  the_geom AS mygeom, source AS src , target AS tgt FROM edge_table) ;
-SELECT 18
---q10.1
---q11
-SELECT  pgr_createTopology('mytable', 0.001, 'mygeom', 'gid', 'src', 'tgt', clean := TRUE);
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
---q11.1
-DROP TABLE mytable_vertices_pgr;
-DROP TABLE
-UPDATE mytable SET src = NULL,  tgt = NULL;
-UPDATE 18
-SET client_min_messages TO NOTICE;
-SET
---q12
-SELECT  pgr_createTopology('mytable', 0.001, 'gid', 'mygeom', 'src', 'tgt');
-NOTICE:  PROCESSING:
-NOTICE:  pgr_createTopology('mytable', 0.001, 'gid', 'mygeom', 'src', 'tgt', rows_where := 'true', clean := f)
-NOTICE:  Performing checks, please wait .....
-NOTICE:  ----> PGR ERROR in pgr_createTopology: Wrong type of Column id:mygeom
-NOTICE:  Unexpected error raise_exception
- pgr_createtopology 
---------------------
- FAIL
-(1 row)
-
---q12.1
-SET client_min_messages TO WARNING;
-SET
---q13
-SELECT  pgr_createTopology('mytable', 0.001, the_geom:='mygeom', id:='gid', source:='src', target:='tgt');
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
---q13.1
-DROP TABLE mytable_vertices_pgr;
-DROP TABLE
-UPDATE mytable SET src = NULL,  tgt = NULL;
-UPDATE 18
---q14
-SELECT  pgr_createTopology('mytable', 0.001, source:='src', id:='gid', target:='tgt', the_geom:='mygeom');
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
---q14.1
---q15
-SELECT  pgr_createTopology('mytable', 0.001, 'mygeom', 'gid', 'src', 'tgt', rows_where:='gid < 10');
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
-SELECT  pgr_createTopology('mytable', 0.001, source:='src', id:='gid', target:='tgt', the_geom:='mygeom', rows_where:='gid < 10');
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
-SELECT  pgr_createTopology('mytable', 0.001, 'mygeom', 'gid', 'src', 'tgt', 
-        rows_where:='mygeom && (SELECT st_buffer(mygeom, 1) FROM mytable WHERE gid=5)');
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
-SELECT  pgr_createTopology('mytable', 0.001, source:='src', id:='gid', target:='tgt', the_geom:='mygeom', 
-        rows_where:='mygeom && (SELECT st_buffer(mygeom, 1) FROM mytable WHERE gid=5)');
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
---q15.1
---q16
-SELECT  pgr_createTopology('mytable', 0.001, 'mygeom', 'gid', 'src', 'tgt', 
-        rows_where:='mygeom && (SELECT st_buffer(other_geom, 1) FROM otherTable WHERE gid=100)');
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
-SELECT  pgr_createTopology('mytable', 0.001, source:='src', id:='gid', target:='tgt', the_geom:='mygeom', 
-        rows_where:='mygeom && (SELECT st_buffer(other_geom, 1) FROM otherTable WHERE gid=100)');
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
---q16.1
-SET client_min_messages TO NOTICE;
-SET
---q17
-SELECT pgr_createTopology('edge_table',  0.001, rows_where:='id < 6', clean := true);
-NOTICE:  PROCESSING:
-NOTICE:  pgr_createTopology('edge_table', 0.001, 'the_geom', 'id', 'source', 'target', rows_where := 'id < 6', clean := t)
-NOTICE:  Performing checks, please wait .....
-NOTICE:  Creating Topology, Please wait...
-NOTICE:  -------------> TOPOLOGY CREATED FOR  5 edges
-NOTICE:  Rows with NULL geometry or NULL id: 0
-NOTICE:  Vertices table for table public.edge_table is: public.edge_table_vertices_pgr
-NOTICE:  ----------------------------------------------
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
-SELECT pgr_createTopology('edge_table',  0.001);
-NOTICE:  PROCESSING:
-NOTICE:  pgr_createTopology('edge_table', 0.001, 'the_geom', 'id', 'source', 'target', rows_where := 'true', clean := f)
-NOTICE:  Performing checks, please wait .....
-NOTICE:  Creating Topology, Please wait...
-NOTICE:  -------------> TOPOLOGY CREATED FOR  13 edges
-NOTICE:  Rows with NULL geometry or NULL id: 0
-NOTICE:  Vertices table for table public.edge_table is: public.edge_table_vertices_pgr
-NOTICE:  ----------------------------------------------
- pgr_createtopology 
---------------------
- OK
-(1 row)
-
---q17.1
-ROLLBACK;
-ROLLBACK
+Cancel request sent
+ERROR:  canceling statement due to user request