diff --git a/configuration.conf b/configuration.conf index cc6da5e29cf..a857b55a405 100644 --- a/configuration.conf +++ b/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 diff --git a/include/cpp_common/path.hpp b/include/cpp_common/path.hpp index 5f0875b3b37..879bd1da1de 100644 --- a/include/cpp_common/path.hpp +++ b/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 @@ -346,4 +346,4 @@ class Path { } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_BASEPATH_SSEC_HPP_ +#endif // INCLUDE_CPP_COMMON_PATH_HPP_ diff --git a/include/drivers/topologicalSort/topologicalSort_driver.h b/include/drivers/ordering/topologicalSort_driver.h similarity index 87% rename from include/drivers/topologicalSort/topologicalSort_driver.h rename to include/drivers/ordering/topologicalSort_driver.h index 31de7b0e1a1..627befd30b1 100644 --- a/include/drivers/topologicalSort/topologicalSort_driver.h +++ b/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 @@ -53,4 +53,4 @@ void pgr_do_topologicalSort( } #endif -#endif // INCLUDE_DRIVERS_TOPOLOGICALSORT_TOPOLOGICALSORT_DRIVER_H_ +#endif // INCLUDE_DRIVERS_ORDERING_TOPOLOGICALSORT_DRIVER_H_ diff --git a/include/topologicalSort/topologicalSort.hpp b/include/ordering/topologicalSort.hpp similarity index 94% rename from include/topologicalSort/topologicalSort.hpp rename to include/ordering/topologicalSort.hpp index 45756d45025..851706dd0ec 100644 --- a/include/topologicalSort/topologicalSort.hpp +++ b/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_ diff --git a/sql/ordering/CMakeLists.txt b/sql/ordering/CMakeLists.txt index 852e793e1e5..f206b064d6e 100644 --- a/sql/ordering/CMakeLists.txt +++ b/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}) diff --git a/sql/topologicalSort/_topologicalSort.sql b/sql/ordering/_topologicalSort.sql similarity index 100% rename from sql/topologicalSort/_topologicalSort.sql rename to sql/ordering/_topologicalSort.sql diff --git a/sql/topologicalSort/topologicalSort.sql b/sql/ordering/topologicalSort.sql similarity index 100% rename from sql/topologicalSort/topologicalSort.sql rename to sql/ordering/topologicalSort.sql diff --git a/sql/topologicalSort/CMakeLists.txt b/sql/topologicalSort/CMakeLists.txt deleted file mode 100644 index 532e37b09d7..00000000000 --- a/sql/topologicalSort/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -set(LOCAL_FILES - _topologicalSort.sql - topologicalSort.sql - ) - -foreach (f ${LOCAL_FILES}) - configure_file(${f} ${f}) - list(APPEND PACKAGE_SQL_FILES ${CMAKE_CURRENT_BINARY_DIR}/${f}) -endforeach() - -set(PROJECT_SQL_FILES ${PROJECT_SQL_FILES} ${PACKAGE_SQL_FILES} PARENT_SCOPE) diff --git a/src/ordering/CMakeLists.txt b/src/ordering/CMakeLists.txt index 71f25541c52..03380171c5d 100644 --- a/src/ordering/CMakeLists.txt +++ b/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 - ) +) diff --git a/src/topologicalSort/topologicalSort.c b/src/ordering/topologicalSort.c similarity index 98% rename from src/topologicalSort/topologicalSort.c rename to src/ordering/topologicalSort.c index 548db8de3dd..6c567e26322 100644 --- a/src/topologicalSort/topologicalSort.c +++ b/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); diff --git a/src/topologicalSort/topologicalSort_driver.cpp b/src/ordering/topologicalSort_driver.cpp similarity index 97% rename from src/topologicalSort/topologicalSort_driver.cpp rename to src/ordering/topologicalSort_driver.cpp index 212e65fc6e0..94f47063722 100644 --- a/src/topologicalSort/topologicalSort_driver.cpp +++ b/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 #include @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "topologicalSort/topologicalSort.hpp" +#include "ordering/topologicalSort.hpp" #include "c_types/i_rt.h" #include "cpp_common/pgdata_getters.hpp" diff --git a/src/topologicalSort/CMakeLists.txt b/src/topologicalSort/CMakeLists.txt deleted file mode 100644 index 980015576c7..00000000000 --- a/src/topologicalSort/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -ADD_LIBRARY(topologicalSort OBJECT - topologicalSort.c - - topologicalSort_driver.cpp)