Merge pull request #931 from pgRouting/release/2.5

Release 2.5.0-beta

.tx/config

@@ -162,11 +162,6 @@ file_filter = locale/<lang>/LC_MESSAGES/sampledata.po
 source_file = locale/pot/sampledata.pot
 source_lang = en
 
-[pgrouting.VRP-category]
-file_filter = locale/<lang>/LC_MESSAGES/VRP-category.po
-source_file = locale/pot/VRP-category.pot
-source_lang = en
-
 [pgrouting.pgr_pushRelabel]
 file_filter = locale/<lang>/LC_MESSAGES/pgr_pushRelabel.po
 source_file = locale/pot/pgr_pushRelabel.pot
@@ -232,11 +227,6 @@ file_filter = locale/<lang>/LC_MESSAGES/pgr_version.po
 source_file = locale/pot/pgr_version.pot
 source_lang = en
 
-[pgrouting.pgr_pickDeliver]
-file_filter = locale/<lang>/LC_MESSAGES/pgr_pickDeliver.po
-source_file = locale/pot/pgr_pickDeliver.pot
-source_lang = en
-
 [pgrouting.pgRouting-introduction]
 file_filter = locale/<lang>/LC_MESSAGES/pgRouting-introduction.po
 source_file = locale/pot/pgRouting-introduction.pot
@@ -302,11 +292,6 @@ file_filter = locale/<lang>/LC_MESSAGES/pgr_KSP.po
 source_file = locale/pot/pgr_KSP.pot
 source_lang = en
 
-[pgrouting.pgr_pickDeliverEuclidean]
-file_filter = locale/<lang>/LC_MESSAGES/pgr_pickDeliverEuclidean.po
-source_file = locale/pot/pgr_pickDeliverEuclidean.pot
-source_lang = en
-
 [pgrouting.pgr_analyzeOneWay]
 file_filter = locale/<lang>/LC_MESSAGES/pgr_analyzeOneWay.po
 source_file = locale/pot/pgr_analyzeOneWay.pot
@@ -362,3 +347,38 @@ file_filter = locale/<lang>/LC_MESSAGES/KSP-category.po
 source_file = locale/pot/KSP-category.pot
 source_lang = en
 
+[pgrouting.components-family]
+file_filter = locale/<lang>/LC_MESSAGES/components-family.po
+source_file = locale/pot/components-family.pot
+source_lang = en
+
+[pgrouting.pgr_articulationPoints]
+file_filter = locale/<lang>/LC_MESSAGES/pgr_articulationPoints.po
+source_file = locale/pot/pgr_articulationPoints.pot
+source_lang = en
+
+[pgrouting.pgr_biconnectedComponents]
+file_filter = locale/<lang>/LC_MESSAGES/pgr_biconnectedComponents.po
+source_file = locale/pot/pgr_biconnectedComponents.pot
+source_lang = en
+
+[pgrouting.pgr_bridges]
+file_filter = locale/<lang>/LC_MESSAGES/pgr_bridges.po
+source_file = locale/pot/pgr_bridges.pot
+source_lang = en
+
+[pgrouting.pgr_connectedComponents]
+file_filter = locale/<lang>/LC_MESSAGES/pgr_connectedComponents.po
+source_file = locale/pot/pgr_connectedComponents.pot
+source_lang = en
+
+[pgrouting.pgr_lineGraph]
+file_filter = locale/<lang>/LC_MESSAGES/pgr_lineGraph.po
+source_file = locale/pot/pgr_lineGraph.pot
+source_lang = en
+
+[pgrouting.pgr_strongComponents]
+file_filter = locale/<lang>/LC_MESSAGES/pgr_strongComponents.po
+source_file = locale/pot/pgr_strongComponents.pot
+source_lang = en
+

CMakeLists.txt

@@ -183,7 +183,7 @@ endif()
 set(PGROUTING_VERSION_MAJOR "2")
 set(PGROUTING_VERSION_MINOR "5")
 set(PGROUTING_VERSION_PATCH "0")
