Adjusting code/includes to code movement

Author: cvvergara

configuration.conf

@@ -37,7 +37,6 @@ chinese             | Y | Y | Y
 spanningTree        | Y | Y | Y
 mincut              | Y | Y | Y
 version             | Y | Y | Y
-topologicalSort     | Y | Y | N
 transitiveClosure   | Y | Y | Y
 breadthFirstSearch  | Y | Y | N
 traversal           | Y | Y | Y

include/cpp_common/path.hpp

@@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 /*! @file */
 
-#ifndef INCLUDE_CPP_COMMON_BASEPATH_SSEC_HPP_
-#define INCLUDE_CPP_COMMON_BASEPATH_SSEC_HPP_
+#ifndef INCLUDE_CPP_COMMON_PATH_HPP_
+#define INCLUDE_CPP_COMMON_PATH_HPP_
 #pragma once
 
 #include <deque>
@@ -346,4 +346,4 @@ class Path {
 
 }  // namespace pgrouting
 
-#endif  // INCLUDE_CPP_COMMON_BASEPATH_SSEC_HPP_
+#endif  // INCLUDE_CPP_COMMON_PATH_HPP_

include/drivers/ordering/topologicalSort_driver.h

@@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 ********************************************************************PGR-GNU*/
 
-#ifndef INCLUDE_DRIVERS_TOPOLOGICALSORT_TOPOLOGICALSORT_DRIVER_H_
-#define INCLUDE_DRIVERS_TOPOLOGICALSORT_TOPOLOGICALSORT_DRIVER_H_
+#ifndef INCLUDE_DRIVERS_ORDERING_TOPOLOGICALSORT_DRIVER_H_
+#define INCLUDE_DRIVERS_ORDERING_TOPOLOGICALSORT_DRIVER_H_
 
 #ifdef __cplusplus
 #   include <cstddef>
@@ -53,4 +53,4 @@ void pgr_do_topologicalSort(
     }
 #endif
 
-#endif  // INCLUDE_DRIVERS_TOPOLOGICALSORT_TOPOLOGICALSORT_DRIVER_H_
+#endif  // INCLUDE_DRIVERS_ORDERING_TOPOLOGICALSORT_DRIVER_H_

include/ordering/topologicalSort.hpp

@@ -22,8 +22,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 ********************************************************************PGR-GNU*/
 
-#ifndef INCLUDE_TOPOLOGICALSORT_TOPOLOGICALSORT_HPP_
-#define INCLUDE_TOPOLOGICALSORT_TOPOLOGICALSORT_HPP_
+#ifndef INCLUDE_ORDERING_TOPOLOGICALSORT_HPP_
+#define INCLUDE_ORDERING_TOPOLOGICALSORT_HPP_
 #pragma once
 
 
@@ -98,4 +98,4 @@ Pgr_topologicalSort< G >::topologicalSort(
 }
 
 
-#endif  // INCLUDE_TOPOLOGICALSORT_TOPOLOGICALSORT_HPP_
+#endif  // INCLUDE_ORDERING_TOPOLOGICALSORT_HPP_

sql/ordering/CMakeLists.txt

@@ -5,6 +5,8 @@ set(LOCAL_FILES
     sloanOrdering.sql
     _kingOrdering.sql
     kingOrdering.sql
+    _topologicalSort.sql
+    topologicalSort.sql
     )
 
 foreach (f ${LOCAL_FILES})

src/ordering/CMakeLists.txt

@@ -3,6 +3,9 @@ ADD_LIBRARY(ordering OBJECT
     cuthillMckeeOrdering.c
     cuthillMckeeOrdering_driver.cpp
     sloanOrdering.c
+    topologicalSort.c
+    topologicalSort_driver.cpp
+
     ordering_driver.cpp
     ordering_process.cpp
-    )
+)

src/ordering/topologicalSort.c

@@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "c_common/debug_macro.h"
 #include "c_common/e_report.h"
 #include "c_common/time_msg.h"
-#include "drivers/topologicalSort/topologicalSort_driver.h"
+#include "drivers/ordering/topologicalSort_driver.h"
 
 PGDLLEXPORT Datum _pgr_topologicalsort(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(_pgr_topologicalsort);

src/ordering/topologicalSort_driver.cpp

@@ -26,7 +26,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 ********************************************************************PGR-GNU*/
-#include "drivers/topologicalSort/topologicalSort_driver.h"
+#include "drivers/ordering/topologicalSort_driver.h"
 
 #include <sstream>
 #include <string>
@@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <algorithm>
 #include <limits>
 
-#include "topologicalSort/topologicalSort.hpp"
+#include "ordering/topologicalSort.hpp"
 
 #include "c_types/i_rt.h"
 #include "cpp_common/pgdata_getters.hpp"