Updates king ordering functionality and includes related files

Author: wifi:)

sql/ordering/CMakeLists.txt

@@ -3,8 +3,8 @@ SET(LOCAL_FILES
     cuthillMckeeOrdering.sql
     _minDegreeOrdering.sql
     minDegreeOrdering.sql
-    # _kingOrdering.sql
-    # kingOrdering.sql
+    _kingOrdering.sql
+    kingOrdering.sql
     )
 
 # Do not modify below this line

src/ordering/CMakeLists.txt

@@ -2,7 +2,7 @@ ADD_LIBRARY(ordering OBJECT
     cuthillMckeeOrdering.c
     cuthillMckeeOrdering_driver.cpp
     minDegreeOrdering.c
-    # kingOrdering.c
+    kingOrdering.c
     ordering_driver.cpp
     ordering_process.cpp
     )

src/ordering/kingOrdering.c

@@ -35,47 +35,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "c_types/ii_t_rt.h"
 
 
-#include "drivers/ordering/kingOrdering_driver.h"
+#include "process/ordering_process.h"
 
 PGDLLEXPORT Datum _pgr_kingordering(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(_pgr_kingordering);
 
-static
-void
-process(
-        char* edges_sql,
-
-        II_t_rt **result_tuples,
-        size_t *result_count) {
-    pgr_SPI_connect();
-    char* log_msg = NULL;
-    char* notice_msg = NULL;
-    char* err_msg = NULL;
-
-    (*result_tuples) = NULL;
-    (*result_count) = 0;
-
-    clock_t start_t = clock();
-    pgr_do_kingOrdering(
-            edges_sql,
-
-            result_tuples,
-            result_count,
-            &log_msg,
-            &notice_msg,
-            &err_msg);
-    time_msg("processing kingordering", start_t, clock());
-
-    if (err_msg && (*result_tuples)) {
-        pfree(*result_tuples);
-        (*result_tuples) = NULL;
-        (*result_count) = 0;
-    }
-
-    pgr_global_report(&log_msg, &notice_msg, &err_msg);
-
-    pgr_SPI_finish();
-}
 
 PGDLLEXPORT Datum
 _pgr_kingordering(PG_FUNCTION_ARGS) {
@@ -90,8 +54,9 @@ _pgr_kingordering(PG_FUNCTION_ARGS) {
         funcctx = SRF_FIRSTCALL_INIT();
         oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
 
-        process(
+        pgr_process_ordering(
                 text_to_cstring(PG_GETARG_TEXT_P(0)),
+                3, /*King Ordering*/
                 &result_tuples,
                 &result_count);
 

src/ordering/ordering_process.cpp

@@ -67,13 +67,13 @@ void pgr_process_ordering(
             which,
             result_tuples, result_count,
             &log_msg, &notice_msg, &err_msg);
-     if ( which == 1) {
+    if ( which == 1) {
 
 	    time_msg(std::string(" processing pgr_cuthillMckeeOrdering").c_str(), start_t, clock());
     } else if ( which == 2) {
 
 	    time_msg(std::string(" processing pgr_minDegreeOrdering").c_str(), start_t, clock());
-    } else {
+    } else if ( which == 3) {
 
 	    time_msg(std::string(" processing pgr_kingOrdering").c_str(), start_t, clock());
     }