(pgr_degree) Moving to metrics family

Author: cvvergara

doc/metrics/CMakeLists.txt

@@ -2,6 +2,7 @@
 SET(LOCAL_FILES
     metrics-family.rst
     pgr_betweennessCentrality.rst
+    pgr_degree.rst
    )
 
 foreach (f ${LOCAL_FILES})

doc/metrics/metrics-family.rst

@@ -15,20 +15,36 @@
 Metrics - Family of functions
 ===============================================================================
 
-.. include:: experimental.rst
-   :start-after: warning-begin
-   :end-before: end-warning
+.. collapse:: Proposed
+
+  .. include:: proposed.rst
+     :start-after: warning-begin
+     :end-before: end-warning
+
+.. proposed-start
+
+- :doc:`pgr_degree` - Returns a set of vertices and corresponding count of
+  incident edges to the vertex.
+
+.. proposed-end
+
+.. collapse:: Experimental
+
+  .. include:: experimental.rst
+     :start-after: warning-begin
+     :end-before: end-warning
 
 .. experimental-start
 
-* :doc:`pgr_betweennessCentrality` - Calculates relative betweenness centrality using Brandes Algorithm
+* :doc:`pgr_betweennessCentrality` - Calculates relative betweenness centrality
+  using Brandes Algorithm
 
 .. experimental-end
 
-
 .. toctree::
     :hidden:
 
+    pgr_degree
     pgr_betweennessCentrality
 
 See Also

doc/topology/pgr_degree.rst renamed to doc/metrics/pgr_degree.rst

@@ -8,7 +8,7 @@
    ****************************************************************************
 
 .. index::
-   single: Topology Family ; pgr_degree - Proposed
+   single: Metrics Family ; pgr_degree - Proposed
    single: degree - Proposed on v3.4
 
 |
@@ -51,7 +51,7 @@ Signatures
    | pgr_degree(`Edges SQL`_ , `Vertex SQL`_, [``dryrun``])
 
    | RETURNS SETOF |result-degree|
-   | OR EMTPY SET
+   | OR EMPTY SET
 
 :Example: Extracting the vertex information
 

doc/topology/CMakeLists.txt

@@ -7,7 +7,6 @@ SET(LOCAL_FILES
     pgr_createVerticesTable.rst
     pgr_extractVertices.rst
     topology-functions.rst
-    pgr_degree.rst
     )
 
 foreach (f ${LOCAL_FILES})

doc/topology/topology-functions.rst

@@ -50,17 +50,6 @@ Additional functions to analyze a graph:
 
 * :doc:`components-family`
 
-
-.. include:: proposed.rst
-   :start-after: warning-begin
-   :end-before: end-warning
-
-.. proposed-start
-
-These proposed functions do not modify the database.
-
-- :doc:`pgr_degree` - Returns a set of vertices and corresponding count of incidet edges to the vertex.
-
 .. proposed-end
 
 .. toctree::
@@ -72,7 +61,6 @@ These proposed functions do not modify the database.
   pgr_analyzeOneWay
   pgr_nodeNetwork
   pgr_extractVertices
-  pgr_degree
 
 See Also
 -------------------------------------------------------------------------------

docqueries/metrics/CMakeLists.txt

@@ -1,6 +1,7 @@
 # Do not use extensions
 SET(LOCAL_FILES
 	betweennessCentrality
+    degree
     )
 
 foreach (f ${LOCAL_FILES})

docqueries/topology/degree.pg renamed to docqueries/metrics/degree.pg

@@ -4,6 +4,7 @@
     'any' => {
         'files' => [qw(
             betweennessCentrality.pg
+            degree.pg
             )]
     },
 

docqueries/topology/degree.result renamed to docqueries/metrics/degree.result

@@ -6,7 +6,6 @@ SET(LOCAL_FILES
     createVerticesTable
     extractVertices
     nodeNetwork
-    degree
     )
 
 foreach (f ${LOCAL_FILES})

docqueries/metrics/test.conf

@@ -11,7 +11,6 @@
             analyzeOneWay.pg
             nodeNetwork.pg
             extractVertices.pg
-            degree.pg
             )],
     },
 );

docqueries/topology/CMakeLists.txt

@@ -2,6 +2,7 @@
 SET(LOCAL_FILES
     _betweennessCentrality.sql
     betweennessCentrality.sql
+    degree.sql
 )
 
 foreach (f ${LOCAL_FILES})

docqueries/topology/test.conf

@@ -6,7 +6,6 @@ SET(LOCAL_FILES
     createverticestable.sql
     nodeNetwork.sql
     extractVertices.sql
-    degree.sql
     )
 
 foreach (f ${LOCAL_FILES})