-set(PGROUTING_VERSION_DEV "-alpha")
+set(PGROUTING_VERSION_DEV "-beta")
 
 set(PGROUTING_SHORT_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
 set(PGROUTING_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}.${PGROUTING_VERSION_PATCH}")

README.md

@@ -6,8 +6,8 @@
 
 ### Branches
 
-* The *master* branch has the pre-release  2.5.0-alpha
-* The *develop* branch has the next pre-release. 2.5.0-beta
+* The *master* branch has the pre-release  2.5.0-beta
+* The *develop* branch has the next pre-release. 2.5.0-rc
 
 For the complete list of releases go to:
 https://github.com/pgRouting/pgrouting/releases

doc/CMakeLists.txt

@@ -40,6 +40,10 @@ option(EPUB
 option(DUMMY
     "Set ON|OFF (default=OFF) for debugging purposes" OFF)
 
+if (LOCALE) 
+    set(WITH_DOC ON)
+endif()
+
 if (NOT WITH_DOC)
     return()
 endif()
@@ -53,9 +57,6 @@ foreach(opt BUILD_HTML BUILD_LATEX BUILD_MAN SINGLEHTML EPUB DUMMY)
     endif()
 endforeach()
 
-if (LOCALE) 
-    set(WITH_DOC ON)
-endif()
 
 
 message(STATUS "PgRouting_DOC_TARGETS = ${PgRouting_DOC_TARGETS}")

doc/alpha_shape/pgr_alphaShape.rst

@@ -76,10 +76,10 @@ The first query, has the output ordered, he second query shows an example usage:
 
 Steps:
 
-  - Calculates the alpha shape
+- Calculates the alpha shape
     - the :code:`ORDER BY` clause is not used.
-  - constructs a polygon
-  - and computes the area
+- constructs a polygon
+- and computes the area
 
 .. literalinclude:: doc-pgr_alphashape.queries
    :start-after: -- q2

doc/astar/pgr_aStar.rst

@@ -34,26 +34,26 @@ Characteristics
 
 The main Characteristics are:
 
-  - Process is done only on edges with positive costs.
-  - Vertices of the graph are:
+- Process is done only on edges with positive costs.
+- Vertices of the graph are:
 
-    - **positive** when it belongs to the edges_sql
+  - **positive** when it belongs to the edges_sql
 
-  - Values are returned when there is a path.
+- Values are returned when there is a path.
 
-    - When the starting vertex and ending vertex are the same, there is no path.
+  - When the starting vertex and ending vertex are the same, there is no path.
 
-      - The agg_cost the non included values (v, v) is 0
+    - The agg_cost the non included values (v, v) is 0
 
-    - When the starting vertex and ending vertex are the different and there is no path:
+  - When the starting vertex and ending vertex are the different and there is no path:
 
-      - The agg_cost the non included values (u, v) is ∞
+    - The agg_cost the non included values (u, v) is ∞
 
-  - When (x,y) coordinates for the same vertex identifier differ:
+- When (x,y) coordinates for the same vertex identifier differ:
 
-    - A random selection of the vertex's (x,y) coordinates is used.
+  - A random selection of the vertex's (x,y) coordinates is used.
 
-  - Running time: :math:`O((E + V) * \log V)`
+- Running time: :math:`O((E + V) * \log V)`
 
 
 
@@ -141,8 +141,8 @@ This signature finds the shortest path from one ``start_vid`` to each ``end_vid`
 Using this signature, will load once the graph and perform a one to one `pgr_astar`
 where the starting vertex is fixed, and stop when all ``end_vids`` are reached.
 
-  - The result is equivalent to the union of the results of the one to one `pgr_astar`.
-  - The extra ``end_vid`` in the result is used to distinguish to which path it belongs.
+- The result is equivalent to the union of the results of the one to one `pgr_astar`.
+- The extra ``end_vid`` in the result is used to distinguish to which path it belongs.
 
 :Example:
 
@@ -168,8 +168,8 @@ This signature finds the shortest path from each ``start_vid`` in  ``start_vids`
 Using this signature, will load once the graph and perform several one to one `pgr_aStar`
 where the ending vertex is fixed.
 
-  - The result is the union of the results of the one to one `pgr_aStar`.
-  - The extra ``start_vid`` in the result is used to distinguish to which path it belongs.
+- The result is the union of the results of the one to one `pgr_aStar`.
+- The extra ``start_vid`` in the result is used to distinguish to which path it belongs.
 
 :Example:
 
@@ -197,8 +197,8 @@ This signature finds the shortest path from each ``start_vid`` in  ``start_vids`
 Using this signature, will load once the graph and perform several one to Many `pgr_dijkstra`
 for all ``start_vids``.
 
-  - The result is the union of the results of the one to one `pgr_dijkstra`.
-  - The extra ``start_vid`` in the result is used to distinguish to which path it belongs.
+- The result is the union of the results of the one to one `pgr_dijkstra`.
+- The extra ``start_vid`` in the result is used to distinguish to which path it belongs.
 
 The extra ``start_vid`` and ``end_vid`` in the result is used to distinguish to which path it belongs.
 

doc/astar/pgr_aStarCost.rst

@@ -101,8 +101,8 @@ This signature finds a path from one ``start_vid`` to each ``end_vid`` in ``end_
 Using this signature, will load once the graph and perform a one to one `pgr_astar`
 where the starting vertex is fixed, and stop when all ``end_vids`` are reached.
 
-  - The result is equivalent to the union of the results of the one to one `pgr_astar`.
-  - The extra ``end_vid`` column in the result is used to distinguish to which path it belongs.
+- The result is equivalent to the union of the results of the one to one `pgr_astar`.
+- The extra ``end_vid`` column in the result is used to distinguish to which path it belongs.
 
 :Example:
 
@@ -128,8 +128,8 @@ This signature finds the shortest path from each ``start_vid`` in  ``start_vids`
 Using this signature, will load once the graph and perform several one to one `pgr_aStar`
 where the ending vertex is fixed.
 
-  - The result is the union of the results of the one to one `pgr_aStar`.
-  - The extra ``start_vid`` column  in the result is used to distinguish to which path it belongs.
+- The result is the union of the results of the one to one `pgr_aStar`.
+- The extra ``start_vid`` column  in the result is used to distinguish to which path it belongs.
 
 :Example:
 
@@ -157,8 +157,8 @@ This signature finds the shortest path from each ``start_vid`` in  ``start_vids`
 Using this signature, will load once the graph and perform several one to Many `pgr_dijkstra`
 for all ``start_vids``.
 
-  - The result is the union of the results of the one to one `pgr_dijkstra`.
-  - The extra ``start_vid`` in the result is used to distinguish to which path it belongs.
+- The result is the union of the results of the one to one `pgr_dijkstra`.
+- The extra ``start_vid`` in the result is used to distinguish to which path it belongs.
 
 The extra ``start_vid`` and ``end_vid`` in the result is used to distinguish to which path it belongs.
 

doc/bdAstar/pgr_bdAstar.rst

@@ -53,8 +53,8 @@ Signature Summary
 
 Using these signatures, will load once the graph and perform several one to one `pgr_bdAstar`
 
-  - The result is the union of the results of the one to one `pgr_bdAStar`.
-  - The extra ``start_vid`` and/or ``end_vid`` in the result is used to distinguish to which path it belongs.
+- The result is the union of the results of the one to one `pgr_bdAStar`.
+- The extra ``start_vid`` and/or ``end_vid`` in the result is used to distinguish to which path it belongs.
 
 
 .. rubric:: Avaliability

doc/bdAstar/pgr_bdAstarCost.rst

@@ -45,8 +45,8 @@ Signature Summary
 
 Using these signatures, will load once the graph and perform several one to one `pgr_bdAstarCost`
 
-  - The result is the union of the results of the one to one `pgr_bdAstarCost`.
-  - The extra ``start_vid`` and/or ``end_vid`` in the result is used to distinguish to which path it belongs.
+- The result is the union of the results of the one to one `pgr_bdAstarCost`.
+- The extra ``start_vid`` and/or ``end_vid`` in the result is used to distinguish to which path it belongs.
 
 
 

doc/label_graph/pgr_labelGraph.rst

@@ -31,9 +31,9 @@ Must be run after ``pgr_createTopology()``. No use of ``geometry`` column. Only
 
 The function returns:
 
-  - ``OK`` when a column with provided name has been generated and populated successfully. All connected edges will have unique similar integer values. In case of ``rows_where`` condition, non participating rows will have -1 integer values.
-  - ``FAIL`` when the processing cannot be finished due to some error. Notice will be thrown accordingly.
-  - ``rows_where condition generated 0 rows`` when passed SQL condition has not been fulfilled by any row.
+- ``OK`` when a column with provided name has been generated and populated successfully. All connected edges will have unique similar integer values. In case of ``rows_where`` condition, non participating rows will have -1 integer values.
+- ``FAIL`` when the processing cannot be finished due to some error. Notice will be thrown accordingly.
+- ``rows_where condition generated 0 rows`` when passed SQL condition has not been fulfilled by any row.
 
 .. index::
 	single: labelGraph(Complete Signature) - Proposed

doc/lineGraph/pgr_lineGraph.rst

@@ -30,10 +30,8 @@ Synopsis
 
 Given a graph G, its line graph L(G) is a graph such that:-
 
-   - each vertex of L(G) represents an edge of G
-
-   - two vertices of L(G) are adjacent if and only if their corresponding edges
-     share a common endpoint in G.
+- each vertex of L(G) represents an edge of G
+- two vertices of L(G) are adjacent if and only if their corresponding edges share a common endpoint in G.
 
 The following figures show a graph (left, with blue vertices) and its
 Line Graph (right, with green vertices).
@@ -49,7 +47,6 @@ Signature Summary
 .. code-block:: none
 
     pgr_lineGraph(edges_sql, directed)
-
     RETURNS SET OF (seq, source, target, cost, reverse_cost)
         OR EMPTY SET
 
@@ -146,6 +143,12 @@ Column                       Type                Description
                                                  * When `negative`: edge (`target`, `source`) does not exist, therefore it’s not part of the graph.
 ============================ =================   ===================================================================
 
+Examples
+-------------------------------------------------------------------------------
+
+.. literalinclude:: doc-pgr_lineGraph.queries
+   :start-after: -- q3
+   :end-before: -- q4
 
 See Also
 -------------------------------------------------------------------------------

doc/queries/doc-pgr_lineGraph.queries

@@ -8,48 +8,35 @@ SELECT * FROM pgr_lineGraph(
 );
  seq | source | target | cost | reverse_cost 
 -----+--------+--------+------+--------------
-   1 |    -15 |    -16 |    1 |           -1
-   2 |      9 |    -16 |    1 |           -1
-   3 |     13 |    -15 |    1 |           -1
-   4 |    -14 |    -10 |    1 |           -1
-   5 |    -15 |     -9 |    1 |           -1
-   6 |     16 |     -9 |    1 |           -1
-   7 |     -9 |     -8 |    1 |           -1
-   8 |      5 |     -8 |    1 |           -1
-   9 |    -10 |     -7 |    1 |           -1
-  10 |     -8 |     -7 |    1 |           -1
-  11 |      4 |     -7 |    1 |           -1
-  12 |     -7 |     -6 |    1 |           -1
-  13 |    -10 |     -4 |    1 |           -1
-  14 |     -8 |     -4 |    1 |           -1
-  15 |      7 |     -4 |    1 |           -1
-  16 |    -16 |     -3 |    1 |           -1
-  17 |     -3 |     -2 |    1 |           -1
-  18 |     -4 |     -1 |    1 |           -1
-  19 |     -2 |     -1 |    1 |           -1
-  20 |     -2 |      4 |    1 |           -1
-  21 |      1 |      4 |    1 |           -1
-  22 |     -3 |      5 |    1 |           -1
-  23 |      6 |      7 |    1 |           -1
-  24 |    -10 |      8 |    1 |           -1
-  25 |      4 |      8 |    1 |           -1
-  26 |      7 |      8 |    1 |           -1
-  27 |      5 |      9 |    1 |           -1
-  28 |      8 |      9 |    1 |           -1
-  29 |     -8 |     10 |    1 |           -1
-  30 |      4 |     10 |    1 |           -1
-  31 |      7 |     10 |    1 |           -1
-  32 |     -9 |     11 |    1 |           -1
-  33 |      5 |     11 |    1 |           -1
-  34 |      8 |     11 |    1 |           -1
-  35 |    -14 |     12 |    1 |           -1
-  36 |     10 |     12 |    1 |           -1
-  37 |     11 |     13 |    1 |           -1
-  38 |     12 |     13 |    1 |           -1
-  39 |     10 |     14 |    1 |           -1
-  40 |      9 |     15 |    1 |           -1
-  41 |     16 |     15 |    1 |           -1
-(41 rows)
+   1 |    -16 |     -3 |    1 |           -1
+   2 |    -15 |     -9 |    1 |            1
+   3 |    -14 |    -10 |    1 |            1
+   4 |    -14 |     12 |    1 |           -1
+   5 |    -10 |     -7 |    1 |            1
+   6 |    -10 |     -4 |    1 |            1
+   7 |    -10 |      8 |    1 |            1
+   8 |     -9 |     -8 |    1 |            1
+   9 |     -9 |     11 |    1 |           -1
+  10 |     -8 |     -7 |    1 |            1
+  11 |     -8 |     -4 |    1 |            1
+  12 |     -7 |     -6 |    1 |            1
+  13 |     -4 |     -1 |    1 |            1
+  14 |     -3 |     -2 |    1 |           -1
+  15 |     -3 |      5 |    1 |           -1
+  16 |     -2 |     -1 |    1 |           -1
+  17 |     -2 |      4 |    1 |           -1
+  18 |      5 |     -8 |    1 |           -1
+  19 |      5 |      9 |    1 |           -1
+  20 |      5 |     11 |    1 |           -1
+  21 |      7 |     -4 |    1 |            1
+  22 |      8 |     11 |    1 |           -1
+  23 |     10 |     12 |    1 |           -1
+  24 |     11 |     13 |    1 |           -1
+  25 |     12 |     13 |    1 |           -1
+  26 |     13 |    -15 |    1 |           -1
+  27 |     16 |     -9 |    1 |            1
+  28 |     16 |     15 |    1 |            1
+(28 rows)
 
 -- q2
 SELECT * FROM pgr_lineGraph(