From 5aac2d9bae69627b38773ef9ee92a66963be475c Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 11:50:45 -0600 Subject: [PATCH 01/16] (lint) emoving unused files --- include/cpp_common/signalhandler.hpp | 155 --------------------------- include/vrp/book_keeping.hpp | 114 -------------------- src/cpp_common/arrays_input.cpp | 151 -------------------------- 3 files changed, 420 deletions(-) delete mode 100644 include/cpp_common/signalhandler.hpp delete mode 100644 include/vrp/book_keeping.hpp delete mode 100644 src/cpp_common/arrays_input.cpp diff --git a/include/cpp_common/signalhandler.hpp b/include/cpp_common/signalhandler.hpp deleted file mode 100644 index db799ae886..0000000000 --- a/include/cpp_common/signalhandler.hpp +++ /dev/null @@ -1,155 +0,0 @@ -/*PGR-GNU***************************************************************** -File: signalhandler.hpp - -Copyright (c) 2015 pgRouting developers -Mail: project@pgrouting.org - ------- - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -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*/ -/*PGR-MIT****************************************************************** - * - * file signalhandler.h - * - * Copyright 2014 Stephen Woodbridge - * Copyright 2014 Vicky Vergara - * - * This is free software; you can redistribute and/or modify it under - * the terms of the MIT License. Please file MIT-LICENSE for details. - * - *****************************************************************PGR-MIT*/ - -#ifndef INCLUDE_CPP_COMMON_SIGNALHANDLER_HPP_ -#define INCLUDE_CPP_COMMON_SIGNALHANDLER_HPP_ -#pragma once - -// defines NULL -#include -#include -#include - -// #include "./pgr_assert.hpp" - -class UserQuitException: public std::exception { - private: - const char *str; ///< str Holds the what() string for the exception. - - public: - virtual const char *what() const throw() { - return str; - } - - explicit UserQuitException(const char *_str): str(_str) {} -}; - - -class EventHandler { - public: - // Hook method for the signal hook method. - virtual void handleSignal(int signum) = 0; - - // ... other hook methods for other types of - // events such as timers, I/O, and - // synchronization objects. -}; - - -class SignalHandler { - public: - // Entry point. - static SignalHandler *instance(void); - - // Register an event handler for - // and return a pointer to any existing - // that was previously registered to handle . - EventHandler *registerHandler(int signum, EventHandler *eh); - - // Remove the for - // by setting the slot in the - // table to NULL. - void removeHandler(int signum); - - private: - // Ensure we're a Singleton. - SignalHandler(void) {} - - // Singleton pointer. - static SignalHandler *instance_; - - // Entry point adapter installed into - // (must be a static method or a stand-alone - // extern "C" function). - static void dispatcher(int signum); - - // Table of pointers to concrete s - // registered by applications. NSIG is the number of - // signals defined in . - static EventHandler *signalHandlers_[NSIG]; -}; - - -// --------------------------------------------------------- -// -- some concrete signal handlers -// --------------------------------------------------------- - -class SIGINT_Handler: public EventHandler { - public: - SIGINT_Handler(void): graceful_quit_(0) {} - - // Hook method. - virtual void handleSignal(int signum) { - if (signum == SIGINT) this->graceful_quit_ = 1; - } - - // Accessor. - sig_atomic_t gracefulQuit(void) { return this->graceful_quit_;} - - private: - sig_atomic_t graceful_quit_; -}; - - -class SIGQUIT_Handler: public EventHandler { - public: - SIGQUIT_Handler(void): abortive_quit_(0) {} - - // Hook method. - virtual void handleSignal(int signum) { - if (signum == SIGQUIT) this->abortive_quit_ = 1; - } - - // Accessor. - sig_atomic_t abortiveQuit(void) { return this->abortive_quit_;} - - private: - sig_atomic_t abortive_quit_; -}; - - -#define REG_SIGINT SIGINT_Handler sigint_handler; \ - SignalHandler::instance()->registerHandler(SIGINT, &sigint_handler); - -#define REG_SIGQUIT SIGQUIT_Handler sigquit_handler; \ - SignalHandler::instance()->registerHandler(SIGQUIT, &sigquit_handler); - -#define THROW_ON_SIGINT do { \ - if ( sigint_handler.gracefulQuit() == 1 ) \ - throw(UserQuitException("Abort on User Request!")); \ - } while (0); - -#endif // INCLUDE_CPP_COMMON_SIGNALHANDLER_HPP_ - diff --git a/include/vrp/book_keeping.hpp b/include/vrp/book_keeping.hpp deleted file mode 100644 index 0f205ad759..0000000000 --- a/include/vrp/book_keeping.hpp +++ /dev/null @@ -1,114 +0,0 @@ -/*PGR-GNU***************************************************************** -File: book_keeping.hpp - - * Copyright (c) 2017 pgRouting developers - * Mail: project@pgrouting.org - * - * ------ - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -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*/ - -/*! @file */ - -#ifndef INCLUDE_VRP_BOOK_KEEPING_HPP_ -#define INCLUDE_VRP_BOOK_KEEPING_HPP_ -#pragma once - -#include -#include -#include -#include "vrp/vehicle_pickDeliver.hpp" -/** - * Book keeping class for swapping orders between vehicles - */ - -namespace pgrouting { -namespace vrp { - -class Swap_bk; -class Swap_info { - friend class Swap_bk; - - public: - Swap_info() = delete; - Swap_info(const Swap_info &) = default; - Swap_info(const Vehicle_pickDeliver &from, - const Vehicle_pickDeliver &to, - size_t from_o, - size_t to_o, - double delta); - friend std::ostream& operator << (std::ostream& log, const Swap_info &d); -#if 0 - { - log - << "\n" << d.from_truck.tau() << " --> " - << d.from_order - << "(" - << d.from_truck.orders()[d.from_order].pickup().original_id() - << ")" - << "\n" << d.to_truck.tau() << " --> " - << d.to_order - << "(" - << d.to_truck.orders()[d.to_order].pickup().original_id() - << ")" - << "\n" << "delta = " << d.estimated_delta; - return log; - } -#endif - - public: - Vehicle_pickDeliver from_truck; - Vehicle_pickDeliver to_truck; - size_t from_order; - size_t to_order; - double estimated_delta; -}; - - -class Swap_bk { - private: - class Compare { - public: - bool operator() (const Swap_info &lhs, const Swap_info rhs) { - return lhs.estimated_delta > rhs.estimated_delta; - } - }; - - public: - typedef std::priority_queue< - Swap_info, - std::vector, - Compare > Swaps_queue; - - - Swaps_queue m_swaps; - friend std::ostream& operator<< (std::ostream &log, const Swap_bk &data); - - public: - Swap_bk() = default; - Swap_bk(const Swap_bk &bk) = default; - Swaps_queue& possible_swaps() {return m_swaps;} - void push(const Swap_info& data) {m_swaps.push(data);} - Swap_info top() {return m_swaps.top();} - void pop() {return m_swaps.pop();} - bool empty() {return m_swaps.empty();} -}; - -} // namespace vrp -} // namespace pgrouting - -#endif // INCLUDE_VRP_BOOK_KEEPING_HPP_ diff --git a/src/cpp_common/arrays_input.cpp b/src/cpp_common/arrays_input.cpp deleted file mode 100644 index 68e12b1d80..0000000000 --- a/src/cpp_common/arrays_input.cpp +++ /dev/null @@ -1,151 +0,0 @@ -/*PGR-GNU***************************************************************** -File: arrays_input.cpp - -Copyright (c) 2015 pgRouting developers -Mail: project@pgrouting.org - -Copyright (c) 2023 Celia Virginia Vergara Castillo -Copyright (c) 2015 Celia Virginia Vergara Castillo -mail: vicky at erosion.dev - ------- - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -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 "c_common/arrays_input.h" - -extern "C" { -#include -#include -} - -#include "cpp_common/pgr_alloc.hpp" - -namespace { - -/** @brief get the array contents from postgres - * - * @details This function generates the array inputs according to their type - * received through @a ArrayType *v parameter and store them in @a c_array. It - * can be empty also if received @a allow_empty true. The cases of failure are:- - * 1. When @a ndim is not equal to one dimension. - * 2. When no element is found i.e. nitems is zero or negative. - * 3. If the element type doesn't lie in switch cases, give the error of expected array of any integer type - * 4. When size of @a c_array is out of range or memory. - * 5. When null value is found in the array. - * - * All these failures are represented as error through @a elog. - * @param[in] v Pointer to the postgres C array - * @param[out] arrlen size of the C array - * @param[in] allow_empty flag to allow empty arrays - * - * @pre the array has to be one dimension - * @pre Must have elements (when allow_empty is false) - * - * @returns The resultant array - */ -int64_t* -get_bigIntArr(ArrayType *v, size_t *arrlen, bool allow_empty) { - int64_t *c_array = nullptr; - - auto element_type = ARR_ELEMTYPE(v); - auto dim = ARR_DIMS(v); - auto ndim = ARR_NDIM(v); - auto nitems = ArrayGetNItems(ndim, dim); - Datum *elements = nullptr; - bool *nulls = nullptr; - int16 typlen; - bool typbyval; - char typalign; - - - if (allow_empty && (ndim == 0 || nitems <= 0)) { - return nullptr; - } - - if (ndim != 1) { - elog(ERROR, "One dimension expected"); - return nullptr; - } - - if (nitems <= 0) { - elog(ERROR, "No elements found"); - return nullptr; - } - - get_typlenbyvalalign(element_type, - &typlen, &typbyval, &typalign); - - /* validate input data type */ - switch (element_type) { - case INT2OID: - case INT4OID: - case INT8OID: - break; - default: - elog(ERROR, "Expected array of ANY-INTEGER"); - return nullptr; - break; - } - - deconstruct_array(v, element_type, typlen, typbyval, - typalign, &elements, &nulls, - &nitems); - - c_array = pgrouting::pgr_alloc(static_cast(nitems), (c_array)); - if (!c_array) { - elog(ERROR, "Out of memory!"); - } - - - for (int i = 0; i < nitems; i++) { - if (nulls[i]) { - pfree(c_array); - elog(ERROR, "NULL value found in Array!"); - } else { - switch (element_type) { - case INT2OID: - c_array[i] = static_cast(DatumGetInt16(elements[i])); - break; - case INT4OID: - c_array[i] = static_cast(DatumGetInt32(elements[i])); - break; - case INT8OID: - c_array[i] = DatumGetInt64(elements[i]); - break; - } - } - } - (*arrlen) = static_cast(nitems); - - pfree(elements); - pfree(nulls); - return c_array; -} - -} // namespace - -/** - * @param[out] arrlen Length of the array - * @param[in] input the postgres array - * @param[in] allow_empty when true, empty arrays are accepted. - * @returns Returns a C array of integers - */ - -int64_t* pgr_get_bigIntArray(size_t *arrlen, ArrayType *input, bool allow_empty) { - return get_bigIntArr(input, arrlen, allow_empty); -} From 2c7d3bebc6d59eb3df5075479e079e917e610d11 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 22:31:05 -0600 Subject: [PATCH 02/16] (sql) Removing pgr_ prefix from filenames pgr_filename.* -> filename.* --- sql/chinese/{pgr_chinesePostman.sql => chinesePostman.sql} | 0 .../{pgr_chinesePostmanCost.sql => chinesePostmanCost.sql} | 0 sql/common/{pgr_parameter_check.sql => parameter_check.sql} | 0 sql/trsp/{pgr_trspViaEdges.sql => trspViaEdges.sql} | 0 sql/trsp/{pgr_trspViaVertices.sql => trspViaVertices.sql} | 0 sql/vrp_basic/{pgr_vrpOneDepot.sql => vrpOneDepot.sql} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename sql/chinese/{pgr_chinesePostman.sql => chinesePostman.sql} (100%) rename sql/chinese/{pgr_chinesePostmanCost.sql => chinesePostmanCost.sql} (100%) rename sql/common/{pgr_parameter_check.sql => parameter_check.sql} (100%) rename sql/trsp/{pgr_trspViaEdges.sql => trspViaEdges.sql} (100%) rename sql/trsp/{pgr_trspViaVertices.sql => trspViaVertices.sql} (100%) rename sql/vrp_basic/{pgr_vrpOneDepot.sql => vrpOneDepot.sql} (100%) diff --git a/sql/chinese/pgr_chinesePostman.sql b/sql/chinese/chinesePostman.sql similarity index 100% rename from sql/chinese/pgr_chinesePostman.sql rename to sql/chinese/chinesePostman.sql diff --git a/sql/chinese/pgr_chinesePostmanCost.sql b/sql/chinese/chinesePostmanCost.sql similarity index 100% rename from sql/chinese/pgr_chinesePostmanCost.sql rename to sql/chinese/chinesePostmanCost.sql diff --git a/sql/common/pgr_parameter_check.sql b/sql/common/parameter_check.sql similarity index 100% rename from sql/common/pgr_parameter_check.sql rename to sql/common/parameter_check.sql diff --git a/sql/trsp/pgr_trspViaEdges.sql b/sql/trsp/trspViaEdges.sql similarity index 100% rename from sql/trsp/pgr_trspViaEdges.sql rename to sql/trsp/trspViaEdges.sql diff --git a/sql/trsp/pgr_trspViaVertices.sql b/sql/trsp/trspViaVertices.sql similarity index 100% rename from sql/trsp/pgr_trspViaVertices.sql rename to sql/trsp/trspViaVertices.sql diff --git a/sql/vrp_basic/pgr_vrpOneDepot.sql b/sql/vrp_basic/vrpOneDepot.sql similarity index 100% rename from sql/vrp_basic/pgr_vrpOneDepot.sql rename to sql/vrp_basic/vrpOneDepot.sql From 4df2684654b14c6858ad1b1f8877404f48c3d366 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 22:31:04 -0600 Subject: [PATCH 03/16] (include) Removing pgr_ prefix from filenames pgr_filename.* -> filename.* --- include/allpairs/{pgr_allpairs.hpp => allpairs.hpp} | 0 include/alphaShape/{pgr_alphaShape.hpp => alphaShape.hpp} | 0 include/bdDijkstra/{pgr_bdDijkstra.hpp => bdDijkstra.hpp} | 0 include/bellman_ford/{pgr_bellman_ford.hpp => bellman_ford.hpp} | 0 include/bellman_ford/{pgr_edwardMoore.hpp => edwardMoore.hpp} | 0 ..._binaryBreadthFirstSearch.hpp => binaryBreadthFirstSearch.hpp} | 0 .../{pgr_breadthFirstSearch.hpp => breadthFirstSearch.hpp} | 0 include/chinese/{pgr_chinesePostman.hpp => chinesePostman.hpp} | 0 .../coloring/{pgr_bipartite_driver.hpp => bipartite_driver.hpp} | 0 include/coloring/{pgr_edgeColoring.hpp => edgeColoring.hpp} | 0 ..._sequentialVertexColoring.hpp => sequentialVertexColoring.hpp} | 0 include/components/{pgr_components.hpp => components.hpp} | 0 include/components/{pgr_makeConnected.hpp => makeConnected.hpp} | 0 include/contraction/{pgr_contract.hpp => contract.hpp} | 0 .../{pgr_contractionGraph.hpp => contractionGraph.hpp} | 0 .../{pgr_deadEndContraction.hpp => deadEndContraction.hpp} | 0 .../{pgr_linearContraction.hpp => linearContraction.hpp} | 0 include/cpp_common/{pgr_alloc.hpp => alloc.hpp} | 0 include/cpp_common/{pgr_assert.hpp => assert.hpp} | 0 include/cpp_common/{pgr_base_graph.hpp => base_graph.hpp} | 0 include/cpp_common/{pgr_bidirectional.hpp => bidirectional.hpp} | 0 include/cpp_common/{pgr_messages.hpp => messages.hpp} | 0 .../{pgr_dagShortestPath.hpp => dagShortestPath.hpp} | 0 include/dijkstra/{pgr_dijkstraVia.hpp => dijkstraVia.hpp} | 0 ...atorTree_driver.hpp => lengauerTarjanDominatorTree_driver.hpp} | 0 include/lineGraph/{pgr_lineGraphFull.hpp => lineGraphFull.hpp} | 0 include/max_flow/{pgr_costFlowGraph.hpp => costFlowGraph.hpp} | 0 include/max_flow/{pgr_flowgraph.hpp => flowgraph.hpp} | 0 include/max_flow/{pgr_maxflow.hpp => maxflow.hpp} | 0 ...imumcardinalitymatching.hpp => maximumcardinalitymatching.hpp} | 0 include/max_flow/{pgr_minCostMaxFlow.hpp => minCostMaxFlow.hpp} | 0 include/mincut/{pgr_stoerWagner.hpp => stoerWagner.hpp} | 0 include/planar/{pgr_boyerMyrvold.hpp => boyerMyrvold.hpp} | 0 include/spanningTree/{pgr_kruskal.hpp => kruskal.hpp} | 0 include/spanningTree/{pgr_mst.hpp => mst.hpp} | 0 include/spanningTree/{pgr_prim.hpp => prim.hpp} | 0 .../{pgr_topologicalSort.hpp => topologicalSort.hpp} | 0 .../{pgr_transitiveClosure.hpp => transitiveClosure.hpp} | 0 .../traversal/{pgr_depthFirstSearch.hpp => depthFirstSearch.hpp} | 0 include/trsp/{pgr_trspHandler.hpp => trspHandler.hpp} | 0 include/vrp/{pgr_pickDeliver.hpp => pickDeliver.hpp} | 0 include/withPoints/{pgr_withPoints.hpp => withPoints.hpp} | 0 include/yen/{pgr_ksp.hpp => ksp.hpp} | 0 .../yen/{pgr_turnRestrictedPath.hpp => turnRestrictedPath.hpp} | 0 44 files changed, 0 insertions(+), 0 deletions(-) rename include/allpairs/{pgr_allpairs.hpp => allpairs.hpp} (100%) rename include/alphaShape/{pgr_alphaShape.hpp => alphaShape.hpp} (100%) rename include/bdDijkstra/{pgr_bdDijkstra.hpp => bdDijkstra.hpp} (100%) rename include/bellman_ford/{pgr_bellman_ford.hpp => bellman_ford.hpp} (100%) rename include/bellman_ford/{pgr_edwardMoore.hpp => edwardMoore.hpp} (100%) rename include/breadthFirstSearch/{pgr_binaryBreadthFirstSearch.hpp => binaryBreadthFirstSearch.hpp} (100%) rename include/breadthFirstSearch/{pgr_breadthFirstSearch.hpp => breadthFirstSearch.hpp} (100%) rename include/chinese/{pgr_chinesePostman.hpp => chinesePostman.hpp} (100%) rename include/coloring/{pgr_bipartite_driver.hpp => bipartite_driver.hpp} (100%) rename include/coloring/{pgr_edgeColoring.hpp => edgeColoring.hpp} (100%) rename include/coloring/{pgr_sequentialVertexColoring.hpp => sequentialVertexColoring.hpp} (100%) rename include/components/{pgr_components.hpp => components.hpp} (100%) rename include/components/{pgr_makeConnected.hpp => makeConnected.hpp} (100%) rename include/contraction/{pgr_contract.hpp => contract.hpp} (100%) rename include/contraction/{pgr_contractionGraph.hpp => contractionGraph.hpp} (100%) rename include/contraction/{pgr_deadEndContraction.hpp => deadEndContraction.hpp} (100%) rename include/contraction/{pgr_linearContraction.hpp => linearContraction.hpp} (100%) rename include/cpp_common/{pgr_alloc.hpp => alloc.hpp} (100%) rename include/cpp_common/{pgr_assert.hpp => assert.hpp} (100%) rename include/cpp_common/{pgr_base_graph.hpp => base_graph.hpp} (100%) rename include/cpp_common/{pgr_bidirectional.hpp => bidirectional.hpp} (100%) rename include/cpp_common/{pgr_messages.hpp => messages.hpp} (100%) rename include/dagShortestPath/{pgr_dagShortestPath.hpp => dagShortestPath.hpp} (100%) rename include/dijkstra/{pgr_dijkstraVia.hpp => dijkstraVia.hpp} (100%) rename include/dominator/{pgr_lengauerTarjanDominatorTree_driver.hpp => lengauerTarjanDominatorTree_driver.hpp} (100%) rename include/lineGraph/{pgr_lineGraphFull.hpp => lineGraphFull.hpp} (100%) rename include/max_flow/{pgr_costFlowGraph.hpp => costFlowGraph.hpp} (100%) rename include/max_flow/{pgr_flowgraph.hpp => flowgraph.hpp} (100%) rename include/max_flow/{pgr_maxflow.hpp => maxflow.hpp} (100%) rename include/max_flow/{pgr_maximumcardinalitymatching.hpp => maximumcardinalitymatching.hpp} (100%) rename include/max_flow/{pgr_minCostMaxFlow.hpp => minCostMaxFlow.hpp} (100%) rename include/mincut/{pgr_stoerWagner.hpp => stoerWagner.hpp} (100%) rename include/planar/{pgr_boyerMyrvold.hpp => boyerMyrvold.hpp} (100%) rename include/spanningTree/{pgr_kruskal.hpp => kruskal.hpp} (100%) rename include/spanningTree/{pgr_mst.hpp => mst.hpp} (100%) rename include/spanningTree/{pgr_prim.hpp => prim.hpp} (100%) rename include/topologicalSort/{pgr_topologicalSort.hpp => topologicalSort.hpp} (100%) rename include/transitiveClosure/{pgr_transitiveClosure.hpp => transitiveClosure.hpp} (100%) rename include/traversal/{pgr_depthFirstSearch.hpp => depthFirstSearch.hpp} (100%) rename include/trsp/{pgr_trspHandler.hpp => trspHandler.hpp} (100%) rename include/vrp/{pgr_pickDeliver.hpp => pickDeliver.hpp} (100%) rename include/withPoints/{pgr_withPoints.hpp => withPoints.hpp} (100%) rename include/yen/{pgr_ksp.hpp => ksp.hpp} (100%) rename include/yen/{pgr_turnRestrictedPath.hpp => turnRestrictedPath.hpp} (100%) diff --git a/include/allpairs/pgr_allpairs.hpp b/include/allpairs/allpairs.hpp similarity index 100% rename from include/allpairs/pgr_allpairs.hpp rename to include/allpairs/allpairs.hpp diff --git a/include/alphaShape/pgr_alphaShape.hpp b/include/alphaShape/alphaShape.hpp similarity index 100% rename from include/alphaShape/pgr_alphaShape.hpp rename to include/alphaShape/alphaShape.hpp diff --git a/include/bdDijkstra/pgr_bdDijkstra.hpp b/include/bdDijkstra/bdDijkstra.hpp similarity index 100% rename from include/bdDijkstra/pgr_bdDijkstra.hpp rename to include/bdDijkstra/bdDijkstra.hpp diff --git a/include/bellman_ford/pgr_bellman_ford.hpp b/include/bellman_ford/bellman_ford.hpp similarity index 100% rename from include/bellman_ford/pgr_bellman_ford.hpp rename to include/bellman_ford/bellman_ford.hpp diff --git a/include/bellman_ford/pgr_edwardMoore.hpp b/include/bellman_ford/edwardMoore.hpp similarity index 100% rename from include/bellman_ford/pgr_edwardMoore.hpp rename to include/bellman_ford/edwardMoore.hpp diff --git a/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp b/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp similarity index 100% rename from include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp rename to include/breadthFirstSearch/binaryBreadthFirstSearch.hpp diff --git a/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp b/include/breadthFirstSearch/breadthFirstSearch.hpp similarity index 100% rename from include/breadthFirstSearch/pgr_breadthFirstSearch.hpp rename to include/breadthFirstSearch/breadthFirstSearch.hpp diff --git a/include/chinese/pgr_chinesePostman.hpp b/include/chinese/chinesePostman.hpp similarity index 100% rename from include/chinese/pgr_chinesePostman.hpp rename to include/chinese/chinesePostman.hpp diff --git a/include/coloring/pgr_bipartite_driver.hpp b/include/coloring/bipartite_driver.hpp similarity index 100% rename from include/coloring/pgr_bipartite_driver.hpp rename to include/coloring/bipartite_driver.hpp diff --git a/include/coloring/pgr_edgeColoring.hpp b/include/coloring/edgeColoring.hpp similarity index 100% rename from include/coloring/pgr_edgeColoring.hpp rename to include/coloring/edgeColoring.hpp diff --git a/include/coloring/pgr_sequentialVertexColoring.hpp b/include/coloring/sequentialVertexColoring.hpp similarity index 100% rename from include/coloring/pgr_sequentialVertexColoring.hpp rename to include/coloring/sequentialVertexColoring.hpp diff --git a/include/components/pgr_components.hpp b/include/components/components.hpp similarity index 100% rename from include/components/pgr_components.hpp rename to include/components/components.hpp diff --git a/include/components/pgr_makeConnected.hpp b/include/components/makeConnected.hpp similarity index 100% rename from include/components/pgr_makeConnected.hpp rename to include/components/makeConnected.hpp diff --git a/include/contraction/pgr_contract.hpp b/include/contraction/contract.hpp similarity index 100% rename from include/contraction/pgr_contract.hpp rename to include/contraction/contract.hpp diff --git a/include/contraction/pgr_contractionGraph.hpp b/include/contraction/contractionGraph.hpp similarity index 100% rename from include/contraction/pgr_contractionGraph.hpp rename to include/contraction/contractionGraph.hpp diff --git a/include/contraction/pgr_deadEndContraction.hpp b/include/contraction/deadEndContraction.hpp similarity index 100% rename from include/contraction/pgr_deadEndContraction.hpp rename to include/contraction/deadEndContraction.hpp diff --git a/include/contraction/pgr_linearContraction.hpp b/include/contraction/linearContraction.hpp similarity index 100% rename from include/contraction/pgr_linearContraction.hpp rename to include/contraction/linearContraction.hpp diff --git a/include/cpp_common/pgr_alloc.hpp b/include/cpp_common/alloc.hpp similarity index 100% rename from include/cpp_common/pgr_alloc.hpp rename to include/cpp_common/alloc.hpp diff --git a/include/cpp_common/pgr_assert.hpp b/include/cpp_common/assert.hpp similarity index 100% rename from include/cpp_common/pgr_assert.hpp rename to include/cpp_common/assert.hpp diff --git a/include/cpp_common/pgr_base_graph.hpp b/include/cpp_common/base_graph.hpp similarity index 100% rename from include/cpp_common/pgr_base_graph.hpp rename to include/cpp_common/base_graph.hpp diff --git a/include/cpp_common/pgr_bidirectional.hpp b/include/cpp_common/bidirectional.hpp similarity index 100% rename from include/cpp_common/pgr_bidirectional.hpp rename to include/cpp_common/bidirectional.hpp diff --git a/include/cpp_common/pgr_messages.hpp b/include/cpp_common/messages.hpp similarity index 100% rename from include/cpp_common/pgr_messages.hpp rename to include/cpp_common/messages.hpp diff --git a/include/dagShortestPath/pgr_dagShortestPath.hpp b/include/dagShortestPath/dagShortestPath.hpp similarity index 100% rename from include/dagShortestPath/pgr_dagShortestPath.hpp rename to include/dagShortestPath/dagShortestPath.hpp diff --git a/include/dijkstra/pgr_dijkstraVia.hpp b/include/dijkstra/dijkstraVia.hpp similarity index 100% rename from include/dijkstra/pgr_dijkstraVia.hpp rename to include/dijkstra/dijkstraVia.hpp diff --git a/include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp b/include/dominator/lengauerTarjanDominatorTree_driver.hpp similarity index 100% rename from include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp rename to include/dominator/lengauerTarjanDominatorTree_driver.hpp diff --git a/include/lineGraph/pgr_lineGraphFull.hpp b/include/lineGraph/lineGraphFull.hpp similarity index 100% rename from include/lineGraph/pgr_lineGraphFull.hpp rename to include/lineGraph/lineGraphFull.hpp diff --git a/include/max_flow/pgr_costFlowGraph.hpp b/include/max_flow/costFlowGraph.hpp similarity index 100% rename from include/max_flow/pgr_costFlowGraph.hpp rename to include/max_flow/costFlowGraph.hpp diff --git a/include/max_flow/pgr_flowgraph.hpp b/include/max_flow/flowgraph.hpp similarity index 100% rename from include/max_flow/pgr_flowgraph.hpp rename to include/max_flow/flowgraph.hpp diff --git a/include/max_flow/pgr_maxflow.hpp b/include/max_flow/maxflow.hpp similarity index 100% rename from include/max_flow/pgr_maxflow.hpp rename to include/max_flow/maxflow.hpp diff --git a/include/max_flow/pgr_maximumcardinalitymatching.hpp b/include/max_flow/maximumcardinalitymatching.hpp similarity index 100% rename from include/max_flow/pgr_maximumcardinalitymatching.hpp rename to include/max_flow/maximumcardinalitymatching.hpp diff --git a/include/max_flow/pgr_minCostMaxFlow.hpp b/include/max_flow/minCostMaxFlow.hpp similarity index 100% rename from include/max_flow/pgr_minCostMaxFlow.hpp rename to include/max_flow/minCostMaxFlow.hpp diff --git a/include/mincut/pgr_stoerWagner.hpp b/include/mincut/stoerWagner.hpp similarity index 100% rename from include/mincut/pgr_stoerWagner.hpp rename to include/mincut/stoerWagner.hpp diff --git a/include/planar/pgr_boyerMyrvold.hpp b/include/planar/boyerMyrvold.hpp similarity index 100% rename from include/planar/pgr_boyerMyrvold.hpp rename to include/planar/boyerMyrvold.hpp diff --git a/include/spanningTree/pgr_kruskal.hpp b/include/spanningTree/kruskal.hpp similarity index 100% rename from include/spanningTree/pgr_kruskal.hpp rename to include/spanningTree/kruskal.hpp diff --git a/include/spanningTree/pgr_mst.hpp b/include/spanningTree/mst.hpp similarity index 100% rename from include/spanningTree/pgr_mst.hpp rename to include/spanningTree/mst.hpp diff --git a/include/spanningTree/pgr_prim.hpp b/include/spanningTree/prim.hpp similarity index 100% rename from include/spanningTree/pgr_prim.hpp rename to include/spanningTree/prim.hpp diff --git a/include/topologicalSort/pgr_topologicalSort.hpp b/include/topologicalSort/topologicalSort.hpp similarity index 100% rename from include/topologicalSort/pgr_topologicalSort.hpp rename to include/topologicalSort/topologicalSort.hpp diff --git a/include/transitiveClosure/pgr_transitiveClosure.hpp b/include/transitiveClosure/transitiveClosure.hpp similarity index 100% rename from include/transitiveClosure/pgr_transitiveClosure.hpp rename to include/transitiveClosure/transitiveClosure.hpp diff --git a/include/traversal/pgr_depthFirstSearch.hpp b/include/traversal/depthFirstSearch.hpp similarity index 100% rename from include/traversal/pgr_depthFirstSearch.hpp rename to include/traversal/depthFirstSearch.hpp diff --git a/include/trsp/pgr_trspHandler.hpp b/include/trsp/trspHandler.hpp similarity index 100% rename from include/trsp/pgr_trspHandler.hpp rename to include/trsp/trspHandler.hpp diff --git a/include/vrp/pgr_pickDeliver.hpp b/include/vrp/pickDeliver.hpp similarity index 100% rename from include/vrp/pgr_pickDeliver.hpp rename to include/vrp/pickDeliver.hpp diff --git a/include/withPoints/pgr_withPoints.hpp b/include/withPoints/withPoints.hpp similarity index 100% rename from include/withPoints/pgr_withPoints.hpp rename to include/withPoints/withPoints.hpp diff --git a/include/yen/pgr_ksp.hpp b/include/yen/ksp.hpp similarity index 100% rename from include/yen/pgr_ksp.hpp rename to include/yen/ksp.hpp diff --git a/include/yen/pgr_turnRestrictedPath.hpp b/include/yen/turnRestrictedPath.hpp similarity index 100% rename from include/yen/pgr_turnRestrictedPath.hpp rename to include/yen/turnRestrictedPath.hpp From 55d1d2ba960c70929157b6117f2b38307708bb98 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 22:31:05 -0600 Subject: [PATCH 04/16] (src) Removing pgr_ prefix from filenames pgr_filename.* -> filename.* --- src/alpha_shape/{pgr_alphaShape.cpp => alphaShape.cpp} | 0 src/coloring/{pgr_edgeColoring.cpp => edgeColoring.cpp} | 0 src/common/{pgr_alloc.cpp => alloc.cpp} | 0 src/common/{pgr_assert.cpp => assert.cpp} | 0 src/components/{pgr_components.cpp => components.cpp} | 0 src/contraction/{pgr_contract.cpp => contract.cpp} | 0 src/cpp_common/{pgr_messages.cpp => messages.cpp} | 0 src/max_flow/{pgr_flowgraph.cpp => flowgraph.cpp} | 0 src/max_flow/{pgr_maxflow.cpp => maxflow.cpp} | 0 src/max_flow/{pgr_minCostMaxFlow.cpp => minCostMaxFlow.cpp} | 0 src/pickDeliver/{pgr_pickDeliver.cpp => pickDeliver.cpp} | 0 src/trsp/{pgr_trspHandler.cpp => trspHandler.cpp} | 0 src/withPoints/{pgr_withPoints.cpp => withPoints.cpp} | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename src/alpha_shape/{pgr_alphaShape.cpp => alphaShape.cpp} (100%) rename src/coloring/{pgr_edgeColoring.cpp => edgeColoring.cpp} (100%) rename src/common/{pgr_alloc.cpp => alloc.cpp} (100%) rename src/common/{pgr_assert.cpp => assert.cpp} (100%) rename src/components/{pgr_components.cpp => components.cpp} (100%) rename src/contraction/{pgr_contract.cpp => contract.cpp} (100%) rename src/cpp_common/{pgr_messages.cpp => messages.cpp} (100%) rename src/max_flow/{pgr_flowgraph.cpp => flowgraph.cpp} (100%) rename src/max_flow/{pgr_maxflow.cpp => maxflow.cpp} (100%) rename src/max_flow/{pgr_minCostMaxFlow.cpp => minCostMaxFlow.cpp} (100%) rename src/pickDeliver/{pgr_pickDeliver.cpp => pickDeliver.cpp} (100%) rename src/trsp/{pgr_trspHandler.cpp => trspHandler.cpp} (100%) rename src/withPoints/{pgr_withPoints.cpp => withPoints.cpp} (100%) diff --git a/src/alpha_shape/pgr_alphaShape.cpp b/src/alpha_shape/alphaShape.cpp similarity index 100% rename from src/alpha_shape/pgr_alphaShape.cpp rename to src/alpha_shape/alphaShape.cpp diff --git a/src/coloring/pgr_edgeColoring.cpp b/src/coloring/edgeColoring.cpp similarity index 100% rename from src/coloring/pgr_edgeColoring.cpp rename to src/coloring/edgeColoring.cpp diff --git a/src/common/pgr_alloc.cpp b/src/common/alloc.cpp similarity index 100% rename from src/common/pgr_alloc.cpp rename to src/common/alloc.cpp diff --git a/src/common/pgr_assert.cpp b/src/common/assert.cpp similarity index 100% rename from src/common/pgr_assert.cpp rename to src/common/assert.cpp diff --git a/src/components/pgr_components.cpp b/src/components/components.cpp similarity index 100% rename from src/components/pgr_components.cpp rename to src/components/components.cpp diff --git a/src/contraction/pgr_contract.cpp b/src/contraction/contract.cpp similarity index 100% rename from src/contraction/pgr_contract.cpp rename to src/contraction/contract.cpp diff --git a/src/cpp_common/pgr_messages.cpp b/src/cpp_common/messages.cpp similarity index 100% rename from src/cpp_common/pgr_messages.cpp rename to src/cpp_common/messages.cpp diff --git a/src/max_flow/pgr_flowgraph.cpp b/src/max_flow/flowgraph.cpp similarity index 100% rename from src/max_flow/pgr_flowgraph.cpp rename to src/max_flow/flowgraph.cpp diff --git a/src/max_flow/pgr_maxflow.cpp b/src/max_flow/maxflow.cpp similarity index 100% rename from src/max_flow/pgr_maxflow.cpp rename to src/max_flow/maxflow.cpp diff --git a/src/max_flow/pgr_minCostMaxFlow.cpp b/src/max_flow/minCostMaxFlow.cpp similarity index 100% rename from src/max_flow/pgr_minCostMaxFlow.cpp rename to src/max_flow/minCostMaxFlow.cpp diff --git a/src/pickDeliver/pgr_pickDeliver.cpp b/src/pickDeliver/pickDeliver.cpp similarity index 100% rename from src/pickDeliver/pgr_pickDeliver.cpp rename to src/pickDeliver/pickDeliver.cpp diff --git a/src/trsp/pgr_trspHandler.cpp b/src/trsp/trspHandler.cpp similarity index 100% rename from src/trsp/pgr_trspHandler.cpp rename to src/trsp/trspHandler.cpp diff --git a/src/withPoints/pgr_withPoints.cpp b/src/withPoints/withPoints.cpp similarity index 100% rename from src/withPoints/pgr_withPoints.cpp rename to src/withPoints/withPoints.cpp From cf842609d4444a62a99ad8a7378277438a8c3028 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 08:39:54 -0600 Subject: [PATCH 05/16] (src) Removing other prefixes on filenames --- .../{drivedist_driver.h => driving_distance_driver.h} | 0 ...ithPoints_dd_driver.h => driving_distance_withPoints_driver.h} | 0 .../{many_to_dist_driving_distance.c => driving_distance.c} | 0 .../{drivedist_driver.cpp => driving_distance_driver.cpp} | 0 ...{many_to_dist_withPointsDD.c => driving_distance_withPoints.c} | 0 ...oints_dd_driver.cpp => driving_distance_withPoints_driver.cpp} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename include/drivers/driving_distance/{drivedist_driver.h => driving_distance_driver.h} (100%) rename include/drivers/driving_distance/{withPoints_dd_driver.h => driving_distance_withPoints_driver.h} (100%) rename src/driving_distance/{many_to_dist_driving_distance.c => driving_distance.c} (100%) rename src/driving_distance/{drivedist_driver.cpp => driving_distance_driver.cpp} (100%) rename src/driving_distance/{many_to_dist_withPointsDD.c => driving_distance_withPoints.c} (100%) rename src/driving_distance/{withPoints_dd_driver.cpp => driving_distance_withPoints_driver.cpp} (100%) diff --git a/include/drivers/driving_distance/drivedist_driver.h b/include/drivers/driving_distance/driving_distance_driver.h similarity index 100% rename from include/drivers/driving_distance/drivedist_driver.h rename to include/drivers/driving_distance/driving_distance_driver.h diff --git a/include/drivers/driving_distance/withPoints_dd_driver.h b/include/drivers/driving_distance/driving_distance_withPoints_driver.h similarity index 100% rename from include/drivers/driving_distance/withPoints_dd_driver.h rename to include/drivers/driving_distance/driving_distance_withPoints_driver.h diff --git a/src/driving_distance/many_to_dist_driving_distance.c b/src/driving_distance/driving_distance.c similarity index 100% rename from src/driving_distance/many_to_dist_driving_distance.c rename to src/driving_distance/driving_distance.c diff --git a/src/driving_distance/drivedist_driver.cpp b/src/driving_distance/driving_distance_driver.cpp similarity index 100% rename from src/driving_distance/drivedist_driver.cpp rename to src/driving_distance/driving_distance_driver.cpp diff --git a/src/driving_distance/many_to_dist_withPointsDD.c b/src/driving_distance/driving_distance_withPoints.c similarity index 100% rename from src/driving_distance/many_to_dist_withPointsDD.c rename to src/driving_distance/driving_distance_withPoints.c diff --git a/src/driving_distance/withPoints_dd_driver.cpp b/src/driving_distance/driving_distance_withPoints_driver.cpp similarity index 100% rename from src/driving_distance/withPoints_dd_driver.cpp rename to src/driving_distance/driving_distance_withPoints_driver.cpp From a13bb98d6305bc82f47f938dbc48f0ae7a143b82 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 23:29:41 -0600 Subject: [PATCH 06/16] (src) Adjusting code to filename changes --- src/allpairs/floydWarshall_driver.cpp | 4 ++-- src/allpairs/johnson_driver.cpp | 4 ++-- src/alpha_shape/alphaShape.cpp | 4 ++-- src/alpha_shape/alphaShape_driver.cpp | 8 ++++---- src/astar/astar_driver.cpp | 4 ++-- src/bdAstar/bdAstar_driver.cpp | 4 ++-- src/bdDijkstra/bdDijkstra_driver.cpp | 8 ++++---- src/bellman_ford/bellman_ford_driver.cpp | 6 +++--- src/bellman_ford/bellman_ford_neg.c | 14 +++++++++----- src/bellman_ford/bellman_ford_neg_driver.cpp | 6 +++--- src/bellman_ford/edwardMoore_driver.cpp | 8 ++++---- .../binaryBreadthFirstSearch_driver.cpp | 6 +++--- .../breadthFirstSearch_driver.cpp | 6 +++--- src/chinese/chinesePostman_driver.cpp | 6 +++--- src/circuits/hawickCircuits_driver.cpp | 4 ++-- src/coloring/bipartite_driver.cpp | 6 +++--- src/coloring/edgeColoring.cpp | 6 +++--- src/coloring/edgeColoring_driver.cpp | 6 +++--- src/coloring/sequentialVertexColoring_driver.cpp | 6 +++--- src/common/alloc.cpp | 4 ++-- src/common/assert.cpp | 4 ++-- src/common/basePath_SSEC.cpp | 2 +- src/common/basic_vertex.cpp | 2 +- src/common/xy_vertex.cpp | 2 +- src/components/articulationPoints_driver.cpp | 8 ++++---- src/components/biconnectedComponents_driver.cpp | 8 ++++---- src/components/bridges_driver.cpp | 8 ++++---- src/components/components.cpp | 4 ++-- src/components/connectedComponents_driver.cpp | 8 ++++---- src/components/makeConnected_driver.cpp | 8 ++++---- src/components/strongComponents_driver.cpp | 8 ++++---- src/contraction/contract.cpp | 4 ++-- src/contraction/contractGraph_driver.cpp | 4 ++-- src/cpp_common/Dmatrix.cpp | 2 +- src/cpp_common/compPaths.cpp | 2 +- src/cpp_common/get_check_data.cpp | 2 +- src/cpp_common/messages.cpp | 4 ++-- src/cpp_common/trsp_pgget.cpp | 2 +- src/dagShortestPath/dagShortestPath_driver.cpp | 6 +++--- src/dijkstra/dijkstraVia_driver.cpp | 6 +++--- src/dijkstra/dijkstra_driver.cpp | 4 ++-- .../lengauerTarjanDominatorTree_driver.cpp | 6 +++--- src/driving_distance/driving_distance.c | 4 ++-- src/driving_distance/driving_distance_driver.cpp | 8 ++++---- src/driving_distance/driving_distance_withPoints.c | 4 ++-- .../driving_distance_withPoints_driver.cpp | 8 ++++---- src/ksp/ksp_driver.cpp | 6 +++--- src/ksp/turnRestrictedPath_driver.cpp | 6 +++--- src/ksp/withPoints_ksp_driver.cpp | 8 ++++---- src/lineGraph/lineGraphFull_driver.cpp | 6 +++--- src/lineGraph/lineGraph_driver.cpp | 6 +++--- src/max_flow/edge_disjoint_paths_driver.cpp | 6 +++--- src/max_flow/flowgraph.cpp | 4 ++-- src/max_flow/max_flow_driver.cpp | 6 +++--- src/max_flow/maxflow.cpp | 4 ++-- .../maximum_cardinality_matching_driver.cpp | 6 +++--- src/max_flow/minCostMaxFlow.cpp | 4 ++-- src/max_flow/minCostMaxFlow_driver.cpp | 6 +++--- src/metrics/betweennessCentrality_driver.cpp | 2 +- src/mincut/stoerWagner_driver.cpp | 6 +++--- src/ordering/cuthillMckeeOrdering_driver.cpp | 4 ++-- src/pickDeliver/dnode.cpp | 2 +- src/pickDeliver/fleet.cpp | 2 +- src/pickDeliver/initial_solution.cpp | 4 ++-- src/pickDeliver/optimize.cpp | 4 ++-- src/pickDeliver/pd_orders.cpp | 2 +- src/pickDeliver/pickDeliver.cpp | 6 +++--- src/pickDeliver/pickDeliverEuclidean_driver.cpp | 6 +++--- src/pickDeliver/pickDeliver_driver.cpp | 6 +++--- src/pickDeliver/solution.cpp | 2 +- src/pickDeliver/tw_node.cpp | 4 ++-- src/pickDeliver/vehicle.cpp | 4 ++-- src/pickDeliver/vehicle_pickDeliver.cpp | 4 ++-- src/planar/isPlanar_driver.cpp | 8 ++++---- src/spanningTree/kruskal_driver.cpp | 6 +++--- src/spanningTree/mst_common.cpp | 4 ++-- src/spanningTree/prim_driver.cpp | 6 +++--- src/spanningTree/randomSpanningTree_driver.cpp | 6 +++--- src/topologicalSort/topologicalSort_driver.cpp | 6 +++--- src/transitiveClosure/transitiveClosure_driver.cpp | 6 +++--- src/traversal/depthFirstSearch_driver.cpp | 6 +++--- src/trsp/trspHandler.cpp | 6 +++--- src/trsp/trspVia_driver.cpp | 8 ++++---- src/trsp/trspVia_withPoints_driver.cpp | 10 +++++----- src/trsp/trsp_driver.cpp | 8 ++++---- src/trsp/trsp_withPoints_driver.cpp | 8 ++++---- src/tsp/TSP_driver.cpp | 4 ++-- src/tsp/euclideanTSP_driver.cpp | 4 ++-- src/tsp/tsp.cpp | 4 ++-- src/withPoints/get_new_queries.cpp | 2 +- src/withPoints/withPoints.cpp | 6 +++--- src/withPoints/withPointsVia_driver.cpp | 8 ++++---- src/withPoints/withPoints_driver.cpp | 6 +++--- 93 files changed, 250 insertions(+), 246 deletions(-) diff --git a/src/allpairs/floydWarshall_driver.cpp b/src/allpairs/floydWarshall_driver.cpp index 5fb330bccb..a016e03d09 100644 --- a/src/allpairs/floydWarshall_driver.cpp +++ b/src/allpairs/floydWarshall_driver.cpp @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "allpairs/pgr_allpairs.hpp" +#include "allpairs/allpairs.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" void diff --git a/src/allpairs/johnson_driver.cpp b/src/allpairs/johnson_driver.cpp index ff9337a977..dea9c9f8f1 100644 --- a/src/allpairs/johnson_driver.cpp +++ b/src/allpairs/johnson_driver.cpp @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "allpairs/pgr_allpairs.hpp" +#include "allpairs/allpairs.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" void diff --git a/src/alpha_shape/alphaShape.cpp b/src/alpha_shape/alphaShape.cpp index adbe522ea0..e85c8b90a2 100644 --- a/src/alpha_shape/alphaShape.cpp +++ b/src/alpha_shape/alphaShape.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_alphaShape.cpp +File: alphaShape.cpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "alphaShape/pgr_alphaShape.hpp" +#include "alphaShape/alphaShape.hpp" #include #include diff --git a/src/alpha_shape/alphaShape_driver.cpp b/src/alpha_shape/alphaShape_driver.cpp index c7f2834913..e3441771d8 100644 --- a/src/alpha_shape/alphaShape_driver.cpp +++ b/src/alpha_shape/alphaShape_driver.cpp @@ -39,13 +39,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_types/geom_text_rt.h" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "alphaShape/pgr_alphaShape.hpp" +#include "alphaShape/alphaShape.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/bpoint.hpp" #include "cpp_common/bline.hpp" diff --git a/src/astar/astar_driver.cpp b/src/astar/astar_driver.cpp index 1eb607ceb3..6a14a78f90 100644 --- a/src/astar/astar_driver.cpp +++ b/src/astar/astar_driver.cpp @@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/edge_xy_t.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/bdAstar/bdAstar_driver.cpp b/src/bdAstar/bdAstar_driver.cpp index d478193b17..8f685608e4 100644 --- a/src/bdAstar/bdAstar_driver.cpp +++ b/src/bdAstar/bdAstar_driver.cpp @@ -40,8 +40,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/edge_xy_t.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/bdDijkstra/bdDijkstra_driver.cpp b/src/bdDijkstra/bdDijkstra_driver.cpp index 7943d58a52..1411dd50fd 100644 --- a/src/bdDijkstra/bdDijkstra_driver.cpp +++ b/src/bdDijkstra/bdDijkstra_driver.cpp @@ -40,10 +40,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_base_graph.hpp" -#include "bdDijkstra/pgr_bdDijkstra.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/base_graph.hpp" +#include "bdDijkstra/bdDijkstra.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/bellman_ford/bellman_ford_driver.cpp b/src/bellman_ford/bellman_ford_driver.cpp index 2e31ebc781..bb196d7826 100644 --- a/src/bellman_ford/bellman_ford_driver.cpp +++ b/src/bellman_ford/bellman_ford_driver.cpp @@ -37,12 +37,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "bellman_ford/pgr_bellman_ford.hpp" +#include "bellman_ford/bellman_ford.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/bellman_ford/bellman_ford_neg.c b/src/bellman_ford/bellman_ford_neg.c index 103ec18b34..87313253b5 100644 --- a/src/bellman_ford/bellman_ford_neg.c +++ b/src/bellman_ford/bellman_ford_neg.c @@ -66,6 +66,7 @@ process( neg_edges_sql, combinations_sql, starts, ends, + directed, only_cost, @@ -89,9 +90,10 @@ process( pgr_SPI_finish(); } -PGDLLEXPORT Datum _pgr_bellmanfordneg(PG_FUNCTION_ARGS) { +PGDLLEXPORT Datum +_pgr_bellmanfordneg(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; - TupleDesc tuple_desc; + TupleDesc tuple_desc; Path_rt *result_tuples = NULL; size_t result_count = 0; @@ -159,14 +161,15 @@ PGDLLEXPORT Datum _pgr_bellmanfordneg(PG_FUNCTION_ARGS) { values = palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); - size_t i; for (i = 0; i < numb; ++i) { nulls[i] = false; } - values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[funcctx->call_cntr].seq); + int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; + + values[0] = Int32GetDatum(funcctx->call_cntr + 1); + values[1] = Int32GetDatum(seq); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[funcctx->call_cntr].node); @@ -174,6 +177,7 @@ PGDLLEXPORT Datum _pgr_bellmanfordneg(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[7] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); + result_tuples[funcctx->call_cntr].start_id = result_tuples[funcctx->call_cntr].edge < 0? 1 : seq + 1; tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/bellman_ford/bellman_ford_neg_driver.cpp b/src/bellman_ford/bellman_ford_neg_driver.cpp index 9b97b980bf..5407134cc9 100644 --- a/src/bellman_ford/bellman_ford_neg_driver.cpp +++ b/src/bellman_ford/bellman_ford_neg_driver.cpp @@ -37,13 +37,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "bellman_ford/pgr_bellman_ford.hpp" +#include "bellman_ford/bellman_ford.hpp" #include "c_types/ii_t_rt.h" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" namespace { diff --git a/src/bellman_ford/edwardMoore_driver.cpp b/src/bellman_ford/edwardMoore_driver.cpp index 196c4c6fa5..082e5845b3 100644 --- a/src/bellman_ford/edwardMoore_driver.cpp +++ b/src/bellman_ford/edwardMoore_driver.cpp @@ -38,14 +38,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "bellman_ford/pgr_edwardMoore.hpp" +#include "bellman_ford/edwardMoore.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/base_graph.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp b/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp index cb0afaed83..d2a0d9fa77 100644 --- a/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp @@ -38,12 +38,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp" +#include "breadthFirstSearch/binaryBreadthFirstSearch.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" namespace { diff --git a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp index 0e6a3e8921..6dfabead04 100644 --- a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp @@ -35,10 +35,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "breadthFirstSearch/pgr_breadthFirstSearch.hpp" +#include "breadthFirstSearch/breadthFirstSearch.hpp" namespace { diff --git a/src/chinese/chinesePostman_driver.cpp b/src/chinese/chinesePostman_driver.cpp index 742716ed49..6685c91627 100644 --- a/src/chinese/chinesePostman_driver.cpp +++ b/src/chinese/chinesePostman_driver.cpp @@ -37,10 +37,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // work for only directed #include "cpp_common/pgdata_getters.hpp" -#include "chinese/pgr_chinesePostman.hpp" +#include "chinese/chinesePostman.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" void pgr_do_directedChPP( diff --git a/src/circuits/hawickCircuits_driver.cpp b/src/circuits/hawickCircuits_driver.cpp index e9a504ffb2..b506deee1b 100644 --- a/src/circuits/hawickCircuits_driver.cpp +++ b/src/circuits/hawickCircuits_driver.cpp @@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "circuits/hawickcircuits.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" namespace { diff --git a/src/coloring/bipartite_driver.cpp b/src/coloring/bipartite_driver.cpp index 90f01dfcdb..29e2014ffd 100644 --- a/src/coloring/bipartite_driver.cpp +++ b/src/coloring/bipartite_driver.cpp @@ -36,11 +36,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "c_types/ii_t_rt.h" #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "drivers/coloring/bipartite_driver.h" -#include "coloring/pgr_bipartite_driver.hpp" +#include "coloring/bipartite_driver.hpp" void diff --git a/src/coloring/edgeColoring.cpp b/src/coloring/edgeColoring.cpp index 29ac78e3b6..1f427a8939 100644 --- a/src/coloring/edgeColoring.cpp +++ b/src/coloring/edgeColoring.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_edgeColoring.cpp +File: edgeColoring.cpp Generated with Template by: Copyright (c) 2021 pgRouting developers @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "coloring/pgr_edgeColoring.hpp" +#include "coloring/edgeColoring.hpp" #include #include @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/interruption.hpp" diff --git a/src/coloring/edgeColoring_driver.cpp b/src/coloring/edgeColoring_driver.cpp index 0172463296..a69188ad68 100644 --- a/src/coloring/edgeColoring_driver.cpp +++ b/src/coloring/edgeColoring_driver.cpp @@ -31,11 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "coloring/pgr_edgeColoring.hpp" +#include "coloring/edgeColoring.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" void pgr_do_edgeColoring( char *edges_sql, diff --git a/src/coloring/sequentialVertexColoring_driver.cpp b/src/coloring/sequentialVertexColoring_driver.cpp index 1f24d0f078..40cb7908da 100644 --- a/src/coloring/sequentialVertexColoring_driver.cpp +++ b/src/coloring/sequentialVertexColoring_driver.cpp @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "coloring/pgr_sequentialVertexColoring.hpp" +#include "coloring/sequentialVertexColoring.hpp" /** @file sequentialVertexColoring_driver.cpp */ diff --git a/src/common/alloc.cpp b/src/common/alloc.cpp index 6081ade658..1ff667663e 100644 --- a/src/common/alloc.cpp +++ b/src/common/alloc.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_alloc.cpp +File: alloc.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include #include diff --git a/src/common/assert.cpp b/src/common/assert.cpp index 98e1b41295..cddcae8b89 100644 --- a/src/common/assert.cpp +++ b/src/common/assert.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_assert.cpp +File: assert.cpp Copyright (c) 2014 pgRouting developers Mail: project@pgrouting.org @@ -25,7 +25,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 "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include #include diff --git a/src/common/basePath_SSEC.cpp b/src/common/basePath_SSEC.cpp index 7e99667e5f..ef08cfef66 100644 --- a/src/common/basePath_SSEC.cpp +++ b/src/common/basePath_SSEC.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/path_rt.h" #include "c_types/mst_rt.h" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { diff --git a/src/common/basic_vertex.cpp b/src/common/basic_vertex.cpp index a5bfc39335..c5d1e92ff9 100644 --- a/src/common/basic_vertex.cpp +++ b/src/common/basic_vertex.cpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { diff --git a/src/common/xy_vertex.cpp b/src/common/xy_vertex.cpp index 9d27448bac..20902cb273 100644 --- a/src/common/xy_vertex.cpp +++ b/src/common/xy_vertex.cpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace { diff --git a/src/components/articulationPoints_driver.cpp b/src/components/articulationPoints_driver.cpp index 649891eceb..7feb62160e 100644 --- a/src/components/articulationPoints_driver.cpp +++ b/src/components/articulationPoints_driver.cpp @@ -34,12 +34,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "components/pgr_components.hpp" +#include "components/components.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/base_graph.hpp" void diff --git a/src/components/biconnectedComponents_driver.cpp b/src/components/biconnectedComponents_driver.cpp index ab18531c84..58bef62d84 100644 --- a/src/components/biconnectedComponents_driver.cpp +++ b/src/components/biconnectedComponents_driver.cpp @@ -34,13 +34,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "components/pgr_components.hpp" +#include "components/components.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" void diff --git a/src/components/bridges_driver.cpp b/src/components/bridges_driver.cpp index 07660042ca..6cf50be12c 100644 --- a/src/components/bridges_driver.cpp +++ b/src/components/bridges_driver.cpp @@ -34,12 +34,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "components/pgr_components.hpp" +#include "components/components.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/base_graph.hpp" void diff --git a/src/components/components.cpp b/src/components/components.cpp index eced42ed06..f38c183c62 100644 --- a/src/components/components.cpp +++ b/src/components/components.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_components.cpp +File: components.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "components/pgr_components.hpp" +#include "components/components.hpp" #include #include diff --git a/src/components/connectedComponents_driver.cpp b/src/components/connectedComponents_driver.cpp index ac0590bbb9..3145192392 100644 --- a/src/components/connectedComponents_driver.cpp +++ b/src/components/connectedComponents_driver.cpp @@ -35,11 +35,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/base_graph.hpp" -#include "components/pgr_components.hpp" +#include "components/components.hpp" void diff --git a/src/components/makeConnected_driver.cpp b/src/components/makeConnected_driver.cpp index 0a103b9f57..ecfd615543 100644 --- a/src/components/makeConnected_driver.cpp +++ b/src/components/makeConnected_driver.cpp @@ -34,11 +34,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "components/pgr_makeConnected.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "components/makeConnected.hpp" +#include "cpp_common/base_graph.hpp" void pgr_do_makeConnected( diff --git a/src/components/strongComponents_driver.cpp b/src/components/strongComponents_driver.cpp index c88e8a433a..fb12e1d14e 100644 --- a/src/components/strongComponents_driver.cpp +++ b/src/components/strongComponents_driver.cpp @@ -36,11 +36,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/base_graph.hpp" -#include "components/pgr_components.hpp" +#include "components/components.hpp" void diff --git a/src/contraction/contract.cpp b/src/contraction/contract.cpp index 0f313ddeb2..a957214da0 100644 --- a/src/contraction/contract.cpp +++ b/src/contraction/contract.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_contract.cpp +File: contract.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "contraction/pgr_contract.hpp" +#include "contraction/contract.hpp" namespace pgrouting { namespace contraction { diff --git a/src/contraction/contractGraph_driver.cpp b/src/contraction/contractGraph_driver.cpp index ceabccdf9b..fcd6a8d258 100644 --- a/src/contraction/contractGraph_driver.cpp +++ b/src/contraction/contractGraph_driver.cpp @@ -37,11 +37,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "contraction/ch_graphs.hpp" -#include "contraction/pgr_contract.hpp" +#include "contraction/contract.hpp" #include "c_types/contracted_rt.h" #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" namespace { diff --git a/src/cpp_common/Dmatrix.cpp b/src/cpp_common/Dmatrix.cpp index 53368bab0c..2acc3092c7 100644 --- a/src/cpp_common/Dmatrix.cpp +++ b/src/cpp_common/Dmatrix.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "c_types/iid_t_rt.h" diff --git a/src/cpp_common/compPaths.cpp b/src/cpp_common/compPaths.cpp index 5b805fd11a..31bb11368c 100644 --- a/src/cpp_common/compPaths.cpp +++ b/src/cpp_common/compPaths.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/compPaths.hpp" #include "cpp_common/basePath_SSEC.hpp" diff --git a/src/cpp_common/get_check_data.cpp b/src/cpp_common/get_check_data.cpp index a8f1139a39..e4a8bf0fc3 100644 --- a/src/cpp_common/get_check_data.cpp +++ b/src/cpp_common/get_check_data.cpp @@ -39,7 +39,7 @@ extern "C" { #include #include "cpp_common/undefPostgresDefine.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/info_t.hpp" diff --git a/src/cpp_common/messages.cpp b/src/cpp_common/messages.cpp index 43b13a1f19..25bf1ca686 100644 --- a/src/cpp_common/messages.cpp +++ b/src/cpp_common/messages.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_messages.cpp +File: messages.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" namespace pgrouting { diff --git a/src/cpp_common/trsp_pgget.cpp b/src/cpp_common/trsp_pgget.cpp index 7d46ebdbeb..59dfe49a16 100644 --- a/src/cpp_common/trsp_pgget.cpp +++ b/src/cpp_common/trsp_pgget.cpp @@ -57,7 +57,7 @@ The old version of TRSP #include "cpp_common/get_data.hpp" #include "cpp_common/get_check_data.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/trsp_pgfetch.hpp" #include "cpp_common/info_t.hpp" diff --git a/src/dagShortestPath/dagShortestPath_driver.cpp b/src/dagShortestPath/dagShortestPath_driver.cpp index a71700e08c..10923ae6ea 100644 --- a/src/dagShortestPath/dagShortestPath_driver.cpp +++ b/src/dagShortestPath/dagShortestPath_driver.cpp @@ -37,12 +37,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "dagShortestPath/pgr_dagShortestPath.hpp" +#include "dagShortestPath/dagShortestPath.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" namespace { diff --git a/src/dijkstra/dijkstraVia_driver.cpp b/src/dijkstra/dijkstraVia_driver.cpp index e73f6e3556..0fb0842e17 100644 --- a/src/dijkstra/dijkstraVia_driver.cpp +++ b/src/dijkstra/dijkstraVia_driver.cpp @@ -34,9 +34,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/routes_t.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "dijkstra/pgr_dijkstraVia.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "dijkstra/dijkstraVia.hpp" namespace { diff --git a/src/dijkstra/dijkstra_driver.cpp b/src/dijkstra/dijkstra_driver.cpp index 6f294173f7..5c9aecc51f 100644 --- a/src/dijkstra/dijkstra_driver.cpp +++ b/src/dijkstra/dijkstra_driver.cpp @@ -44,8 +44,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "dijkstra/dijkstra.hpp" diff --git a/src/dominator/lengauerTarjanDominatorTree_driver.cpp b/src/dominator/lengauerTarjanDominatorTree_driver.cpp index 4c4f9a11d0..b9d014dc2b 100644 --- a/src/dominator/lengauerTarjanDominatorTree_driver.cpp +++ b/src/dominator/lengauerTarjanDominatorTree_driver.cpp @@ -37,11 +37,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "c_types/ii_t_rt.h" -#include "dominator/pgr_lengauerTarjanDominatorTree_driver.hpp" +#include "dominator/lengauerTarjanDominatorTree_driver.hpp" void diff --git a/src/driving_distance/driving_distance.c b/src/driving_distance/driving_distance.c index 3fa5a97001..c60255f819 100644 --- a/src/driving_distance/driving_distance.c +++ b/src/driving_distance/driving_distance.c @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: many_to_dist_driving_distance.c +File: driving_distance.c Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "drivers/driving_distance/drivedist_driver.h" +#include "drivers/driving_distance/driving_distance_driver.h" PGDLLEXPORT Datum _pgr_drivingdistance(PG_FUNCTION_ARGS); diff --git a/src/driving_distance/driving_distance_driver.cpp b/src/driving_distance/driving_distance_driver.cpp index b6fa1b4521..e41e38967d 100644 --- a/src/driving_distance/driving_distance_driver.cpp +++ b/src/driving_distance/driving_distance_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: drivedist_driver.cpp +File: driving_distance_driver.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "drivers/driving_distance/drivedist_driver.h" +#include "drivers/driving_distance/driving_distance_driver.h" #include #include @@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "dijkstra/drivingDist.hpp" #include "c_types/mst_rt.h" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" void diff --git a/src/driving_distance/driving_distance_withPoints.c b/src/driving_distance/driving_distance_withPoints.c index 8071d29b82..b320009d35 100644 --- a/src/driving_distance/driving_distance_withPoints.c +++ b/src/driving_distance/driving_distance_withPoints.c @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: many_to_dist_withPointsDD.c +File: driving_distance_withPoints.c Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" #include "drivers/withPoints/get_new_queries.h" -#include "drivers/driving_distance/withPoints_dd_driver.h" +#include "drivers/driving_distance/driving_distance_withPoints_driver.h" PGDLLEXPORT Datum _pgr_withpointsddv4(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_withpointsddv4); diff --git a/src/driving_distance/driving_distance_withPoints_driver.cpp b/src/driving_distance/driving_distance_withPoints_driver.cpp index d8101d738f..6816f2589a 100644 --- a/src/driving_distance/driving_distance_withPoints_driver.cpp +++ b/src/driving_distance/driving_distance_withPoints_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: withPoints_dd_driver.cpp +File: driving_distance_withPoints.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "drivers/driving_distance/withPoints_dd_driver.h" +#include "drivers/driving_distance/driving_distance_withPoints_driver.h" #include #include @@ -41,10 +41,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "dijkstra/drivingDist.hpp" -#include "withPoints/pgr_withPoints.hpp" +#include "withPoints/withPoints.hpp" #include "c_types/mst_rt.h" #include "cpp_common/combinations.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" void diff --git a/src/ksp/ksp_driver.cpp b/src/ksp/ksp_driver.cpp index 9376cf311d..96a8a5fd1d 100644 --- a/src/ksp/ksp_driver.cpp +++ b/src/ksp/ksp_driver.cpp @@ -36,12 +36,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "yen/pgr_ksp.hpp" +#include "yen/ksp.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/ksp/turnRestrictedPath_driver.cpp b/src/ksp/turnRestrictedPath_driver.cpp index ef52b11dc4..d79b49a9c5 100644 --- a/src/ksp/turnRestrictedPath_driver.cpp +++ b/src/ksp/turnRestrictedPath_driver.cpp @@ -35,14 +35,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/rule.hpp" #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/restriction_t.hpp" -#include "yen/pgr_turnRestrictedPath.hpp" +#include "yen/turnRestrictedPath.hpp" namespace { diff --git a/src/ksp/withPoints_ksp_driver.cpp b/src/ksp/withPoints_ksp_driver.cpp index 180b3fdf4e..dae3a9e856 100644 --- a/src/ksp/withPoints_ksp_driver.cpp +++ b/src/ksp/withPoints_ksp_driver.cpp @@ -40,11 +40,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "withPoints/pgr_withPoints.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "withPoints/withPoints.hpp" -#include "yen/pgr_ksp.hpp" +#include "yen/ksp.hpp" void pgr_do_withPointsKsp( diff --git a/src/lineGraph/lineGraphFull_driver.cpp b/src/lineGraph/lineGraphFull_driver.cpp index 26dd1ffb08..ac19b177dc 100644 --- a/src/lineGraph/lineGraphFull_driver.cpp +++ b/src/lineGraph/lineGraphFull_driver.cpp @@ -36,10 +36,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/line_graph_full_rt.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "lineGraph/pgr_lineGraphFull.hpp" +#include "lineGraph/lineGraphFull.hpp" #include "cpp_common/linear_directed_graph.hpp" #include "dijkstra/dijkstra.hpp" diff --git a/src/lineGraph/lineGraph_driver.cpp b/src/lineGraph/lineGraph_driver.cpp index ad19950ff3..2f837e5282 100644 --- a/src/lineGraph/lineGraph_driver.cpp +++ b/src/lineGraph/lineGraph_driver.cpp @@ -38,9 +38,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "bgraph/line_graph.hpp" #include "bgraph/graph_to_edges.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/base_graph.hpp" #include "c_types/edge_rt.h" namespace { diff --git a/src/max_flow/edge_disjoint_paths_driver.cpp b/src/max_flow/edge_disjoint_paths_driver.cpp index 0f301a174d..35fadb4069 100644 --- a/src/max_flow/edge_disjoint_paths_driver.cpp +++ b/src/max_flow/edge_disjoint_paths_driver.cpp @@ -34,13 +34,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "max_flow/pgr_maxflow.hpp" +#include "max_flow/maxflow.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/alloc.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/max_flow/flowgraph.cpp b/src/max_flow/flowgraph.cpp index fd40129885..f41b042033 100644 --- a/src/max_flow/flowgraph.cpp +++ b/src/max_flow/flowgraph.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_flowgraph.cpp +File: flowgraph.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,4 +25,4 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "max_flow/pgr_flowgraph.hpp" +#include "max_flow/flowgraph.hpp" diff --git a/src/max_flow/max_flow_driver.cpp b/src/max_flow/max_flow_driver.cpp index fa4475b21c..7f7fd67cd6 100644 --- a/src/max_flow/max_flow_driver.cpp +++ b/src/max_flow/max_flow_driver.cpp @@ -34,12 +34,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "max_flow/pgr_maxflow.hpp" +#include "max_flow/maxflow.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/alloc.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/max_flow/maxflow.cpp b/src/max_flow/maxflow.cpp index dad55491ed..e7dc626b94 100644 --- a/src/max_flow/maxflow.cpp +++ b/src/max_flow/maxflow.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_maxflow.cpp +File: maxflow.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "max_flow/pgr_maxflow.hpp" +#include "max_flow/maxflow.hpp" #include #include diff --git a/src/max_flow/maximum_cardinality_matching_driver.cpp b/src/max_flow/maximum_cardinality_matching_driver.cpp index 2e8ea3e139..fc1587e7dd 100644 --- a/src/max_flow/maximum_cardinality_matching_driver.cpp +++ b/src/max_flow/maximum_cardinality_matching_driver.cpp @@ -40,9 +40,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/edge_bool_t_rt.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "max_flow/pgr_maximumcardinalitymatching.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "max_flow/maximumcardinalitymatching.hpp" void diff --git a/src/max_flow/minCostMaxFlow.cpp b/src/max_flow/minCostMaxFlow.cpp index abcd245279..8bf71c61b3 100644 --- a/src/max_flow/minCostMaxFlow.cpp +++ b/src/max_flow/minCostMaxFlow.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_minCostMaxFlow.cpp +File: minCostMaxFlow.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "max_flow/pgr_minCostMaxFlow.hpp" +#include "max_flow/minCostMaxFlow.hpp" #include #include diff --git a/src/max_flow/minCostMaxFlow_driver.cpp b/src/max_flow/minCostMaxFlow_driver.cpp index 416c978375..512b39c227 100644 --- a/src/max_flow/minCostMaxFlow_driver.cpp +++ b/src/max_flow/minCostMaxFlow_driver.cpp @@ -40,10 +40,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "max_flow/pgr_minCostMaxFlow.hpp" +#include "max_flow/minCostMaxFlow.hpp" void pgr_do_minCostMaxFlow( diff --git a/src/metrics/betweennessCentrality_driver.cpp b/src/metrics/betweennessCentrality_driver.cpp index 6c6a1aa1ce..5b71b13234 100644 --- a/src/metrics/betweennessCentrality_driver.cpp +++ b/src/metrics/betweennessCentrality_driver.cpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "metrics/betweennessCentrality.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" void diff --git a/src/mincut/stoerWagner_driver.cpp b/src/mincut/stoerWagner_driver.cpp index e27120b08e..14200fddf8 100644 --- a/src/mincut/stoerWagner_driver.cpp +++ b/src/mincut/stoerWagner_driver.cpp @@ -33,11 +33,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "mincut/pgr_stoerWagner.hpp" +#include "mincut/stoerWagner.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "c_types/stoerWagner_t.h" namespace { diff --git a/src/ordering/cuthillMckeeOrdering_driver.cpp b/src/ordering/cuthillMckeeOrdering_driver.cpp index d36480cf9a..cc2315d7a1 100644 --- a/src/ordering/cuthillMckeeOrdering_driver.cpp +++ b/src/ordering/cuthillMckeeOrdering_driver.cpp @@ -32,8 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "c_types/ii_t_rt.h" #include "ordering/cuthillMckeeOrdering.hpp" diff --git a/src/pickDeliver/dnode.cpp b/src/pickDeliver/dnode.cpp index 010e02f772..a6fe2b4d9e 100644 --- a/src/pickDeliver/dnode.cpp +++ b/src/pickDeliver/dnode.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "vrp/dnode.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/fleet.cpp b/src/pickDeliver/fleet.cpp index fa4165cc3c..f61fd5a4f1 100644 --- a/src/pickDeliver/fleet.cpp +++ b/src/pickDeliver/fleet.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "vrp/dnode.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/initial_solution.cpp b/src/pickDeliver/initial_solution.cpp index b591b84840..08924c85ee 100644 --- a/src/pickDeliver/initial_solution.cpp +++ b/src/pickDeliver/initial_solution.cpp @@ -27,9 +27,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "vrp/solution.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/optimize.cpp b/src/pickDeliver/optimize.cpp index 03160246e9..540b78d00c 100644 --- a/src/pickDeliver/optimize.cpp +++ b/src/pickDeliver/optimize.cpp @@ -27,11 +27,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "vrp/solution.hpp" #include "vrp/optimize.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/pd_orders.cpp b/src/pickDeliver/pd_orders.cpp index 5092a81a06..f53b8ce081 100644 --- a/src/pickDeliver/pd_orders.cpp +++ b/src/pickDeliver/pd_orders.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" #include "vrp/dnode.hpp" namespace pgrouting { diff --git a/src/pickDeliver/pickDeliver.cpp b/src/pickDeliver/pickDeliver.cpp index c60ba84a73..b72bebb2e3 100644 --- a/src/pickDeliver/pickDeliver.cpp +++ b/src/pickDeliver/pickDeliver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_pickDeliver.cpp +File: pickDeliver.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" #include #include @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/schedule_rt.h" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "vrp/initials_code.hpp" #include "vrp/vehicle_node.hpp" diff --git a/src/pickDeliver/pickDeliverEuclidean_driver.cpp b/src/pickDeliver/pickDeliverEuclidean_driver.cpp index 862f2c7d03..f21e95d4f4 100644 --- a/src/pickDeliver/pickDeliverEuclidean_driver.cpp +++ b/src/pickDeliver/pickDeliverEuclidean_driver.cpp @@ -39,11 +39,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/schedule_rt.h" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/alloc.hpp" void pgr_do_pickDeliverEuclidean( diff --git a/src/pickDeliver/pickDeliver_driver.cpp b/src/pickDeliver/pickDeliver_driver.cpp index 720b82dd24..275f0ff056 100644 --- a/src/pickDeliver/pickDeliver_driver.cpp +++ b/src/pickDeliver/pickDeliver_driver.cpp @@ -36,13 +36,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" #include "vrp/initials_code.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/Dmatrix.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/alloc.hpp" #include "c_types/iid_t_rt.h" #include "cpp_common/orders_t.hpp" diff --git a/src/pickDeliver/solution.cpp b/src/pickDeliver/solution.cpp index 0bd22c62a0..c4a8dedadd 100644 --- a/src/pickDeliver/solution.cpp +++ b/src/pickDeliver/solution.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/schedule_rt.h" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { diff --git a/src/pickDeliver/tw_node.cpp b/src/pickDeliver/tw_node.cpp index 52e820e310..76f6c9d875 100644 --- a/src/pickDeliver/tw_node.cpp +++ b/src/pickDeliver/tw_node.cpp @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "cpp_common/assert.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { diff --git a/src/pickDeliver/vehicle.cpp b/src/pickDeliver/vehicle.cpp index 163442071b..24c3cca2ee 100644 --- a/src/pickDeliver/vehicle.cpp +++ b/src/pickDeliver/vehicle.cpp @@ -35,9 +35,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/schedule_rt.h" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { diff --git a/src/pickDeliver/vehicle_pickDeliver.cpp b/src/pickDeliver/vehicle_pickDeliver.cpp index 43a94daa68..4560f5bb62 100644 --- a/src/pickDeliver/vehicle_pickDeliver.cpp +++ b/src/pickDeliver/vehicle_pickDeliver.cpp @@ -32,10 +32,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "vrp/order.hpp" #include "vrp/vehicle.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" diff --git a/src/planar/isPlanar_driver.cpp b/src/planar/isPlanar_driver.cpp index d1401570d6..bc707f9859 100644 --- a/src/planar/isPlanar_driver.cpp +++ b/src/planar/isPlanar_driver.cpp @@ -33,12 +33,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "planar/pgr_boyerMyrvold.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "planar/boyerMyrvold.hpp" +#include "cpp_common/base_graph.hpp" diff --git a/src/spanningTree/kruskal_driver.cpp b/src/spanningTree/kruskal_driver.cpp index 9ca1691934..05c4714824 100644 --- a/src/spanningTree/kruskal_driver.cpp +++ b/src/spanningTree/kruskal_driver.cpp @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "spanningTree/pgr_kruskal.hpp" +#include "spanningTree/kruskal.hpp" #include "spanningTree/details.hpp" diff --git a/src/spanningTree/mst_common.cpp b/src/spanningTree/mst_common.cpp index cc1258962c..1f2a4f6818 100644 --- a/src/spanningTree/mst_common.cpp +++ b/src/spanningTree/mst_common.cpp @@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/alloc.hpp" int get_order(char * fn_suffix, char ** err_msg) { diff --git a/src/spanningTree/prim_driver.cpp b/src/spanningTree/prim_driver.cpp index 4a7eb2f12d..e5a124bc9d 100644 --- a/src/spanningTree/prim_driver.cpp +++ b/src/spanningTree/prim_driver.cpp @@ -34,12 +34,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "c_types/mst_rt.h" -#include "spanningTree/pgr_prim.hpp" +#include "spanningTree/prim.hpp" #include "spanningTree/details.hpp" diff --git a/src/spanningTree/randomSpanningTree_driver.cpp b/src/spanningTree/randomSpanningTree_driver.cpp index e3161bbb4e..9c5fca8549 100644 --- a/src/spanningTree/randomSpanningTree_driver.cpp +++ b/src/spanningTree/randomSpanningTree_driver.cpp @@ -35,9 +35,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "spanningTree/pgr_randomSpanningTree.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "spanningTree/randomSpanningTree.hpp" template < class G > static diff --git a/src/topologicalSort/topologicalSort_driver.cpp b/src/topologicalSort/topologicalSort_driver.cpp index 8cf0b7013d..8e98f706af 100644 --- a/src/topologicalSort/topologicalSort_driver.cpp +++ b/src/topologicalSort/topologicalSort_driver.cpp @@ -35,12 +35,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "topologicalSort/pgr_topologicalSort.hpp" +#include "topologicalSort/topologicalSort.hpp" #include "c_types/i_rt.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" namespace { diff --git a/src/transitiveClosure/transitiveClosure_driver.cpp b/src/transitiveClosure/transitiveClosure_driver.cpp index 13a13ba072..d2e0dd9278 100644 --- a/src/transitiveClosure/transitiveClosure_driver.cpp +++ b/src/transitiveClosure/transitiveClosure_driver.cpp @@ -28,13 +28,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "transitiveClosure/pgr_transitiveClosure.hpp" +#include "transitiveClosure/transitiveClosure.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "c_types/transitiveClosure_rt.h" diff --git a/src/traversal/depthFirstSearch_driver.cpp b/src/traversal/depthFirstSearch_driver.cpp index 8068f2084e..7f23c2c17f 100644 --- a/src/traversal/depthFirstSearch_driver.cpp +++ b/src/traversal/depthFirstSearch_driver.cpp @@ -33,11 +33,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "spanningTree/details.hpp" -#include "traversal/pgr_depthFirstSearch.hpp" +#include "traversal/depthFirstSearch.hpp" /** @file depthFirstSearch_driver.cpp * @brief Handles actual calling of function in the `pgr_depthFirstSearch.hpp` file. diff --git a/src/trsp/trspHandler.cpp b/src/trsp/trspHandler.cpp index 29a822b6dc..ed1d58f35a 100644 --- a/src/trsp/trspHandler.cpp +++ b/src/trsp/trspHandler.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_trspHandler.cpp +File: trspHandler.cpp Copyright (c) 2011 pgRouting developers Mail: project@pgrouting.org @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "trsp/pgr_trspHandler.hpp" +#include "trsp/trspHandler.hpp" #include #include @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { namespace trsp { diff --git a/src/trsp/trspVia_driver.cpp b/src/trsp/trspVia_driver.cpp index 6fb22cf54a..9c5a0cf39b 100644 --- a/src/trsp/trspVia_driver.cpp +++ b/src/trsp/trspVia_driver.cpp @@ -33,16 +33,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "dijkstra/pgr_dijkstraVia.hpp" +#include "dijkstra/dijkstraVia.hpp" #include "c_types/routes_t.h" #include "cpp_common/restriction_t.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/rule.hpp" #include "cpp_common/combinations.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "trsp/pgr_trspHandler.hpp" +#include "trsp/trspHandler.hpp" namespace { diff --git a/src/trsp/trspVia_withPoints_driver.cpp b/src/trsp/trspVia_withPoints_driver.cpp index a6811c832e..5c057cb13f 100644 --- a/src/trsp/trspVia_withPoints_driver.cpp +++ b/src/trsp/trspVia_withPoints_driver.cpp @@ -33,14 +33,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/routes_t.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/rule.hpp" #include "cpp_common/combinations.hpp" -#include "dijkstra/pgr_dijkstraVia.hpp" -#include "withPoints/pgr_withPoints.hpp" -#include "trsp/pgr_trspHandler.hpp" +#include "dijkstra/dijkstraVia.hpp" +#include "withPoints/withPoints.hpp" +#include "trsp/trspHandler.hpp" namespace { diff --git a/src/trsp/trsp_driver.cpp b/src/trsp/trsp_driver.cpp index 6f79f480c4..c9b289565c 100644 --- a/src/trsp/trsp_driver.cpp +++ b/src/trsp/trsp_driver.cpp @@ -40,15 +40,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "trsp/pgr_trspHandler.hpp" +#include "trsp/trspHandler.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/rule.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/restriction_t.hpp" #include "c_types/ii_t_rt.h" -#include "withPoints/pgr_withPoints.hpp" +#include "withPoints/withPoints.hpp" #include "dijkstra/dijkstra.hpp" diff --git a/src/trsp/trsp_withPoints_driver.cpp b/src/trsp/trsp_withPoints_driver.cpp index cec7757748..0bcc7453b5 100644 --- a/src/trsp/trsp_withPoints_driver.cpp +++ b/src/trsp/trsp_withPoints_driver.cpp @@ -41,12 +41,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/rule.hpp" #include "cpp_common/combinations.hpp" -#include "withPoints/pgr_withPoints.hpp" -#include "trsp/pgr_trspHandler.hpp" +#include "withPoints/withPoints.hpp" +#include "trsp/trspHandler.hpp" #include "dijkstra/dijkstra.hpp" diff --git a/src/tsp/TSP_driver.cpp b/src/tsp/TSP_driver.cpp index f381c8a85d..8c5c19d70a 100644 --- a/src/tsp/TSP_driver.cpp +++ b/src/tsp/TSP_driver.cpp @@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/tsp_tour_rt.h" #include "c_types/ii_t_rt.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "tsp/tsp.hpp" diff --git a/src/tsp/euclideanTSP_driver.cpp b/src/tsp/euclideanTSP_driver.cpp index 5b55eb39a8..5d03b48257 100644 --- a/src/tsp/euclideanTSP_driver.cpp +++ b/src/tsp/euclideanTSP_driver.cpp @@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/tsp_tour_rt.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" void pgr_do_euclideanTSP( diff --git a/src/tsp/tsp.cpp b/src/tsp/tsp.cpp index e969897135..5fb12ec4be 100644 --- a/src/tsp/tsp.cpp +++ b/src/tsp/tsp.cpp @@ -40,8 +40,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_messages.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/messages.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/interruption.hpp" #include "visitors/dijkstra_visitors.hpp" diff --git a/src/withPoints/get_new_queries.cpp b/src/withPoints/get_new_queries.cpp index e7d55fceba..0aa4b4cd71 100644 --- a/src/withPoints/get_new_queries.cpp +++ b/src/withPoints/get_new_queries.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "drivers/withPoints/get_new_queries.h" #include #include -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" char estimate_drivingSide(char driving_side) { diff --git a/src/withPoints/withPoints.cpp b/src/withPoints/withPoints.cpp index ba8aab30ae..df4c9f6a83 100644 --- a/src/withPoints/withPoints.cpp +++ b/src/withPoints/withPoints.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_withPoints.cpp +File: withPoints.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "withPoints/pgr_withPoints.hpp" +#include "withPoints/withPoints.hpp" #include #include @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { diff --git a/src/withPoints/withPointsVia_driver.cpp b/src/withPoints/withPointsVia_driver.cpp index b02c33c82c..9551c5a9bd 100644 --- a/src/withPoints/withPointsVia_driver.cpp +++ b/src/withPoints/withPointsVia_driver.cpp @@ -35,10 +35,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/routes_t.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "dijkstra/pgr_dijkstraVia.hpp" -#include "withPoints/pgr_withPoints.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "dijkstra/dijkstraVia.hpp" +#include "withPoints/withPoints.hpp" namespace { diff --git a/src/withPoints/withPoints_driver.cpp b/src/withPoints/withPoints_driver.cpp index 46774782d8..914a258474 100644 --- a/src/withPoints/withPoints_driver.cpp +++ b/src/withPoints/withPoints_driver.cpp @@ -39,11 +39,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "withPoints/pgr_withPoints.hpp" +#include "withPoints/withPoints.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "dijkstra/dijkstra.hpp" From f21a8c624b4b25162438aaa7ba9223634fa16f78 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 23:31:14 -0600 Subject: [PATCH 07/16] (include) Adjusting includes to filename changes --- include/allpairs/allpairs.hpp | 12 ++++++------ include/alphaShape/alphaShape.hpp | 12 ++++++------ include/astar/astar.hpp | 8 ++++---- include/bdAstar/bdAstar.hpp | 8 ++++---- include/bdDijkstra/bdDijkstra.hpp | 12 +++++------- include/bellman_ford/bellman_ford.hpp | 12 ++++++------ include/bellman_ford/edwardMoore.hpp | 10 +++++----- .../binaryBreadthFirstSearch.hpp | 12 ++++++------ .../breadthFirstSearch/breadthFirstSearch.hpp | 10 +++++----- include/chinese/chinesePostman.hpp | 12 ++++++------ include/circuits/hawickcircuits.hpp | 4 ++-- include/coloring/bipartite_driver.hpp | 12 ++++++------ include/coloring/edgeColoring.hpp | 12 ++++++------ include/coloring/sequentialVertexColoring.hpp | 10 +++++----- include/components/components.hpp | 10 +++++----- include/components/makeConnected.hpp | 12 ++++++------ include/contraction/ch_graphs.hpp | 4 ++-- include/contraction/contract.hpp | 16 ++++++++-------- include/contraction/contractionGraph.hpp | 10 +++++----- include/contraction/deadEndContraction.hpp | 8 ++++---- include/contraction/linearContraction.hpp | 8 ++++---- include/cpp_common/alloc.hpp | 8 ++++---- include/cpp_common/assert.hpp | 10 +++++----- include/cpp_common/basePath_SSEC.hpp | 2 +- include/cpp_common/base_graph.hpp | 10 +++++----- include/cpp_common/bidirectional.hpp | 12 ++++++------ include/cpp_common/get_data.hpp | 2 +- include/cpp_common/messages.hpp | 8 ++++---- include/cpp_common/orders_t.hpp | 6 +++--- include/cpp_common/pgdata_getters.hpp | 2 +- include/cpp_common/vehicle_t.hpp | 6 +++--- include/dagShortestPath/dagShortestPath.hpp | 10 +++++----- include/dijkstra/dijkstra.hpp | 8 ++++---- include/dijkstra/dijkstraVia.hpp | 10 +++++----- include/dijkstra/drivingDist.hpp | 8 ++++---- .../lengauerTarjanDominatorTree_driver.hpp | 12 ++++++------ include/lineGraph/lineGraphFull.hpp | 10 +++++----- include/max_flow/costFlowGraph.hpp | 8 ++++---- include/max_flow/flowgraph.hpp | 8 ++++---- include/max_flow/maxflow.hpp | 10 +++++----- include/max_flow/maximumcardinalitymatching.hpp | 8 ++++---- include/max_flow/minCostMaxFlow.hpp | 10 +++++----- include/metrics/betweennessCentrality.hpp | 4 ++-- include/mincut/stoerWagner.hpp | 10 +++++----- include/ordering/cuthillMckeeOrdering.hpp | 4 ++-- include/planar/boyerMyrvold.hpp | 12 ++++++------ include/spanningTree/kruskal.hpp | 10 +++++----- include/spanningTree/mst.hpp | 10 +++++----- include/spanningTree/prim.hpp | 10 +++++----- include/topologicalSort/topologicalSort.hpp | 10 +++++----- include/transitiveClosure/transitiveClosure.hpp | 10 +++++----- include/traversal/depthFirstSearch.hpp | 10 +++++----- include/trsp/edgeInfo.hpp | 2 +- include/trsp/trspHandler.hpp | 10 +++++----- include/tsp/tsp.hpp | 4 ++-- include/visitors/dijkstra_visitors.hpp | 2 +- include/vrp/dnode.hpp | 2 +- include/vrp/optimize.hpp | 2 +- include/vrp/pd_problem.hpp | 2 +- include/vrp/pickDeliver.hpp | 8 ++++---- include/vrp/tw_node.hpp | 2 +- include/withPoints/withPoints.hpp | 10 +++++----- include/yen/ksp.hpp | 12 ++++++------ include/yen/turnRestrictedPath.hpp | 15 +++++++-------- src/bellman_ford/bellman_ford_neg_driver.cpp | 13 ++++++------- 65 files changed, 276 insertions(+), 280 deletions(-) diff --git a/include/allpairs/allpairs.hpp b/include/allpairs/allpairs.hpp index aad39324a0..a5058c96f9 100644 --- a/include/allpairs/allpairs.hpp +++ b/include/allpairs/allpairs.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_allpairs.hpp +File: allpairs.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // http://www.cs.rpi.edu/~musser/archive/2005/gsd/restricted/FloydWarshall/FloydWarshall.pdf -#ifndef INCLUDE_ALLPAIRS_PGR_ALLPAIRS_HPP_ -#define INCLUDE_ALLPAIRS_PGR_ALLPAIRS_HPP_ +#ifndef INCLUDE_ALLPAIRS_ALLPAIRS_HPP_ +#define INCLUDE_ALLPAIRS_ALLPAIRS_HPP_ #pragma once #include @@ -44,11 +44,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/iid_t_rt.h" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" // TODO(vicky) don't keep it here -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" namespace pgrouting { template < class G > class Pgr_allpairs; @@ -263,4 +263,4 @@ class Pgr_allpairs { } // namespace pgrouting -#endif // INCLUDE_ALLPAIRS_PGR_ALLPAIRS_HPP_ +#endif // INCLUDE_ALLPAIRS_ALLPAIRS_HPP_ diff --git a/include/alphaShape/alphaShape.hpp b/include/alphaShape/alphaShape.hpp index ba79bb3c27..2dd463180c 100644 --- a/include/alphaShape/alphaShape.hpp +++ b/include/alphaShape/alphaShape.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_alphaShape.hpp +File: alphaShape.hpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_ -#define INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_ +#ifndef INCLUDE_ALPHASHAPE_ALPHASHAPE_HPP_ +#define INCLUDE_ALPHASHAPE_ALPHASHAPE_HPP_ #pragma once #ifndef __cplusplus @@ -40,9 +40,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/edge_xy_t.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/bline.hpp" @@ -99,4 +99,4 @@ class Pgr_alphaShape : public Pgr_messages { } // namespace alphashape } // namespace pgrouting -#endif // INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_ +#endif // INCLUDE_ALPHASHAPE_ALPHASHAPE_HPP_ diff --git a/include/astar/astar.hpp b/include/astar/astar.hpp index 10e466e62e..32736025f0 100644 --- a/include/astar/astar.hpp +++ b/include/astar/astar.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_ASTAR_PGR_ASTAR_HPP_ -#define INCLUDE_ASTAR_PGR_ASTAR_HPP_ +#ifndef INCLUDE_ASTAR_ASTAR_HPP_ +#define INCLUDE_ASTAR_ASTAR_HPP_ #pragma once #include @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "visitors/astar_visitors.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" @@ -206,4 +206,4 @@ std::deque astar( } // namespace algorithms } // namespace pgrouting -#endif // INCLUDE_ASTAR_PGR_ASTAR_HPP_ +#endif // INCLUDE_ASTAR_ASTAR_HPP_ diff --git a/include/bdAstar/bdAstar.hpp b/include/bdAstar/bdAstar.hpp index 3834486b76..cbaa86a308 100644 --- a/include/bdAstar/bdAstar.hpp +++ b/include/bdAstar/bdAstar.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_BDASTAR_PGR_BDASTAR_HPP_ -#define INCLUDE_BDASTAR_PGR_BDASTAR_HPP_ +#ifndef INCLUDE_BDASTAR_BDASTAR_HPP_ +#define INCLUDE_BDASTAR_BDASTAR_HPP_ #pragma once @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_bidirectional.hpp" +#include "cpp_common/bidirectional.hpp" #include "cpp_common/basePath_SSEC.hpp" namespace pgrouting { @@ -223,4 +223,4 @@ std::deque bdastar( } // namespace algorithms } // namespace pgrouting -#endif // INCLUDE_BDASTAR_PGR_BDASTAR_HPP_ +#endif // INCLUDE_BDASTAR_BDASTAR_HPP_ diff --git a/include/bdDijkstra/bdDijkstra.hpp b/include/bdDijkstra/bdDijkstra.hpp index 8bd5c444c6..c698430b97 100644 --- a/include/bdDijkstra/bdDijkstra.hpp +++ b/include/bdDijkstra/bdDijkstra.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_bdDijkstra.hpp +File: bdDijkstra.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,13 +25,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_BDDIJKSTRA_PGR_BDDIJKSTRA_HPP_ -#define INCLUDE_BDDIJKSTRA_PGR_BDDIJKSTRA_HPP_ +#ifndef INCLUDE_BDDIJKSTRA_BDDIJKSTRA_HPP_ +#define INCLUDE_BDDIJKSTRA_BDDIJKSTRA_HPP_ #pragma once - -#include "cpp_common/pgr_bidirectional.hpp" - #include #include #include @@ -40,6 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include +#include "cpp_common/bidirectional.hpp" #include "cpp_common/basePath_SSEC.hpp" @@ -145,4 +143,4 @@ class Pgr_bdDijkstra : public Pgr_bidirectional { } // namespace bidirectional } // namespace pgrouting -#endif // INCLUDE_BDDIJKSTRA_PGR_BDDIJKSTRA_HPP_ +#endif // INCLUDE_BDDIJKSTRA_BDDIJKSTRA_HPP_ diff --git a/include/bellman_ford/bellman_ford.hpp b/include/bellman_ford/bellman_ford.hpp index f182536e12..4595f457d9 100644 --- a/include/bellman_ford/bellman_ford.hpp +++ b/include/bellman_ford/bellman_ford.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_bellman_ford.hpp +File: bellman_ford.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_BELLMAN_FORD_PGR_BELLMAN_FORD_HPP_ -#define INCLUDE_BELLMAN_FORD_PGR_BELLMAN_FORD_HPP_ +#ifndef INCLUDE_BELLMAN_FORD_BELLMAN_FORD_HPP_ +#define INCLUDE_BELLMAN_FORD_BELLMAN_FORD_HPP_ #pragma once #include @@ -41,9 +41,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" @@ -334,4 +334,4 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { } // namespace pgrouting -#endif // INCLUDE_BELLMAN_FORD_PGR_BELLMAN_FORD_HPP_ +#endif // INCLUDE_BELLMAN_FORD_BELLMAN_FORD_HPP_ diff --git a/include/bellman_ford/edwardMoore.hpp b/include/bellman_ford/edwardMoore.hpp index db02c5facd..30a235dd05 100644 --- a/include/bellman_ford/edwardMoore.hpp +++ b/include/bellman_ford/edwardMoore.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_edwardMoore.hpp +File: edwardMoore.hpp Copyright (c) 2019 pgRouting developers Mail: project@pgrouting.org @@ -20,8 +20,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_BELLMAN_FORD_PGR_EDWARDMOORE_HPP_ -#define INCLUDE_BELLMAN_FORD_PGR_EDWARDMOORE_HPP_ +#ifndef INCLUDE_BELLMAN_FORD_EDWARDMOORE_HPP_ +#define INCLUDE_BELLMAN_FORD_EDWARDMOORE_HPP_ #pragma once #include @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" @@ -262,4 +262,4 @@ class Pgr_edwardMoore { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_BELLMAN_FORD_PGR_EDWARDMOORE_HPP_ +#endif // INCLUDE_BELLMAN_FORD_EDWARDMOORE_HPP_ diff --git a/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp b/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp index 6fd53e63b4..37821181c0 100644 --- a/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp +++ b/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_binaryBreadthFirstSearch.hpp +File: binaryBreadthFirstSearch.hpp Copyright (c) 2019 pgRouting developers Mail: project@pgrouting.org @@ -21,8 +21,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_BREADTHFIRSTSEARCH_PGR_BINARYBREADTHFIRSTSEARCH_HPP_ -#define INCLUDE_BREADTHFIRSTSEARCH_PGR_BINARYBREADTHFIRSTSEARCH_HPP_ +#ifndef INCLUDE_BREADTHFIRSTSEARCH_BINARYBREADTHFIRSTSEARCH_HPP_ +#define INCLUDE_BREADTHFIRSTSEARCH_BINARYBREADTHFIRSTSEARCH_HPP_ #pragma once #include @@ -34,8 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/base_graph.hpp" +#include "cpp_common/assert.hpp" #include "c_types/ii_t_rt.h" @@ -243,4 +243,4 @@ class Pgr_binaryBreadthFirstSearch { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_BREADTHFIRSTSEARCH_PGR_BINARYBREADTHFIRSTSEARCH_HPP_ +#endif // INCLUDE_BREADTHFIRSTSEARCH_BINARYBREADTHFIRSTSEARCH_HPP_ diff --git a/include/breadthFirstSearch/breadthFirstSearch.hpp b/include/breadthFirstSearch/breadthFirstSearch.hpp index 3a123fed47..7dd474b04e 100644 --- a/include/breadthFirstSearch/breadthFirstSearch.hpp +++ b/include/breadthFirstSearch/breadthFirstSearch.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_breadthFirstSearch.hpp +File: breadthFirstSearch.hpp Copyright (c) 2019 pgRouting developers Mail: project@pgrouting.org @@ -21,8 +21,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_BREADTHFIRSTSEARCH_PGR_BREADTHFIRSTSEARCH_HPP_ -#define INCLUDE_BREADTHFIRSTSEARCH_PGR_BREADTHFIRSTSEARCH_HPP_ +#ifndef INCLUDE_BREADTHFIRSTSEARCH_BREADTHFIRSTSEARCH_HPP_ +#define INCLUDE_BREADTHFIRSTSEARCH_BREADTHFIRSTSEARCH_HPP_ #pragma once #include @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/mst_rt.h" @@ -111,4 +111,4 @@ class Pgr_breadthFirstSearch { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_BREADTHFIRSTSEARCH_PGR_BREADTHFIRSTSEARCH_HPP_ +#endif // INCLUDE_BREADTHFIRSTSEARCH_BREADTHFIRSTSEARCH_HPP_ diff --git a/include/chinese/chinesePostman.hpp b/include/chinese/chinesePostman.hpp index 274407d203..fe4d529a1e 100644 --- a/include/chinese/chinesePostman.hpp +++ b/include/chinese/chinesePostman.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_chinesePostman.hpp +File: chinesePostman.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CHINESE_PGR_CHINESEPOSTMAN_HPP_ -#define INCLUDE_CHINESE_PGR_CHINESEPOSTMAN_HPP_ +#ifndef INCLUDE_CHINESE_CHINESEPOSTMAN_HPP_ +#define INCLUDE_CHINESE_CHINESEPOSTMAN_HPP_ #pragma once #include @@ -36,11 +36,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "max_flow/pgr_minCostMaxFlow.hpp" +#include "max_flow/minCostMaxFlow.hpp" #include "c_types/path_rt.h" #include "cpp_common/edge_t.hpp" #include "c_types/flow_t.h" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/identifiers.hpp" @@ -332,4 +332,4 @@ PgrDirectedChPPGraph::BuildResultGraph() { } // namespace graph } // namespace pgrouting -#endif // INCLUDE_CHINESE_PGR_CHINESEPOSTMAN_HPP_ +#endif // INCLUDE_CHINESE_CHINESEPOSTMAN_HPP_ diff --git a/include/circuits/hawickcircuits.hpp b/include/circuits/hawickcircuits.hpp index e9c06a427c..2367ecbe73 100644 --- a/include/circuits/hawickcircuits.hpp +++ b/include/circuits/hawickcircuits.hpp @@ -38,9 +38,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "c_types/circuits_rt.h" /** diff --git a/include/coloring/bipartite_driver.hpp b/include/coloring/bipartite_driver.hpp index 50fc21b6e2..10589a5523 100644 --- a/include/coloring/bipartite_driver.hpp +++ b/include/coloring/bipartite_driver.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_bipartite_driver.hpp +File: bipartite_driver.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_COLORING_PGR_BIPARTITE_DRIVER_HPP_ -#define INCLUDE_COLORING_PGR_BIPARTITE_DRIVER_HPP_ +#ifndef INCLUDE_COLORING_BIPARTITE_DRIVER_HPP_ +#define INCLUDE_COLORING_BIPARTITE_DRIVER_HPP_ #pragma once #include @@ -41,8 +41,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/base_graph.hpp" +#include "cpp_common/messages.hpp" #include "cpp_common/interruption.hpp" typedef struct II_t_rt II_t_rt; #include "c_types/ii_t_rt.h" @@ -93,4 +93,4 @@ class Pgr_Bipartite : public pgrouting::Pgr_messages { }; } // namespace functions } // namespace pgrouting -#endif // INCLUDE_COLORING_PGR_BIPARTITE_DRIVER_HPP_ +#endif // INCLUDE_COLORING_BIPARTITE_DRIVER_HPP_ diff --git a/include/coloring/edgeColoring.hpp b/include/coloring/edgeColoring.hpp index f697ea967a..897b3f4ace 100644 --- a/include/coloring/edgeColoring.hpp +++ b/include/coloring/edgeColoring.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_edgeColoring.hpp +File: edgeColoring.hpp Generated with Template by: Copyright (c) 2021 pgRouting developers @@ -23,8 +23,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_COLORING_PGR_EDGECOLORING_HPP_ -#define INCLUDE_COLORING_PGR_EDGECOLORING_HPP_ +#ifndef INCLUDE_COLORING_EDGECOLORING_HPP_ +#define INCLUDE_COLORING_EDGECOLORING_HPP_ #pragma once #include @@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/edge_t.hpp" #include "c_types/ii_t_rt.h" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/messages.hpp" namespace pgrouting { namespace functions { @@ -80,4 +80,4 @@ class Pgr_edgeColoring : public Pgr_messages { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_COLORING_PGR_EDGECOLORING_HPP_ +#endif // INCLUDE_COLORING_EDGECOLORING_HPP_ diff --git a/include/coloring/sequentialVertexColoring.hpp b/include/coloring/sequentialVertexColoring.hpp index 4e05132800..d9d3d117aa 100644 --- a/include/coloring/sequentialVertexColoring.hpp +++ b/include/coloring/sequentialVertexColoring.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_sequentialVertexColoring.hpp +File: sequentialVertexColoring.hpp Copyright (c) 2020 pgRouting developers Mail: project@pgrouting.org @@ -21,8 +21,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_COLORING_PGR_SEQUENTIALVERTEXCOLORING_HPP_ -#define INCLUDE_COLORING_PGR_SEQUENTIALVERTEXCOLORING_HPP_ +#ifndef INCLUDE_COLORING_SEQUENTIALVERTEXCOLORING_HPP_ +#define INCLUDE_COLORING_SEQUENTIALVERTEXCOLORING_HPP_ #pragma once #include @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" @@ -146,4 +146,4 @@ class Pgr_sequentialVertexColoring { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_COLORING_PGR_SEQUENTIALVERTEXCOLORING_HPP_ +#endif // INCLUDE_COLORING_SEQUENTIALVERTEXCOLORING_HPP_ diff --git a/include/components/components.hpp b/include/components/components.hpp index 09f500c837..350bcc1738 100644 --- a/include/components/components.hpp +++ b/include/components/components.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_components.hpp +File: components.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_COMPONENTS_PGR_COMPONENTS_HPP_ -#define INCLUDE_COMPONENTS_PGR_COMPONENTS_HPP_ +#ifndef INCLUDE_COMPONENTS_COMPONENTS_HPP_ +#define INCLUDE_COMPONENTS_COMPONENTS_HPP_ #pragma once #include @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/identifiers.hpp" #include "components/componentsResult.hpp" @@ -72,4 +72,4 @@ bridges(pgrouting::UndirectedGraph &graph); } // namespace algorithms } // namespace pgrouting -#endif // INCLUDE_COMPONENTS_PGR_COMPONENTS_HPP_ +#endif // INCLUDE_COMPONENTS_COMPONENTS_HPP_ diff --git a/include/components/makeConnected.hpp b/include/components/makeConnected.hpp index 822d8c2b71..89dbc3272b 100644 --- a/include/components/makeConnected.hpp +++ b/include/components/makeConnected.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_makeConnected.hpp +File: makeConnected.hpp Copyright (c) 2020 pgRouting developers Mail: project@pgrouting.org @@ -21,8 +21,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_COMPONENTS_PGR_MAKECONNECTED_HPP_ -#define INCLUDE_COMPONENTS_PGR_MAKECONNECTED_HPP_ +#ifndef INCLUDE_COMPONENTS_MAKECONNECTED_HPP_ +#define INCLUDE_COMPONENTS_MAKECONNECTED_HPP_ #pragma once #include @@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_types/ii_t_rt.h" -#include "cpp_common/pgr_messages.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/messages.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" //****************************************** @@ -99,4 +99,4 @@ class Pgr_makeConnected : public pgrouting::Pgr_messages { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_COMPONENTS_PGR_MAKECONNECTED_HPP_ +#endif // INCLUDE_COMPONENTS_MAKECONNECTED_HPP_ diff --git a/include/contraction/ch_graphs.hpp b/include/contraction/ch_graphs.hpp index 8d22a4b12d..c71b99d06d 100644 --- a/include/contraction/ch_graphs.hpp +++ b/include/contraction/ch_graphs.hpp @@ -36,8 +36,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "contraction/pgr_contractionGraph.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "contraction/contractionGraph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/ch_vertex.hpp" #include "cpp_common/ch_edge.hpp" diff --git a/include/contraction/contract.hpp b/include/contraction/contract.hpp index 15daf4274a..474b6f5fa5 100644 --- a/include/contraction/contract.hpp +++ b/include/contraction/contract.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_contract.hpp +File: contract.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -27,18 +27,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CONTRACTION_PGR_CONTRACT_HPP_ -#define INCLUDE_CONTRACTION_PGR_CONTRACT_HPP_ +#ifndef INCLUDE_CONTRACTION_CONTRACT_HPP_ +#define INCLUDE_CONTRACTION_CONTRACT_HPP_ #pragma once #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" -#include "contraction/pgr_contractionGraph.hpp" +#include "contraction/contractionGraph.hpp" #include "contraction/ch_graphs.hpp" -#include "contraction/pgr_linearContraction.hpp" -#include "contraction/pgr_deadEndContraction.hpp" +#include "contraction/linearContraction.hpp" +#include "contraction/deadEndContraction.hpp" namespace pgrouting { namespace contraction { @@ -131,4 +131,4 @@ class Pgr_contract { } // namespace contraction } // namespace pgrouting -#endif // INCLUDE_CONTRACTION_PGR_CONTRACT_HPP_ +#endif // INCLUDE_CONTRACTION_CONTRACT_HPP_ diff --git a/include/contraction/contractionGraph.hpp b/include/contraction/contractionGraph.hpp index 6c7df2d658..75cd790ec9 100644 --- a/include/contraction/contractionGraph.hpp +++ b/include/contraction/contractionGraph.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_contractionGraph.hpp +File: contractionGraph.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CONTRACTION_PGR_CONTRACTIONGRAPH_HPP_ -#define INCLUDE_CONTRACTION_PGR_CONTRACTIONGRAPH_HPP_ +#ifndef INCLUDE_CONTRACTION_CONTRACTIONGRAPH_HPP_ +#define INCLUDE_CONTRACTION_CONTRACTIONGRAPH_HPP_ #pragma once #include @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/ch_vertex.hpp" #include "cpp_common/ch_edge.hpp" @@ -259,4 +259,4 @@ class Pgr_contractionGraph : public Pgr_base_graph @@ -69,7 +69,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * Example: * @code #include - #include "cpp_common/pgr_assert.hpp" + #include "cpp_common/assert.hpp" int main() { @@ -148,4 +148,4 @@ class AssertFailedException : public std::exception { virtual ~AssertFailedException() throw() {} }; -#endif // INCLUDE_CPP_COMMON_PGR_ASSERT_HPP_ +#endif // INCLUDE_CPP_COMMON_ASSERT_HPP_ diff --git a/include/cpp_common/basePath_SSEC.hpp b/include/cpp_common/basePath_SSEC.hpp index 9423648e71..aa7d4017fc 100644 --- a/include/cpp_common/basePath_SSEC.hpp +++ b/include/cpp_common/basePath_SSEC.hpp @@ -45,7 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/path_rt.h" #include "c_types/mst_rt.h" #include "cpp_common/path_t.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/rule.hpp" namespace pgrouting { diff --git a/include/cpp_common/base_graph.hpp b/include/cpp_common/base_graph.hpp index bfad93febc..72efb41d13 100644 --- a/include/cpp_common/base_graph.hpp +++ b/include/cpp_common/base_graph.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_base_graph.hpp +File: base_graph.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /** @file */ -#ifndef INCLUDE_CPP_COMMON_PGR_BASE_GRAPH_HPP_ -#define INCLUDE_CPP_COMMON_PGR_BASE_GRAPH_HPP_ +#ifndef INCLUDE_CPP_COMMON_BASE_GRAPH_HPP_ +#define INCLUDE_CPP_COMMON_BASE_GRAPH_HPP_ #pragma once #include @@ -46,7 +46,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/xy_vertex.hpp" #include "cpp_common/basic_edge.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { @@ -874,4 +874,4 @@ class Pgr_base_graph { } // namespace graph } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_PGR_BASE_GRAPH_HPP_ +#endif // INCLUDE_CPP_COMMON_BASE_GRAPH_HPP_ diff --git a/include/cpp_common/bidirectional.hpp b/include/cpp_common/bidirectional.hpp index aa8a2f9d1f..ded4d8129b 100644 --- a/include/cpp_common/bidirectional.hpp +++ b/include/cpp_common/bidirectional.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_bidirectional.hpp +File: bidirectional.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_CPP_COMMON_PGR_BIDIRECTIONAL_HPP_ -#define INCLUDE_CPP_COMMON_PGR_BIDIRECTIONAL_HPP_ +#ifndef INCLUDE_CPP_COMMON_BIDIRECTIONAL_HPP_ +#define INCLUDE_CPP_COMMON_BIDIRECTIONAL_HPP_ #pragma once @@ -46,10 +46,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" namespace pgrouting { @@ -241,4 +241,4 @@ class Pgr_bidirectional { } // namespace bidirectional } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_PGR_BIDIRECTIONAL_HPP_ +#endif // INCLUDE_CPP_COMMON_BIDIRECTIONAL_HPP_ diff --git a/include/cpp_common/get_data.hpp b/include/cpp_common/get_data.hpp index 851dd232f6..b9b93393c0 100644 --- a/include/cpp_common/get_data.hpp +++ b/include/cpp_common/get_data.hpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/info_t.hpp" #include "cpp_common/get_check_data.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" namespace pgrouting { diff --git a/include/cpp_common/messages.hpp b/include/cpp_common/messages.hpp index f85bdf7978..2f87b1075e 100644 --- a/include/cpp_common/messages.hpp +++ b/include/cpp_common/messages.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_messages.hpp +File: messages.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_CPP_COMMON_PGR_MESSAGES_HPP_ -#define INCLUDE_CPP_COMMON_PGR_MESSAGES_HPP_ +#ifndef INCLUDE_CPP_COMMON_MESSAGES_HPP_ +#define INCLUDE_CPP_COMMON_MESSAGES_HPP_ #pragma once @@ -98,4 +98,4 @@ class Pgr_messages { } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_PGR_MESSAGES_HPP_ +#endif // INCLUDE_CPP_COMMON_MESSAGES_HPP_ diff --git a/include/cpp_common/orders_t.hpp b/include/cpp_common/orders_t.hpp index 9c124d274f..1c6e58897c 100644 --- a/include/cpp_common/orders_t.hpp +++ b/include/cpp_common/orders_t.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_CPP_COMMON_PICKDELIVER_ORDERS_T_HPP_ -#define INCLUDE_CPP_COMMON_PICKDELIVER_ORDERS_T_HPP_ +#ifndef INCLUDE_CPP_COMMON_ORDERS_T_HPP_ +#define INCLUDE_CPP_COMMON_ORDERS_T_HPP_ #pragma once #include @@ -53,4 +53,4 @@ struct Orders_t { double deliver_service_t; }; -#endif // INCLUDE_CPP_COMMON_PICKDELIVER_ORDERS_T_HPP_ +#endif // INCLUDE_CPP_COMMON_ORDERS_T_HPP_ diff --git a/include/cpp_common/pgdata_getters.hpp b/include/cpp_common/pgdata_getters.hpp index 9d47bb5f52..dcbd8c9e5b 100644 --- a/include/cpp_common/pgdata_getters.hpp +++ b/include/cpp_common/pgdata_getters.hpp @@ -112,4 +112,4 @@ std::vector get_vehicles(const std::string&, bool); } // namespace pgget } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_PGGET_HPP_ +#endif // INCLUDE_CPP_COMMON_PGDATA_GETTERS_HPP_ diff --git a/include/cpp_common/vehicle_t.hpp b/include/cpp_common/vehicle_t.hpp index 7af8224a2c..c469d86a0b 100644 --- a/include/cpp_common/vehicle_t.hpp +++ b/include/cpp_common/vehicle_t.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_CPP_COMMON_VEHICLE_T_H_ -#define INCLUDE_CPP_COMMON_VEHICLE_T_H_ +#ifndef INCLUDE_CPP_COMMON_VEHICLE_T_HPP_ +#define INCLUDE_CPP_COMMON_VEHICLE_T_HPP_ #pragma once #include @@ -57,4 +57,4 @@ struct Vehicle_t { }; -#endif // INCLUDE_CPP_COMMON_VEHICLE_T_H_ +#endif // INCLUDE_CPP_COMMON_VEHICLE_T_HPP_ diff --git a/include/dagShortestPath/dagShortestPath.hpp b/include/dagShortestPath/dagShortestPath.hpp index a42bc70846..bdd75989da 100644 --- a/include/dagShortestPath/dagShortestPath.hpp +++ b/include/dagShortestPath/dagShortestPath.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_dagShortestPath.hpp +File: dagShortestPath.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DAGSHORTESTPATH_PGR_DAGSHORTESTPATH_HPP_ -#define INCLUDE_DAGSHORTESTPATH_PGR_DAGSHORTESTPATH_HPP_ +#ifndef INCLUDE_DAGSHORTESTPATH_DAGSHORTESTPATH_HPP_ +#define INCLUDE_DAGSHORTESTPATH_DAGSHORTESTPATH_HPP_ #pragma once #include @@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" @@ -349,4 +349,4 @@ class Pgr_dag { } // namespace pgrouting -#endif // INCLUDE_DAGSHORTESTPATH_PGR_DAGSHORTESTPATH_HPP_ +#endif // INCLUDE_DAGSHORTESTPATH_DAGSHORTESTPATH_HPP_ diff --git a/include/dijkstra/dijkstra.hpp b/include/dijkstra/dijkstra.hpp index b8330604f5..a51505d7fa 100644 --- a/include/dijkstra/dijkstra.hpp +++ b/include/dijkstra/dijkstra.hpp @@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DIJKSTRA_PGR_DIJKSTRA_HPP_ -#define INCLUDE_DIJKSTRA_PGR_DIJKSTRA_HPP_ +#ifndef INCLUDE_DIJKSTRA_DIJKSTRA_HPP_ +#define INCLUDE_DIJKSTRA_DIJKSTRA_HPP_ #pragma once #include @@ -51,7 +51,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/ii_t_rt.h" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "visitors/dijkstra_visitors.hpp" @@ -191,4 +191,4 @@ Path dijkstra( } // namespace pgrouting -#endif // INCLUDE_DIJKSTRA_PGR_DIJKSTRA_HPP_ +#endif // INCLUDE_DIJKSTRA_DIJKSTRA_HPP_ diff --git a/include/dijkstra/dijkstraVia.hpp b/include/dijkstra/dijkstraVia.hpp index d00f4da9bb..0287870f90 100644 --- a/include/dijkstra/dijkstraVia.hpp +++ b/include/dijkstra/dijkstraVia.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_dijkstraVia.hpp +File: dijkstraVia.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DIJKSTRA_PGR_DIJKSTRAVIA_HPP_ -#define INCLUDE_DIJKSTRA_PGR_DIJKSTRAVIA_HPP_ +#ifndef INCLUDE_DIJKSTRA_DIJKSTRAVIA_HPP_ +#define INCLUDE_DIJKSTRA_DIJKSTRAVIA_HPP_ #pragma once #include @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "dijkstra/dijkstra.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { @@ -122,4 +122,4 @@ pgr_dijkstraVia( } // namespace pgrouting -#endif // INCLUDE_DIJKSTRA_PGR_DIJKSTRAVIA_HPP_ +#endif // INCLUDE_DIJKSTRA_DIJKSTRAVIA_HPP_ diff --git a/include/dijkstra/drivingDist.hpp b/include/dijkstra/drivingDist.hpp index 856eddad4d..39858e4bf5 100644 --- a/include/dijkstra/drivingDist.hpp +++ b/include/dijkstra/drivingDist.hpp @@ -33,8 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DIJKSTRA_DRIVEDIST_HPP_ -#define INCLUDE_DIJKSTRA_DRIVEDIST_HPP_ +#ifndef INCLUDE_DIJKSTRA_DRIVINGDIST_HPP_ +#define INCLUDE_DIJKSTRA_DRIVINGDIST_HPP_ #pragma once #include @@ -51,7 +51,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "visitors/dijkstra_visitors.hpp" @@ -512,4 +512,4 @@ std::deque drivingDistance( } // namespace pgrouting -#endif // INCLUDE_DIJKSTRA_DRIVEDIST_HPP_ +#endif // INCLUDE_DIJKSTRA_DRIVINGDIST_HPP_ diff --git a/include/dominator/lengauerTarjanDominatorTree_driver.hpp b/include/dominator/lengauerTarjanDominatorTree_driver.hpp index 75f01ae137..52c1d844a8 100644 --- a/include/dominator/lengauerTarjanDominatorTree_driver.hpp +++ b/include/dominator/lengauerTarjanDominatorTree_driver.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_lengauerTarjanDominatorTree_driver.hpp +File: lengauerTarjanDominatorTree_driver.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DOMINATOR_PGR_LENGAUERTARJANDOMINATORTREE_DRIVER_HPP_ -#define INCLUDE_DOMINATOR_PGR_LENGAUERTARJANDOMINATORTREE_DRIVER_HPP_ +#ifndef INCLUDE_DOMINATOR_LENGAUERTARJANDOMINATORTREE_DRIVER_HPP_ +#define INCLUDE_DOMINATOR_LENGAUERTARJANDOMINATORTREE_DRIVER_HPP_ #pragma once #include @@ -42,8 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/interruption.hpp" -#include "cpp_common/pgr_messages.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/messages.hpp" +#include "cpp_common/base_graph.hpp" #include "c_types/ii_t_rt.h" @@ -92,5 +92,5 @@ class Pgr_LTDTree : public pgrouting::Pgr_messages { }; } // namespace functions } // namespace pgrouting -#endif // INCLUDE_DOMINATOR_PGR_LENGAUERTARJANDOMINATORTREE_DRIVER_HPP_ +#endif // INCLUDE_DOMINATOR_LENGAUERTARJANDOMINATORTREE_DRIVER_HPP_ diff --git a/include/lineGraph/lineGraphFull.hpp b/include/lineGraph/lineGraphFull.hpp index 01a9bb87a0..c645e8ac33 100644 --- a/include/lineGraph/lineGraphFull.hpp +++ b/include/lineGraph/lineGraphFull.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_lineGraphFull.hpp +File: lineGraphFull.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_LINEGRAPH_PGR_LINEGRAPHFULL_HPP_ -#define INCLUDE_LINEGRAPH_PGR_LINEGRAPHFULL_HPP_ +#ifndef INCLUDE_LINEGRAPH_LINEGRAPHFULL_HPP_ +#define INCLUDE_LINEGRAPH_LINEGRAPHFULL_HPP_ #pragma once @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include"c_types/line_graph_full_rt.h" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/line_vertex.hpp" namespace pgrouting { @@ -307,4 +307,4 @@ class Pgr_lineGraphFull : public Pgr_base_graph { } // namespace graph } // namespace pgrouting -#endif // INCLUDE_LINEGRAPH_PGR_LINEGRAPHFULL_HPP_ +#endif // INCLUDE_LINEGRAPH_LINEGRAPHFULL_HPP_ diff --git a/include/max_flow/costFlowGraph.hpp b/include/max_flow/costFlowGraph.hpp index 9a6ea25bf4..73c45c0036 100644 --- a/include/max_flow/costFlowGraph.hpp +++ b/include/max_flow/costFlowGraph.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_costFlowGraph.hpp +File: costFlowGraph.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_MAX_FLOW_PGR_COSTFLOWGRAPH_HPP_ -#define INCLUDE_MAX_FLOW_PGR_COSTFLOWGRAPH_HPP_ +#ifndef INCLUDE_MAX_FLOW_COSTFLOWGRAPH_HPP_ +#define INCLUDE_MAX_FLOW_COSTFLOWGRAPH_HPP_ #pragma once #include @@ -58,4 +58,4 @@ typedef boost::property_map < CostFlowGraph, } // namespace pgrouting -#endif // INCLUDE_MAX_FLOW_PGR_COSTFLOWGRAPH_HPP_ +#endif // INCLUDE_MAX_FLOW_COSTFLOWGRAPH_HPP_ diff --git a/include/max_flow/flowgraph.hpp b/include/max_flow/flowgraph.hpp index 316d4de95f..dfd9b2fe36 100644 --- a/include/max_flow/flowgraph.hpp +++ b/include/max_flow/flowgraph.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_flowgraph.hpp +File: flowgraph.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_MAX_FLOW_PGR_FLOWGRAPH_HPP_ -#define INCLUDE_MAX_FLOW_PGR_FLOWGRAPH_HPP_ +#ifndef INCLUDE_MAX_FLOW_FLOWGRAPH_HPP_ +#define INCLUDE_MAX_FLOW_FLOWGRAPH_HPP_ #pragma once #include @@ -52,4 +52,4 @@ typedef boost::adjacency_list @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "max_flow/pgr_flowgraph.hpp" +#include "max_flow/flowgraph.hpp" #include #include #include @@ -198,4 +198,4 @@ class PgrFlowGraph { } // namespace graph } // namespace pgrouting -#endif // INCLUDE_MAX_FLOW_PGR_MAXFLOW_HPP_ +#endif // INCLUDE_MAX_FLOW_MAXFLOW_HPP_ diff --git a/include/max_flow/maximumcardinalitymatching.hpp b/include/max_flow/maximumcardinalitymatching.hpp index 22c85e28ac..f10b2bd0e7 100644 --- a/include/max_flow/maximumcardinalitymatching.hpp +++ b/include/max_flow/maximumcardinalitymatching.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_maximumcardinalitymatching.hpp +File: maximumcardinalitymatching.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_MAX_FLOW_PGR_MAXIMUMCARDINALITYMATCHING_HPP_ -#define INCLUDE_MAX_FLOW_PGR_MAXIMUMCARDINALITYMATCHING_HPP_ +#ifndef INCLUDE_MAX_FLOW_MAXIMUMCARDINALITYMATCHING_HPP_ +#define INCLUDE_MAX_FLOW_MAXIMUMCARDINALITYMATCHING_HPP_ #pragma once #include @@ -152,4 +152,4 @@ class PgrCardinalityGraph { } // namespace flow } // namespace pgrouting -#endif // INCLUDE_MAX_FLOW_PGR_MAXIMUMCARDINALITYMATCHING_HPP_ +#endif // INCLUDE_MAX_FLOW_MAXIMUMCARDINALITYMATCHING_HPP_ diff --git a/include/max_flow/minCostMaxFlow.hpp b/include/max_flow/minCostMaxFlow.hpp index 596e72f96e..3d91bb2683 100644 --- a/include/max_flow/minCostMaxFlow.hpp +++ b/include/max_flow/minCostMaxFlow.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_minCostMaxFlow.hpp +File: minCostMaxFlow.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_MAX_FLOW_PGR_MINCOSTMAXFLOW_HPP_ -#define INCLUDE_MAX_FLOW_PGR_MINCOSTMAXFLOW_HPP_ +#ifndef INCLUDE_MAX_FLOW_MINCOSTMAXFLOW_HPP_ +#define INCLUDE_MAX_FLOW_MINCOSTMAXFLOW_HPP_ #pragma once #include @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/flow_t.h" #include "cpp_common/costFlow_t.hpp" -#include "max_flow/pgr_costFlowGraph.hpp" +#include "max_flow/costFlowGraph.hpp" namespace pgrouting { namespace graph { @@ -146,4 +146,4 @@ class PgrCostFlowGraph { } // namespace graph } // namespace pgrouting -#endif // INCLUDE_MAX_FLOW_PGR_MINCOSTMAXFLOW_HPP_ +#endif // INCLUDE_MAX_FLOW_MINCOSTMAXFLOW_HPP_ diff --git a/include/metrics/betweennessCentrality.hpp b/include/metrics/betweennessCentrality.hpp index 1277e94caa..8b145c0986 100644 --- a/include/metrics/betweennessCentrality.hpp +++ b/include/metrics/betweennessCentrality.hpp @@ -41,9 +41,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/iid_t_rt.h" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" namespace pgrouting { template class Pgr_metrics; diff --git a/include/mincut/stoerWagner.hpp b/include/mincut/stoerWagner.hpp index e8ca146950..a70a401969 100644 --- a/include/mincut/stoerWagner.hpp +++ b/include/mincut/stoerWagner.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_stoerWagner.hpp +File: stoerWagner.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_MINCUT_PGR_STOERWAGNER_HPP_ -#define INCLUDE_MINCUT_PGR_STOERWAGNER_HPP_ +#ifndef INCLUDE_MINCUT_STOERWAGNER_HPP_ +#define INCLUDE_MINCUT_STOERWAGNER_HPP_ #pragma once #include @@ -45,7 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "c_types/stoerWagner_t.h" @@ -118,4 +118,4 @@ Pgr_stoerWagner< G >::stoerWagner( } -#endif // INCLUDE_MINCUT_PGR_STOERWAGNER_HPP_ +#endif // INCLUDE_MINCUT_STOERWAGNER_HPP_ diff --git a/include/ordering/cuthillMckeeOrdering.hpp b/include/ordering/cuthillMckeeOrdering.hpp index b923031777..29997bf3fd 100644 --- a/include/ordering/cuthillMckeeOrdering.hpp +++ b/include/ordering/cuthillMckeeOrdering.hpp @@ -42,9 +42,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" #include "c_types/ii_t_rt.h" diff --git a/include/planar/boyerMyrvold.hpp b/include/planar/boyerMyrvold.hpp index 35cb8ae985..2c8258df5b 100644 --- a/include/planar/boyerMyrvold.hpp +++ b/include/planar/boyerMyrvold.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_boyerMyrvold.hpp +File: boyerMyrvold.hpp Copyright (c) 2020 pgRouting developers Mail: project@pgrouting.org @@ -21,8 +21,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_PLANAR_PGR_BOYERMYRVOLD_HPP_ -#define INCLUDE_PLANAR_PGR_BOYERMYRVOLD_HPP_ +#ifndef INCLUDE_PLANAR_BOYERMYRVOLD_HPP_ +#define INCLUDE_PLANAR_BOYERMYRVOLD_HPP_ #pragma once #include @@ -35,8 +35,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_messages.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/messages.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/iid_t_rt.h" //****************************************** @@ -89,4 +89,4 @@ class Pgr_boyerMyrvold : public pgrouting::Pgr_messages { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_PLANAR_PGR_BOYERMYRVOLD_HPP_ +#endif // INCLUDE_PLANAR_BOYERMYRVOLD_HPP_ diff --git a/include/spanningTree/kruskal.hpp b/include/spanningTree/kruskal.hpp index 034644d068..23d588301a 100644 --- a/include/spanningTree/kruskal.hpp +++ b/include/spanningTree/kruskal.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_kruskal.hpp +File: kruskal.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,13 +25,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_SPANNINGTREE_PGR_KRUSKAL_HPP_ -#define INCLUDE_SPANNINGTREE_PGR_KRUSKAL_HPP_ +#ifndef INCLUDE_SPANNINGTREE_KRUSKAL_HPP_ +#define INCLUDE_SPANNINGTREE_KRUSKAL_HPP_ #pragma once #include #include -#include "spanningTree/pgr_mst.hpp" +#include "spanningTree/mst.hpp" #include "cpp_common/interruption.hpp" namespace pgrouting { @@ -119,4 +119,4 @@ Pgr_kruskal::kruskalDD( } // namespace functions } // namespace pgrouting -#endif // INCLUDE_SPANNINGTREE_PGR_KRUSKAL_HPP_ +#endif // INCLUDE_SPANNINGTREE_KRUSKAL_HPP_ diff --git a/include/spanningTree/mst.hpp b/include/spanningTree/mst.hpp index e5e8440e60..af0e24b426 100644 --- a/include/spanningTree/mst.hpp +++ b/include/spanningTree/mst.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_mst.hpp +File: mst.hpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_SPANNINGTREE_PGR_MST_HPP_ -#define INCLUDE_SPANNINGTREE_PGR_MST_HPP_ +#ifndef INCLUDE_SPANNINGTREE_MST_HPP_ +#define INCLUDE_SPANNINGTREE_MST_HPP_ #pragma once #include @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "spanningTree/details.hpp" @@ -370,4 +370,4 @@ class Pgr_mst { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_SPANNINGTREE_PGR_MST_HPP_ +#endif // INCLUDE_SPANNINGTREE_MST_HPP_ diff --git a/include/spanningTree/prim.hpp b/include/spanningTree/prim.hpp index fbf5178015..48b21a6452 100644 --- a/include/spanningTree/prim.hpp +++ b/include/spanningTree/prim.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_prim.hpp +File: prim.hpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_SPANNINGTREE_PGR_PRIM_HPP_ -#define INCLUDE_SPANNINGTREE_PGR_PRIM_HPP_ +#ifndef INCLUDE_SPANNINGTREE_PRIM_HPP_ +#define INCLUDE_SPANNINGTREE_PRIM_HPP_ #pragma once #include @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "spanningTree/pgr_mst.hpp" +#include "spanningTree/mst.hpp" #include "cpp_common/interruption.hpp" //****************************************** @@ -199,4 +199,4 @@ Pgr_prim::primDD( } // namespace functions } // namespace pgrouting -#endif // INCLUDE_SPANNINGTREE_PGR_PRIM_HPP_ +#endif // INCLUDE_SPANNINGTREE_PRIM_HPP_ diff --git a/include/topologicalSort/topologicalSort.hpp b/include/topologicalSort/topologicalSort.hpp index 837b5ec941..9b0044546a 100644 --- a/include/topologicalSort/topologicalSort.hpp +++ b/include/topologicalSort/topologicalSort.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_topologicalSort.hpp +File: topologicalSort.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -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_PGR_TOPOLOGICALSORT_HPP_ -#define INCLUDE_TOPOLOGICALSORT_PGR_TOPOLOGICALSORT_HPP_ +#ifndef INCLUDE_TOPOLOGICALSORT_TOPOLOGICALSORT_HPP_ +#define INCLUDE_TOPOLOGICALSORT_TOPOLOGICALSORT_HPP_ #pragma once @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types//i_rt.h" @@ -98,4 +98,4 @@ Pgr_topologicalSort< G >::topologicalSort( } -#endif // INCLUDE_TOPOLOGICALSORT_PGR_TOPOLOGICALSORT_HPP_ +#endif // INCLUDE_TOPOLOGICALSORT_TOPOLOGICALSORT_HPP_ diff --git a/include/transitiveClosure/transitiveClosure.hpp b/include/transitiveClosure/transitiveClosure.hpp index a9e0e9758b..214d1e8556 100644 --- a/include/transitiveClosure/transitiveClosure.hpp +++ b/include/transitiveClosure/transitiveClosure.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_transitiveClosure.hpp +File: transitiveClosure.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_TRANSITIVECLOSURE_PGR_TRANSITIVECLOSURE_HPP_ -#define INCLUDE_TRANSITIVECLOSURE_PGR_TRANSITIVECLOSURE_HPP_ +#ifndef INCLUDE_TRANSITIVECLOSURE_TRANSITIVECLOSURE_HPP_ +#define INCLUDE_TRANSITIVECLOSURE_TRANSITIVECLOSURE_HPP_ #pragma once @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" template < class G > class Pgr_transitiveClosure; @@ -72,4 +72,4 @@ Pgr_transitiveClosure< G >::transitiveClosure( -#endif // INCLUDE_TRANSITIVECLOSURE_PGR_TRANSITIVECLOSURE_HPP_ +#endif // INCLUDE_TRANSITIVECLOSURE_TRANSITIVECLOSURE_HPP_ diff --git a/include/traversal/depthFirstSearch.hpp b/include/traversal/depthFirstSearch.hpp index ae49de0b06..30c10b708b 100644 --- a/include/traversal/depthFirstSearch.hpp +++ b/include/traversal/depthFirstSearch.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_depthFirstSearch.hpp +File: depthFirstSearch.hpp Copyright (c) 2020 pgRouting developers Mail: project@pgrouting.org @@ -21,8 +21,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_TRAVERSAL_PGR_DEPTHFIRSTSEARCH_HPP_ -#define INCLUDE_TRAVERSAL_PGR_DEPTHFIRSTSEARCH_HPP_ +#ifndef INCLUDE_TRAVERSAL_DEPTHFIRSTSEARCH_HPP_ +#define INCLUDE_TRAVERSAL_DEPTHFIRSTSEARCH_HPP_ #pragma once #include @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/mst_rt.h" @@ -213,4 +213,4 @@ class Pgr_depthFirstSearch { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_TRAVERSAL_PGR_DEPTHFIRSTSEARCH_HPP_ +#endif // INCLUDE_TRAVERSAL_DEPTHFIRSTSEARCH_HPP_ diff --git a/include/trsp/edgeInfo.hpp b/include/trsp/edgeInfo.hpp index fea4835fb9..d015008c9c 100644 --- a/include/trsp/edgeInfo.hpp +++ b/include/trsp/edgeInfo.hpp @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/edge_t.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { namespace trsp { diff --git a/include/trsp/trspHandler.hpp b/include/trsp/trspHandler.hpp index 5508e19e0d..772f666697 100644 --- a/include/trsp/trspHandler.hpp +++ b/include/trsp/trspHandler.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_trspHandler.hpp +File: trspHandler.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_TRSP_PGR_TRSPHANDLER_HPP_ -#define INCLUDE_TRSP_PGR_TRSPHANDLER_HPP_ +#ifndef INCLUDE_TRSP_TRSPHANDLER_HPP_ +#define INCLUDE_TRSP_TRSPHANDLER_HPP_ #include @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/basePath_SSEC.hpp" #include "trsp/edgeInfo.hpp" #include "cpp_common/rule.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" namespace pgrouting { namespace trsp { @@ -245,4 +245,4 @@ class Pgr_trspHandler : public pgrouting::Pgr_messages { } // namespace trsp } // namespace pgrouting -#endif // INCLUDE_TRSP_PGR_TRSPHANDLER_HPP_ +#endif // INCLUDE_TRSP_TRSPHANDLER_HPP_ diff --git a/include/tsp/tsp.hpp b/include/tsp/tsp.hpp index 8933af6b77..9f35c6ea22 100644 --- a/include/tsp/tsp.hpp +++ b/include/tsp/tsp.hpp @@ -41,8 +41,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/iid_t_rt.h" #include "cpp_common/coordinate_t.hpp" -#include "cpp_common/pgr_messages.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/messages.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { diff --git a/include/visitors/dijkstra_visitors.hpp b/include/visitors/dijkstra_visitors.hpp index 8026bb6fe8..0acc99ac8e 100644 --- a/include/visitors/dijkstra_visitors.hpp +++ b/include/visitors/dijkstra_visitors.hpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include "visitors/found_goals.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { namespace visitors { diff --git a/include/vrp/dnode.hpp b/include/vrp/dnode.hpp index bc7f0f476f..9954b6a857 100644 --- a/include/vrp/dnode.hpp +++ b/include/vrp/dnode.hpp @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include "cpp_common/identifier.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" namespace pgrouting { namespace vrp { diff --git a/include/vrp/optimize.hpp b/include/vrp/optimize.hpp index 735f937a1c..88bf57844e 100644 --- a/include/vrp/optimize.hpp +++ b/include/vrp/optimize.hpp @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #pragma once #include "vrp/solution.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/include/vrp/pd_problem.hpp b/include/vrp/pd_problem.hpp index 51bc8241bc..717347daa8 100644 --- a/include/vrp/pd_problem.hpp +++ b/include/vrp/pd_problem.hpp @@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_VRP_PD_PROBLEM_HPP_ #pragma once -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" #include "vrp/initials_code.hpp" diff --git a/include/vrp/pickDeliver.hpp b/include/vrp/pickDeliver.hpp index 22e5dba71c..fb316636ad 100644 --- a/include/vrp/pickDeliver.hpp +++ b/include/vrp/pickDeliver.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_pickDeliver.hpp +File: pickDeliver.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org @@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_PGR_PICKDELIVER_HPP_ -#define INCLUDE_VRP_PGR_PICKDELIVER_HPP_ +#ifndef INCLUDE_VRP_PICKDELIVER_HPP_ +#define INCLUDE_VRP_PICKDELIVER_HPP_ #pragma once @@ -116,4 +116,4 @@ class Pgr_pickDeliver : public PD_problem { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_PGR_PICKDELIVER_HPP_ +#endif // INCLUDE_VRP_PICKDELIVER_HPP_ diff --git a/include/vrp/tw_node.hpp b/include/vrp/tw_node.hpp index 67d2c0db26..812edfff8a 100644 --- a/include/vrp/tw_node.hpp +++ b/include/vrp/tw_node.hpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/orders_t.hpp" #include "cpp_common/vehicle_t.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/identifier.hpp" #include "vrp/pd_problem.hpp" diff --git a/include/withPoints/withPoints.hpp b/include/withPoints/withPoints.hpp index 0c3fd78030..6fa13398b2 100644 --- a/include/withPoints/withPoints.hpp +++ b/include/withPoints/withPoints.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_withPoints.hpp +File: withPoints.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -26,13 +26,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_WITHPOINTS_PGR_WITHPOINTS_HPP_ -#define INCLUDE_WITHPOINTS_PGR_WITHPOINTS_HPP_ +#ifndef INCLUDE_WITHPOINTS_WITHPOINTS_HPP_ +#define INCLUDE_WITHPOINTS_WITHPOINTS_HPP_ #pragma once #include #include "cpp_common/point_on_edge_t.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" #include "cpp_common/basePath_SSEC.hpp" namespace pgrouting { @@ -98,4 +98,4 @@ class Pg_points_graph : public Pgr_messages { } // namespace pgrouting -#endif // INCLUDE_WITHPOINTS_PGR_WITHPOINTS_HPP_ +#endif // INCLUDE_WITHPOINTS_WITHPOINTS_HPP_ diff --git a/include/yen/ksp.hpp b/include/yen/ksp.hpp index b2a69363c6..11b10e36d7 100644 --- a/include/yen/ksp.hpp +++ b/include/yen/ksp.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_ksp.hpp +File: ksp.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_YEN_PGR_KSP_HPP_ -#define INCLUDE_YEN_PGR_KSP_HPP_ +#ifndef INCLUDE_YEN_KSP_HPP_ +#define INCLUDE_YEN_KSP_HPP_ #pragma once #include @@ -43,9 +43,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "dijkstra/dijkstra.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/compPaths.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" #include "cpp_common/basePath_SSEC.hpp" namespace pgrouting { @@ -277,4 +277,4 @@ namespace algorithms { } // namespace pgrouting -#endif // INCLUDE_YEN_PGR_KSP_HPP_ +#endif // INCLUDE_YEN_KSP_HPP_ diff --git a/include/yen/turnRestrictedPath.hpp b/include/yen/turnRestrictedPath.hpp index bcc55589ce..a314b3a462 100644 --- a/include/yen/turnRestrictedPath.hpp +++ b/include/yen/turnRestrictedPath.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_turnRestrictedPath.hpp +File: turnRestrictedPath.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -26,22 +26,21 @@ 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_YEN_PGR_TURNRESTRICTEDPATH_HPP_ -#define INCLUDE_YEN_PGR_TURNRESTRICTEDPATH_HPP_ +#ifndef INCLUDE_YEN_TURNRESTRICTEDPATH_HPP_ +#define INCLUDE_YEN_TURNRESTRICTEDPATH_HPP_ #pragma once -#include "yen/pgr_ksp.hpp" - #include #include #include #include #include -#include "cpp_common/pgr_assert.hpp" +#include "yen/ksp.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/compPaths.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" #include "cpp_common/rule.hpp" namespace pgrouting { @@ -265,4 +264,4 @@ class Pgr_turnRestrictedPath : public Pgr_ksp< G > { -#endif // INCLUDE_YEN_PGR_TURNRESTRICTEDPATH_HPP_ +#endif // INCLUDE_YEN_TURNRESTRICTEDPATH_HPP_ diff --git a/src/bellman_ford/bellman_ford_neg_driver.cpp b/src/bellman_ford/bellman_ford_neg_driver.cpp index 5407134cc9..351ba3c2f4 100644 --- a/src/bellman_ford/bellman_ford_neg_driver.cpp +++ b/src/bellman_ford/bellman_ford_neg_driver.cpp @@ -39,12 +39,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "bellman_ford/bellman_ford.hpp" -#include "c_types/ii_t_rt.h" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/alloc.hpp" #include "cpp_common/assert.hpp" +#include "c_types/ii_t_rt.h" namespace { #if 0 @@ -76,6 +76,7 @@ pgr_bellman_ford( } #endif + template std::deque bellman_ford( @@ -128,7 +129,7 @@ pgr_do_bellman_ford_neg( hint = combinations_sql; - auto combinations = get_combinations(combinations_sql, starts, ends, normal); + auto combinations = get_combinations(combinations_sql, starts, ends, true); hint = nullptr; if (combinations.empty() && combinations_sql) { @@ -143,8 +144,6 @@ pgr_do_bellman_ford_neg( hint = neg_edges_sql; auto neg_edges = get_edges(std::string(neg_edges_sql), true, false); - - if (edges.size() + neg_edges.empty()) { *notice_msg = pgr_msg("No edges found"); *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); @@ -154,15 +153,15 @@ pgr_do_bellman_ford_neg( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); digraph.insert_negative_edges(neg_edges); paths = bellman_ford(digraph, combinations, only_cost); } else { - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); undigraph.insert_negative_edges(neg_edges); - paths = pgr_bellman_ford(undigraph, combinations, only_cost); + paths = bellman_ford(undigraph, combinations, only_cost); } size_t count(0); From c6149548f3840398119c63b65bd3e5fc967fe5d0 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 23:08:19 -0600 Subject: [PATCH 08/16] (build) Adjusting CMakelists to name changes --- sql/chinese/CMakeLists.txt | 4 ++-- sql/common/CMakeLists.txt | 2 +- sql/trsp/CMakeLists.txt | 4 ++-- sql/vrp_basic/CMakeLists.txt | 2 +- src/alpha_shape/CMakeLists.txt | 2 +- src/coloring/CMakeLists.txt | 2 +- src/common/CMakeLists.txt | 4 ++-- src/components/CMakeLists.txt | 2 +- src/contraction/CMakeLists.txt | 2 +- src/cpp_common/CMakeLists.txt | 2 +- src/driving_distance/CMakeLists.txt | 10 +++++----- src/max_flow/CMakeLists.txt | 6 +++--- src/pickDeliver/CMakeLists.txt | 2 +- src/trsp/CMakeLists.txt | 2 +- src/withPoints/CMakeLists.txt | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sql/chinese/CMakeLists.txt b/sql/chinese/CMakeLists.txt index bbe1e78d19..242a069dfd 100644 --- a/sql/chinese/CMakeLists.txt +++ b/sql/chinese/CMakeLists.txt @@ -1,8 +1,8 @@ SET(LOCAL_FILES _pgr_chinesePostman.sql - pgr_chinesePostman.sql - pgr_chinesePostmanCost.sql) + chinesePostman.sql + chinesePostmanCost.sql) foreach (f ${LOCAL_FILES}) configure_file(${f} ${f}) diff --git a/sql/common/CMakeLists.txt b/sql/common/CMakeLists.txt index 5678072f13..ede4090c6d 100644 --- a/sql/common/CMakeLists.txt +++ b/sql/common/CMakeLists.txt @@ -5,7 +5,7 @@ SET(LOCAL_FILES _startPoint.sql _endPoint.sql pgrouting_utilities.sql - pgr_parameter_check.sql + parameter_check.sql utilities_pgr.sql createIndex.sql _checkquery.sql diff --git a/sql/trsp/CMakeLists.txt b/sql/trsp/CMakeLists.txt index e66117c87a..204e964531 100644 --- a/sql/trsp/CMakeLists.txt +++ b/sql/trsp/CMakeLists.txt @@ -7,9 +7,9 @@ SET(LOCAL_FILES pgr_trsp.sql _pgr_trspViaVertices.sql - pgr_trspViaVertices.sql + trspViaVertices.sql - pgr_trspViaEdges.sql + trspViaEdges.sql _trsp_withPoints.sql trsp_withPoints.sql diff --git a/sql/vrp_basic/CMakeLists.txt b/sql/vrp_basic/CMakeLists.txt index ff07128698..670a9d3b36 100644 --- a/sql/vrp_basic/CMakeLists.txt +++ b/sql/vrp_basic/CMakeLists.txt @@ -2,7 +2,7 @@ SET(LOCAL_FILES #routing_vrp.sql _pgr_vrpOneDepot.sql - pgr_vrpOneDepot.sql + vrpOneDepot.sql ) foreach (f ${LOCAL_FILES}) diff --git a/src/alpha_shape/CMakeLists.txt b/src/alpha_shape/CMakeLists.txt index 22148dd4eb..f7e04dfea9 100644 --- a/src/alpha_shape/CMakeLists.txt +++ b/src/alpha_shape/CMakeLists.txt @@ -1,5 +1,5 @@ ADD_LIBRARY(alpha_shape OBJECT - pgr_alphaShape.cpp + alphaShape.cpp alphaShape.c alphaShape_driver.cpp ) diff --git a/src/coloring/CMakeLists.txt b/src/coloring/CMakeLists.txt index 50ca5613c7..e46b889efc 100644 --- a/src/coloring/CMakeLists.txt +++ b/src/coloring/CMakeLists.txt @@ -5,5 +5,5 @@ ADD_LIBRARY(coloring OBJECT bipartite_driver.cpp edgeColoring.c edgeColoring_driver.cpp - pgr_edgeColoring.cpp + edgeColoring.cpp ) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 0d9cce841d..824ad178b0 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -6,7 +6,7 @@ ADD_LIBRARY(common OBJECT check_parameters.c time_msg.c - pgr_assert.cpp + assert.cpp identifier.cpp basic_vertex.cpp @@ -14,5 +14,5 @@ ADD_LIBRARY(common OBJECT ch_vertex.cpp ch_edge.cpp basic_edge.cpp - pgr_alloc.cpp + alloc.cpp ) diff --git a/src/components/CMakeLists.txt b/src/components/CMakeLists.txt index 33f3016468..467bbaa986 100644 --- a/src/components/CMakeLists.txt +++ b/src/components/CMakeLists.txt @@ -8,7 +8,7 @@ ADD_LIBRARY(components OBJECT makeConnected_driver.cpp componentsResult.cpp - pgr_components.cpp + components.cpp connectedComponents_driver.cpp strongComponents_driver.cpp biconnectedComponents_driver.cpp diff --git a/src/contraction/CMakeLists.txt b/src/contraction/CMakeLists.txt index fcbe0469c7..97ec200e47 100644 --- a/src/contraction/CMakeLists.txt +++ b/src/contraction/CMakeLists.txt @@ -1,5 +1,5 @@ ADD_LIBRARY(contraction OBJECT contractGraph.c contractGraph_driver.cpp - pgr_contract.cpp + contract.cpp ) diff --git a/src/cpp_common/CMakeLists.txt b/src/cpp_common/CMakeLists.txt index a05eb5dbfb..f45cce63ba 100644 --- a/src/cpp_common/CMakeLists.txt +++ b/src/cpp_common/CMakeLists.txt @@ -3,7 +3,7 @@ ADD_LIBRARY(cpp_common OBJECT compPaths.cpp rule.cpp bpoint.cpp - pgr_messages.cpp + messages.cpp combinations.cpp get_check_data.cpp diff --git a/src/driving_distance/CMakeLists.txt b/src/driving_distance/CMakeLists.txt index 9d568dfd70..ff953c003d 100644 --- a/src/driving_distance/CMakeLists.txt +++ b/src/driving_distance/CMakeLists.txt @@ -1,7 +1,7 @@ ADD_LIBRARY(driving_distance OBJECT - many_to_dist_driving_distance.c - many_to_dist_withPointsDD.c + driving_distance.c + driving_distance_withPoints.c - drivedist_driver.cpp - withPoints_dd_driver.cpp - ) + driving_distance_driver.cpp + driving_distance_withPoints_driver.cpp +) diff --git a/src/max_flow/CMakeLists.txt b/src/max_flow/CMakeLists.txt index 971691528e..26a5a99bd1 100644 --- a/src/max_flow/CMakeLists.txt +++ b/src/max_flow/CMakeLists.txt @@ -9,7 +9,7 @@ ADD_LIBRARY(max_flow OBJECT edge_disjoint_paths_driver.cpp minCostMaxFlow_driver.cpp - pgr_maxflow.cpp - pgr_flowgraph.cpp - pgr_minCostMaxFlow.cpp + maxflow.cpp + flowgraph.cpp + minCostMaxFlow.cpp ) diff --git a/src/pickDeliver/CMakeLists.txt b/src/pickDeliver/CMakeLists.txt index 13891c4ecd..ae22c9adb3 100644 --- a/src/pickDeliver/CMakeLists.txt +++ b/src/pickDeliver/CMakeLists.txt @@ -1,7 +1,7 @@ ADD_LIBRARY(pickDeliver OBJECT pd_orders.cpp fleet.cpp - pgr_pickDeliver.cpp + pickDeliver.cpp dnode.cpp vehicle_pickDeliver.cpp solution.cpp diff --git a/src/trsp/CMakeLists.txt b/src/trsp/CMakeLists.txt index 533f3e2ed6..6e8540a8f6 100644 --- a/src/trsp/CMakeLists.txt +++ b/src/trsp/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(trsp OBJECT new_trsp.c edgeInfo.cpp - pgr_trspHandler.cpp + trspHandler.cpp trsp_driver.cpp trsp_withPoints.c trsp_withPoints_driver.cpp diff --git a/src/withPoints/CMakeLists.txt b/src/withPoints/CMakeLists.txt index a9f5435a69..d5fe066cb5 100644 --- a/src/withPoints/CMakeLists.txt +++ b/src/withPoints/CMakeLists.txt @@ -3,7 +3,7 @@ ADD_LIBRARY(withPoints OBJECT get_new_queries.cpp withPoints_driver.cpp - pgr_withPoints.cpp + withPoints.cpp withPointsVia.c withPointsVia_driver.cpp From e94e121fb02e1c7c45928256571b1682d8cf8b7f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 09:56:57 -0600 Subject: [PATCH 09/16] (trsp) Renaming files with deprecated code --- include/drivers/trsp/{trsp_core.h => trsp_deprecated_driver.h} | 0 .../{_pgr_trspViaVertices.sql => _trspViaVertices_deprecated.sql} | 0 sql/trsp/{_pgr_trsp.sql => _trsp_deprecated.sql} | 0 sql/trsp/{trspViaEdges.sql => trspViaEdges_deprecated.sql} | 0 sql/trsp/{trspViaVertices.sql => trspViaVertices_deprecated.sql} | 0 sql/trsp/{pgr_trsp.sql => trsp_deprecated.sql} | 0 src/trsp/{trsp.c => trsp_deprecated.c} | 0 src/trsp/{trsp_core.cpp => trsp_deprecated_driver.cpp} | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename include/drivers/trsp/{trsp_core.h => trsp_deprecated_driver.h} (100%) rename sql/trsp/{_pgr_trspViaVertices.sql => _trspViaVertices_deprecated.sql} (100%) rename sql/trsp/{_pgr_trsp.sql => _trsp_deprecated.sql} (100%) rename sql/trsp/{trspViaEdges.sql => trspViaEdges_deprecated.sql} (100%) rename sql/trsp/{trspViaVertices.sql => trspViaVertices_deprecated.sql} (100%) rename sql/trsp/{pgr_trsp.sql => trsp_deprecated.sql} (100%) rename src/trsp/{trsp.c => trsp_deprecated.c} (100%) rename src/trsp/{trsp_core.cpp => trsp_deprecated_driver.cpp} (100%) diff --git a/include/drivers/trsp/trsp_core.h b/include/drivers/trsp/trsp_deprecated_driver.h similarity index 100% rename from include/drivers/trsp/trsp_core.h rename to include/drivers/trsp/trsp_deprecated_driver.h diff --git a/sql/trsp/_pgr_trspViaVertices.sql b/sql/trsp/_trspViaVertices_deprecated.sql similarity index 100% rename from sql/trsp/_pgr_trspViaVertices.sql rename to sql/trsp/_trspViaVertices_deprecated.sql diff --git a/sql/trsp/_pgr_trsp.sql b/sql/trsp/_trsp_deprecated.sql similarity index 100% rename from sql/trsp/_pgr_trsp.sql rename to sql/trsp/_trsp_deprecated.sql diff --git a/sql/trsp/trspViaEdges.sql b/sql/trsp/trspViaEdges_deprecated.sql similarity index 100% rename from sql/trsp/trspViaEdges.sql rename to sql/trsp/trspViaEdges_deprecated.sql diff --git a/sql/trsp/trspViaVertices.sql b/sql/trsp/trspViaVertices_deprecated.sql similarity index 100% rename from sql/trsp/trspViaVertices.sql rename to sql/trsp/trspViaVertices_deprecated.sql diff --git a/sql/trsp/pgr_trsp.sql b/sql/trsp/trsp_deprecated.sql similarity index 100% rename from sql/trsp/pgr_trsp.sql rename to sql/trsp/trsp_deprecated.sql diff --git a/src/trsp/trsp.c b/src/trsp/trsp_deprecated.c similarity index 100% rename from src/trsp/trsp.c rename to src/trsp/trsp_deprecated.c diff --git a/src/trsp/trsp_core.cpp b/src/trsp/trsp_deprecated_driver.cpp similarity index 100% rename from src/trsp/trsp_core.cpp rename to src/trsp/trsp_deprecated_driver.cpp From 1c24e60f46bf5ce5f7d9f6c53aa29fe1dac03c17 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 09:58:06 -0600 Subject: [PATCH 10/16] (src/trsp) new_trsp.c -> trsp.c --- src/trsp/{new_trsp.c => trsp.c} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/trsp/{new_trsp.c => trsp.c} (100%) diff --git a/src/trsp/new_trsp.c b/src/trsp/trsp.c similarity index 100% rename from src/trsp/new_trsp.c rename to src/trsp/trsp.c From deef2167c11b427d3395222673d39869e49841f3 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 13 Oct 2024 11:55:43 -0600 Subject: [PATCH 11/16] (trsp) Adjusting code to file renames --- .../drivers/driving_distance/driving_distance_driver.h | 6 +++--- .../driving_distance/driving_distance_withPoints_driver.h | 6 +++--- include/drivers/trsp/trsp_deprecated_driver.h | 8 ++++---- sql/trsp/_array_reverse.sql | 1 + sql/trsp/_trsp.sql | 1 + sql/trsp/_trspViaVertices_deprecated.sql | 1 + sql/trsp/_trsp_deprecated.sql | 1 + sql/trsp/trsp.sql | 1 + sql/trsp/trspViaEdges_deprecated.sql | 1 + sql/trsp/trspViaVertices_deprecated.sql | 1 + sql/trsp/trsp_deprecated.sql | 1 + src/trsp/trsp_deprecated.c | 4 ++-- src/trsp/trsp_deprecated_driver.cpp | 4 ++-- 13 files changed, 22 insertions(+), 14 deletions(-) diff --git a/include/drivers/driving_distance/driving_distance_driver.h b/include/drivers/driving_distance/driving_distance_driver.h index d82a977f63..7a37facf8c 100644 --- a/include/drivers/driving_distance/driving_distance_driver.h +++ b/include/drivers/driving_distance/driving_distance_driver.h @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVEDIST_DRIVER_H_ -#define INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVEDIST_DRIVER_H_ +#ifndef INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_DRIVER_H_ +#define INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_DRIVER_H_ #ifdef __cplusplus extern "C" { @@ -68,4 +68,4 @@ void pgr_do_drivingDistance( } #endif -#endif // INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVEDIST_DRIVER_H_ +#endif // INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_DRIVER_H_ diff --git a/include/drivers/driving_distance/driving_distance_withPoints_driver.h b/include/drivers/driving_distance/driving_distance_withPoints_driver.h index 64bd4636ca..c4d1c8fba2 100644 --- a/include/drivers/driving_distance/driving_distance_withPoints_driver.h +++ b/include/drivers/driving_distance/driving_distance_withPoints_driver.h @@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DRIVERS_DRIVING_DISTANCE_WITHPOINTS_DD_DRIVER_H_ -#define INCLUDE_DRIVERS_DRIVING_DISTANCE_WITHPOINTS_DD_DRIVER_H_ +#ifndef INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_WITHPOINTS_DRIVER_H_ +#define INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_WITHPOINTS_DRIVER_H_ #pragma once @@ -76,4 +76,4 @@ void pgr_do_withPointsDD( } #endif -#endif // INCLUDE_DRIVERS_DRIVING_DISTANCE_WITHPOINTS_DD_DRIVER_H_ +#endif // INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_WITHPOINTS_DRIVER_H_ diff --git a/include/drivers/trsp/trsp_deprecated_driver.h b/include/drivers/trsp/trsp_deprecated_driver.h index 39d734b488..ba4c0bb64e 100644 --- a/include/drivers/trsp/trsp_deprecated_driver.h +++ b/include/drivers/trsp/trsp_deprecated_driver.h @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: trsp.h +FILE: trsp_deprecated_driver.h Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DRIVERS_TRSP_TRSP_CORE_H_ -#define INCLUDE_DRIVERS_TRSP_TRSP_CORE_H_ +#ifndef INCLUDE_DRIVERS_TRSP_TRSP_DEPRECATED_DRIVER_H_ +#define INCLUDE_DRIVERS_TRSP_TRSP_DEPRECATED_DRIVER_H_ #ifdef __cplusplus # include @@ -63,4 +63,4 @@ int trsp_edge_wrapper( } #endif -#endif // INCLUDE_DRIVERS_TRSP_TRSP_CORE_H_ +#endif // INCLUDE_DRIVERS_TRSP_TRSP_DEPRECATED_DRIVER_H_ diff --git a/sql/trsp/_array_reverse.sql b/sql/trsp/_array_reverse.sql index 64802a33a4..7f322d027b 100644 --- a/sql/trsp/_array_reverse.sql +++ b/sql/trsp/_array_reverse.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: _array_reverse.sql Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/sql/trsp/_trsp.sql b/sql/trsp/_trsp.sql index ffe008c615..4bafa32838 100644 --- a/sql/trsp/_trsp.sql +++ b/sql/trsp/_trsp.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: _trsp.sql Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/sql/trsp/_trspViaVertices_deprecated.sql b/sql/trsp/_trspViaVertices_deprecated.sql index bebd6bc87f..2ee513c579 100644 --- a/sql/trsp/_trspViaVertices_deprecated.sql +++ b/sql/trsp/_trspViaVertices_deprecated.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: _trspViaVertices_deprecated.sql Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/sql/trsp/_trsp_deprecated.sql b/sql/trsp/_trsp_deprecated.sql index 2290b89442..fd81e5e382 100644 --- a/sql/trsp/_trsp_deprecated.sql +++ b/sql/trsp/_trsp_deprecated.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: _trsp_deprecated.sql Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/sql/trsp/trsp.sql b/sql/trsp/trsp.sql index 1acc96f6bf..80ced40202 100644 --- a/sql/trsp/trsp.sql +++ b/sql/trsp/trsp.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: trsp.sql Copyright (c) 2021 pgRouting developers Mail: project@pgrouting.org diff --git a/sql/trsp/trspViaEdges_deprecated.sql b/sql/trsp/trspViaEdges_deprecated.sql index cb4840478a..3bb7028dbf 100644 --- a/sql/trsp/trspViaEdges_deprecated.sql +++ b/sql/trsp/trspViaEdges_deprecated.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: trspViaEdges_deprecated.sql Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/sql/trsp/trspViaVertices_deprecated.sql b/sql/trsp/trspViaVertices_deprecated.sql index cf9761a2c0..e4f712e972 100644 --- a/sql/trsp/trspViaVertices_deprecated.sql +++ b/sql/trsp/trspViaVertices_deprecated.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: trspViaVertices_deprecated.sql Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/sql/trsp/trsp_deprecated.sql b/sql/trsp/trsp_deprecated.sql index 0933442a4c..011b937334 100644 --- a/sql/trsp/trsp_deprecated.sql +++ b/sql/trsp/trsp_deprecated.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: trsp_deprecated.sql Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/trsp/trsp_deprecated.c b/src/trsp/trsp_deprecated.c index 3092d2fce5..00f450914c 100644 --- a/src/trsp/trsp_deprecated.c +++ b/src/trsp/trsp_deprecated.c @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: trsp.c +File: trsp_deprecated.c Generated with Template by: Copyright (c) 2013 pgRouting developers @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/trsp/trsp.h" #include "c_types/edge_rt.h" #include "c_common/trsp_pgget.h" -#include "drivers/trsp/trsp_core.h" +#include "drivers/trsp/trsp_deprecated_driver.h" typedef struct restrict_t restrict_t; typedef struct Edge_rt Edge_t; diff --git a/src/trsp/trsp_deprecated_driver.cpp b/src/trsp/trsp_deprecated_driver.cpp index 8f52c2b2dc..342a5cf2f0 100644 --- a/src/trsp/trsp_deprecated_driver.cpp +++ b/src/trsp/trsp_deprecated_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: trsp_core.cpp +File: trsp_deprecated_driver.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "drivers/trsp/trsp_core.h" +#include "drivers/trsp/trsp_deprecated_driver.h" #ifdef __MINGW32__ #include From 46bf165236c9f21372bc7c6230e47e7fc8e75723 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 09:16:35 -0600 Subject: [PATCH 12/16] (Build) Adjusting CMakeLists to file renames --- sql/trsp/CMakeLists.txt | 10 +++++----- src/trsp/CMakeLists.txt | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sql/trsp/CMakeLists.txt b/sql/trsp/CMakeLists.txt index 204e964531..c2b60d62ee 100644 --- a/sql/trsp/CMakeLists.txt +++ b/sql/trsp/CMakeLists.txt @@ -2,14 +2,14 @@ SET(LOCAL_FILES _trsp.sql trsp.sql - _pgr_trsp.sql + _trsp_deprecated.sql _array_reverse.sql - pgr_trsp.sql + trsp_deprecated.sql - _pgr_trspViaVertices.sql - trspViaVertices.sql + _trspViaVertices_deprecated.sql + trspViaVertices_deprecated.sql - trspViaEdges.sql + trspViaEdges_deprecated.sql _trsp_withPoints.sql trsp_withPoints.sql diff --git a/src/trsp/CMakeLists.txt b/src/trsp/CMakeLists.txt index 6e8540a8f6..981520e675 100644 --- a/src/trsp/CMakeLists.txt +++ b/src/trsp/CMakeLists.txt @@ -1,14 +1,14 @@ add_library(trsp OBJECT # keeping these for backwards compatibility - trsp.c - trsp_core.cpp + trsp_deprecated.c + trsp_deprecated_driver.cpp GraphDefinition.cpp - - - new_trsp.c edgeInfo.cpp trspHandler.cpp + + trsp.c trsp_driver.cpp + trsp_withPoints.c trsp_withPoints_driver.cpp From f555dcbf225b8a66dda57c4ee5034e7e6e6f0ce7 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 10:55:16 -0600 Subject: [PATCH 13/16] (C/C++) removing unused code --- include/bellman_ford/bellman_ford.hpp | 152 ------------------ include/bellman_ford/edwardMoore.hpp | 73 --------- .../binaryBreadthFirstSearch.hpp | 30 ---- include/cpp_common/ch_vertex.hpp | 9 -- include/cpp_common/xy_vertex.hpp | 9 -- include/dagShortestPath/dagShortestPath.hpp | 130 --------------- include/lineGraph/lineGraphFull.hpp | 5 - src/bellman_ford/bellman_ford_driver.cpp | 31 ---- src/bellman_ford/bellman_ford_neg.c | 2 +- src/bellman_ford/bellman_ford_neg_driver.cpp | 28 ---- src/bellman_ford/edwardMoore_driver.cpp | 26 --- .../breadthFirstSearch_driver.cpp | 19 --- src/common/basePath_SSEC.cpp | 3 - src/common/postgres_connection.c | 12 -- src/common/xy_vertex.cpp | 34 ---- src/cpp_common/Dmatrix.cpp | 25 --- src/pickDeliver/fleet.cpp | 7 - src/pickDeliver/initial_solution.cpp | 15 -- src/pickDeliver/optimize.cpp | 15 -- src/pickDeliver/pd_orders.cpp | 7 - src/pickDeliver/pickDeliver.cpp | 47 ------ src/pickDeliver/vehicle.cpp | 10 -- src/pickDeliver/vehicle_pickDeliver.cpp | 13 -- src/trsp/trspHandler.cpp | 20 --- src/tsp/tsp.cpp | 8 - 25 files changed, 1 insertion(+), 729 deletions(-) diff --git a/include/bellman_ford/bellman_ford.hpp b/include/bellman_ford/bellman_ford.hpp index 4595f457d9..06e704cfcc 100644 --- a/include/bellman_ford/bellman_ford.hpp +++ b/include/bellman_ford/bellman_ford.hpp @@ -56,43 +56,6 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { typedef typename G::E E; //@{ -#if 0 - //! @name BellmanFord - //@{ - //! BellmanFord 1 to 1 - Path bellman_ford( - G &graph, - int64_t start_vertex, - int64_t end_vertex, - bool only_cost = false) { - clear(); - log << std::string(__FUNCTION__) << "\n"; - - // adjust predecessors and distances vectors - predecessors.resize(graph.num_vertices()); - distances.resize(graph.num_vertices()); - - - if (!graph.has_vertex(start_vertex) - || !graph.has_vertex(end_vertex)) { - return Path(start_vertex, end_vertex); - } - - // get the graphs source and target - auto v_source(graph.get_V(start_vertex)); - auto v_target(graph.get_V(end_vertex)); - - // perform the algorithm - bellman_ford_1_to_1(graph, v_source, v_target); - - // get the results - return Path( - graph, - v_source, v_target, - predecessors, distances, - only_cost, true); - } -#endif /** @brief bellman_ford one to a set of many @@ -135,91 +98,6 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { return paths; } -#if 0 - // BellmanFord many to 1 - std::deque bellman_ford( - G &graph, - const std::vector < int64_t > &start_vertex, - int64_t end_vertex, - bool only_cost = false) { - std::deque paths; - log << std::string(__FUNCTION__) << "\n"; - for (const auto &start : start_vertex) { - paths.push_back( - bellman_ford(graph, start, end_vertex, only_cost)); - } - - std::stable_sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2)->bool { - return e1.start_id() < e2.start_id(); - }); - return paths; - } - - - // BellmanFord many to many - std::deque bellman_ford( - G &graph, - const std::vector< int64_t > &start_vertex, - const std::vector< int64_t > &end_vertex, - bool only_cost = false) { - // a call to 1 to many is faster for each of the sources - std::deque paths; - log << std::string(__FUNCTION__) << "\n"; - - for (const auto &start : start_vertex) { - auto r_paths = bellman_ford(graph, start, end_vertex, only_cost); - paths.insert(paths.begin(), r_paths.begin(), r_paths.end()); - } - - - std::sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2)->bool { - return e1.end_id() < e2.end_id(); - }); - std::stable_sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2)->bool { - return e1.start_id() < e2.start_id(); - }); - return paths; - } - - // BellmanFord combinations - std::deque bellman_ford( - G &graph, - const std::vector &combinations, - bool only_cost = false) { - // a call to 1 to many is faster for each of the sources - std::deque paths; - log << std::string(__FUNCTION__) << "\n"; - - // group targets per distinct source - std::map< int64_t, std::vector > vertex_map; - for (const II_t_rt &comb : combinations) { - std::map< int64_t, std::vector >::iterator it = vertex_map.find(comb.d1.source); - if (it != vertex_map.end()) { - it->second.push_back(comb.d2.target); - } else { - std::vector targets{comb.d2.target}; - vertex_map[comb.d1.source] = targets; - } - } - - for (const auto &start_ends : vertex_map) { - std::deque result_paths = bellman_ford( - graph, - start_ends.first, - start_ends.second, - only_cost); - paths.insert( - paths.end(), - std::make_move_iterator(result_paths.begin()), - std::make_move_iterator(result_paths.end())); - } - - return paths; - } -#endif /** @brief BellmanFord combinations **/ std::deque bellman_ford( @@ -240,36 +118,6 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { //@} private: -#if 0 - //! Call to BellmanFord 1 source to 1 target - bool bellman_ford_1_to_1( - G &graph, - V source - ) { - log << std::string(__FUNCTION__) << "\n"; - /* abort in case of an interruption occurs (e.g. the query is being cancelled) */ - CHECK_FOR_INTERRUPTS(); - try { - boost::bellman_ford_shortest_paths( - graph.graph, - static_cast(graph.num_vertices()), - boost::predecessor_map(&predecessors[0]) - .weight_map(get(&G::G_T_E::cost, graph.graph)) - .distance_map(&distances[0]) - .root_vertex(source)); - } catch (boost::exception const& ex) { - (void)ex; - throw; - } catch (std::exception &e) { - (void)e; - throw; - } catch (...) { - throw; - } - return true; - } -#endif - //! Call to BellmanFord 1 source to many targets bool bellman_ford_1_to_many( G &graph, diff --git a/include/bellman_ford/edwardMoore.hpp b/include/bellman_ford/edwardMoore.hpp index 30a235dd05..d85ef2e2d7 100644 --- a/include/bellman_ford/edwardMoore.hpp +++ b/include/bellman_ford/edwardMoore.hpp @@ -47,79 +47,6 @@ class Pgr_edwardMoore { typedef typename G::E E; typedef typename G::EO_i EO_i; -#if 0 - std::deque edwardMoore( - G &graph, - const std::vector &start_vertex, - const std::vector &end_vertex) { - std::deque paths; - - for (const auto &source : start_vertex) { - std::deque result_paths = one_to_many_edwardMoore( - graph, - source, - end_vertex); - - paths.insert( - paths.begin(), - std::make_move_iterator(result_paths.begin()), - std::make_move_iterator(result_paths.end())); - } - - std::sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2) -> bool { - return e1.end_id() < e2.end_id(); - }); - std::stable_sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2) -> bool { - return e1.start_id() < e2.start_id(); - }); - - return paths; - } - - // preparation for the parallel arrays - std::deque edwardMoore( - G &graph, - const std::vector &combinations) { - std::deque paths; - - // group targets per distinct source - std::map< int64_t, std::vector > vertex_map; - for (const II_t_rt &comb : combinations) { - std::map< int64_t, std::vector >::iterator it = vertex_map.find(comb.d1.source); - if (it != vertex_map.end()) { - it->second.push_back(comb.d2.target); - } else { - std::vector targets{comb.d2.target}; - vertex_map[comb.d1.source] = targets; - } - } - - for (const auto &start_ends : vertex_map) { - std::deque result_paths = one_to_many_edwardMoore( - graph, - start_ends.first, - start_ends.second); - - paths.insert( - paths.end(), - std::make_move_iterator(result_paths.begin()), - std::make_move_iterator(result_paths.end())); - } - - std::sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2) -> bool { - return e1.end_id() < e2.end_id(); - }); - std::stable_sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2) -> bool { - return e1.start_id() < e2.start_id(); - }); - - return paths; - } -#endif /** @brief edwardMoore for combinations */ std::deque edwardMoore( diff --git a/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp b/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp index 37821181c0..605733b53b 100644 --- a/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp +++ b/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp @@ -51,36 +51,6 @@ class Pgr_binaryBreadthFirstSearch { typedef typename G::EO_i EO_i; typedef typename G::E_i E_i; -#if 0 - std::deque binaryBreadthFirstSearch( - G &graph, - const std::vector &start_vertex, - const std::vector &end_vertex) { - std::deque paths; - - for (const auto &source : start_vertex) { - std::deque result_paths = one_to_many_binaryBreadthFirstSearch( - graph, - source, - end_vertex); - paths.insert( - paths.begin(), - std::make_move_iterator(result_paths.begin()), - std::make_move_iterator(result_paths.end())); - } - - std::sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2) -> bool { - return e1.end_id() < e2.end_id(); - }); - std::stable_sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2) -> bool { - return e1.start_id() < e2.start_id(); - }); - - return paths; - } -#endif std::deque binaryBreadthFirstSearch( G &graph, diff --git a/include/cpp_common/ch_vertex.hpp b/include/cpp_common/ch_vertex.hpp index f6c7a3a838..2de3697d5b 100644 --- a/include/cpp_common/ch_vertex.hpp +++ b/include/cpp_common/ch_vertex.hpp @@ -62,15 +62,6 @@ class CH_vertex { size_t check_vertices(std::vector < CH_vertex > vertices); -#if 0 -std::vector < CH_vertex > -extract_vertices( - const Edge_t *data_edges, int64_t count); - -std::vector < CH_vertex > -extract_vertices( - const std::vector < Edge_t > &data_edges); -#endif } // namespace pgrouting #endif // INCLUDE_CPP_COMMON_CH_VERTEX_HPP_ diff --git a/include/cpp_common/xy_vertex.hpp b/include/cpp_common/xy_vertex.hpp index a9924b7fec..50b475aeac 100644 --- a/include/cpp_common/xy_vertex.hpp +++ b/include/cpp_common/xy_vertex.hpp @@ -80,15 +80,6 @@ std::vector < XY_vertex > extract_vertices( const std::vector &data_edges); -#if 0 -std::vector < XY_vertex > extract_vertices( - std::vector < XY_vertex > vertices, - const Edge_xy_t *data_edges, int64_t count); - -std::vector < XY_vertex > extract_vertices( - std::vector < XY_vertex > vertices, - const std::vector data_edges); -#endif } // namespace pgrouting diff --git a/include/dagShortestPath/dagShortestPath.hpp b/include/dagShortestPath/dagShortestPath.hpp index bdd75989da..89797f1300 100644 --- a/include/dagShortestPath/dagShortestPath.hpp +++ b/include/dagShortestPath/dagShortestPath.hpp @@ -57,42 +57,6 @@ class Pgr_dag { typedef typename G::V V; typedef typename G::E E; -#if 0 - //! Dijkstra 1 to 1 - Path dag( - G &graph, - int64_t start_vertex, - int64_t end_vertex, - bool only_cost = false) { - clear(); - - // adjust predecessors and distances vectors - predecessors.resize(graph.num_vertices()); - distances.resize( - graph.num_vertices(), - std::numeric_limits::infinity()); - - - if (!graph.has_vertex(start_vertex) - || !graph.has_vertex(end_vertex)) { - return Path(start_vertex, end_vertex); - } - - // get the graphs source and target - auto v_source(graph.get_V(start_vertex)); - auto v_target(graph.get_V(end_vertex)); - - // perform the algorithm - dag_1_to_1(graph, v_source, v_target); - - // get the results - return Path( - graph, - v_source, v_target, - predecessors, distances, - only_cost, true); - } -#endif /** dag 1 to many */ std::deque dag( @@ -133,55 +97,6 @@ class Pgr_dag { return paths; } -#if 0 - // preparation for many to 1 - std::deque dag( - G &graph, - const std::vector < int64_t > &start_vertex, - int64_t end_vertex, - bool only_cost) { - std::deque paths; - - for (const auto &start : start_vertex) { - paths.push_back( - dag(graph, start, end_vertex, only_cost)); - } - - std::stable_sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2)->bool { - return e1.start_id() < e2.start_id(); - }); - return paths; - } - - // preparation for many to many - std::deque dag( - G &graph, - const std::vector< int64_t > &start_vertex, - const std::vector< int64_t > &end_vertex, - bool only_cost) { - // a call to 1 to many is faster for each of the sources - std::deque paths; - - for (const auto &start : start_vertex) { - auto r_paths = dag( - graph, - start, end_vertex, - only_cost); - paths.insert(paths.begin(), r_paths.begin(), r_paths.end()); - } - - std::sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2)->bool { - return e1.end_id() < e2.end_id(); - }); - std::stable_sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2)->bool { - return e1.start_id() < e2.start_id(); - }); - return paths; - } -#endif /** combinations */ std::deque dag( @@ -204,35 +119,6 @@ class Pgr_dag { //@} private: -#if 0 - //! Call to Dijkstra 1 source to 1 target - bool dag_1_to_1( - G &graph, - V source, - V target) { - /* abort in case of an interruption occurs (e.g. the query is being cancelled) */ - CHECK_FOR_INTERRUPTS(); - try { - boost::dag_shortest_paths(graph.graph, source, - boost::predecessor_map(&predecessors[0]) - .weight_map(get(&G::G_T_E::cost, graph.graph)) - .distance_map(&distances[0]) - .visitor(dijkstra_one_goal_visitor(target))); - } catch(found_goals &) { - return true; - } catch (boost::exception const& ex) { - (void)ex; - throw; - } catch (std::exception &e) { - (void)e; - throw; - } catch (...) { - throw; - } - return true; - } -#endif - /** DAG 1 source to many targets */ bool dag_1_to_many( G &graph, @@ -300,22 +186,6 @@ class Pgr_dag { //@} -#if 0 - //! @name Stopping classes - //@{ - //! class for stopping when 1 target is found - - class dijkstra_one_goal_visitor : public boost::default_dijkstra_visitor { - public: - explicit dijkstra_one_goal_visitor(V goal) : m_goal(goal) {} - template - void examine_vertex(V &u, B_G &) { - if (u == m_goal) throw found_goals(); - } - private: - V m_goal; - }; -#endif //! class for stopping when all targets are found class dijkstra_many_goal_visitor : public boost::default_dijkstra_visitor { diff --git a/include/lineGraph/lineGraphFull.hpp b/include/lineGraph/lineGraphFull.hpp index c645e8ac33..c433f3ad31 100644 --- a/include/lineGraph/lineGraphFull.hpp +++ b/include/lineGraph/lineGraphFull.hpp @@ -144,11 +144,6 @@ class Pgr_lineGraphFull : public Pgr_base_graph { } } -#if 0 - log << "e_source = " << e_source - << " e_target = " << e_target - << "\n"; -#endif Line_graph_full_rt edge = { ++count, vertex_id_map[e_source], diff --git a/src/bellman_ford/bellman_ford_driver.cpp b/src/bellman_ford/bellman_ford_driver.cpp index bb196d7826..2203aad4a6 100644 --- a/src/bellman_ford/bellman_ford_driver.cpp +++ b/src/bellman_ford/bellman_ford_driver.cpp @@ -48,37 +48,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace { -#if 0 -template -std::deque -pgr_bellman_ford( - G &graph, - std::vector &combinations, - std::vector < int64_t > sources, - std::vector < int64_t > targets, - std::string &log, - bool only_cost = false) { - std::sort(sources.begin(), sources.end()); - sources.erase( - std::unique(sources.begin(), sources.end()), - sources.end()); - - std::sort(targets.begin(), targets.end()); - targets.erase( - std::unique(targets.begin(), targets.end()), - targets.end()); - - pgrouting::Pgr_bellman_ford< G > fn_bellman_ford; - auto paths = combinations.empty() ? - fn_bellman_ford.bellman_ford(graph, sources, targets, only_cost) - : fn_bellman_ford.bellman_ford(graph, combinations, only_cost); - log += fn_bellman_ford.get_log(); - for (auto &p : paths) { - p.recalculate_agg_cost(); - } - return paths; -} -#endif template std::deque diff --git a/src/bellman_ford/bellman_ford_neg.c b/src/bellman_ford/bellman_ford_neg.c index 87313253b5..c922f781a5 100644 --- a/src/bellman_ford/bellman_ford_neg.c +++ b/src/bellman_ford/bellman_ford_neg.c @@ -90,7 +90,7 @@ process( pgr_SPI_finish(); } -PGDLLEXPORT Datum +PGDLLEXPORT Datum _pgr_bellmanfordneg(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; diff --git a/src/bellman_ford/bellman_ford_neg_driver.cpp b/src/bellman_ford/bellman_ford_neg_driver.cpp index 351ba3c2f4..200946d105 100644 --- a/src/bellman_ford/bellman_ford_neg_driver.cpp +++ b/src/bellman_ford/bellman_ford_neg_driver.cpp @@ -47,34 +47,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/ii_t_rt.h" namespace { -#if 0 -template < class G > -std::deque -pgr_bellman_ford( - G &graph, - std::vector &combinations, - std::vector < int64_t > sources, - std::vector < int64_t > targets, - std::string &log, - bool only_cost = false) { - std::sort(sources.begin(), sources.end()); - sources.erase( - std::unique(sources.begin(), sources.end()), - sources.end()); - - std::sort(targets.begin(), targets.end()); - targets.erase( - std::unique(targets.begin(), targets.end()), - targets.end()); - - pgrouting::Pgr_bellman_ford< G > fn_bellman_ford; - auto paths = combinations.empty() ? - fn_bellman_ford.bellman_ford(graph, sources, targets, only_cost) - : fn_bellman_ford.bellman_ford(graph, combinations, only_cost); - log += fn_bellman_ford.get_log(); - return paths; -} -#endif template diff --git a/src/bellman_ford/edwardMoore_driver.cpp b/src/bellman_ford/edwardMoore_driver.cpp index 082e5845b3..1905212205 100644 --- a/src/bellman_ford/edwardMoore_driver.cpp +++ b/src/bellman_ford/edwardMoore_driver.cpp @@ -51,32 +51,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace { -#if 0 -template < class G > -std::deque< pgrouting::Path > -pgr_edwardMoore( - G &graph, - std::vector &combinations, - std::vector < int64_t > sources, - std::vector < int64_t > targets) { - std::sort(sources.begin(), sources.end()); - sources.erase( - std::unique(sources.begin(), sources.end()), - sources.end()); - - std::sort(targets.begin(), targets.end()); - targets.erase( - std::unique(targets.begin(), targets.end()), - targets.end()); - - pgrouting::functions::Pgr_edwardMoore< G > fn_edwardMoore; - auto paths = combinations.empty() ? - fn_edwardMoore.edwardMoore(graph, sources, targets) - : fn_edwardMoore.edwardMoore(graph, combinations); - - return paths; -} -#endif template std::deque diff --git a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp index 6dfabead04..728a454945 100644 --- a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp @@ -42,25 +42,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace { -#if 0 -template < class G > -std::vector -pgr_breadthFirstSearch( - G &graph, - std::vector < int64_t > sources, - int64_t max_depth) { - std::sort(sources.begin(), sources.end()); - sources.erase( - std::unique(sources.begin(), sources.end()), - sources.end()); - - - pgrouting::functions::Pgr_breadthFirstSearch< G > fn_breadthFirstSearch; - auto results = fn_breadthFirstSearch.breadthFirstSearch( - graph, sources, max_depth); - return results; -} -#endif template std::vector breadthFirstSearch( G &graph, diff --git a/src/common/basePath_SSEC.cpp b/src/common/basePath_SSEC.cpp index ef08cfef66..d80d0caf42 100644 --- a/src/common/basePath_SSEC.cpp +++ b/src/common/basePath_SSEC.cpp @@ -216,9 +216,6 @@ void Path::append(const Path &other) { *this = other; return; } -#if 0 - pgassert(path.back().cost == 0); -#endif pgassert(path.back().edge == -1); m_end_id = other.m_end_id; diff --git a/src/common/postgres_connection.c b/src/common/postgres_connection.c index 47e6a8d27e..774c112274 100644 --- a/src/common/postgres_connection.c +++ b/src/common/postgres_connection.c @@ -56,9 +56,6 @@ pgr_send_error(int errcode) { // http://www.postgresql.org/docs/9.4/static/spi-spi-finish.html void pgr_SPI_finish(void) { -#if 0 - PGR_DBG("Disconnecting SPI"); -#endif int code = SPI_finish(); if (code != SPI_OK_FINISH) { // SPI_ERROR_UNCONNECTED elog(ERROR, "There was no connection to SPI"); @@ -67,9 +64,6 @@ pgr_SPI_finish(void) { void pgr_SPI_connect(void) { -#if 0 - PGR_DBG("Connecting to SPI"); -#endif int SPIcode; SPIcode = SPI_connect(); if (SPIcode != SPI_OK_CONNECT) { @@ -79,9 +73,6 @@ pgr_SPI_connect(void) { SPIPlanPtr pgr_SPI_prepare(const char* sql) { -#if 0 - PGR_DBG("Preparing Plan"); -#endif SPIPlanPtr SPIplan; SPIplan = SPI_prepare(sql, 0, NULL); if (SPIplan == NULL) { @@ -92,9 +83,6 @@ pgr_SPI_prepare(const char* sql) { Portal pgr_SPI_cursor_open(SPIPlanPtr SPIplan) { -#if 0 - PGR_DBG("Opening Portal"); -#endif Portal SPIportal; SPIportal = SPI_cursor_open(NULL, SPIplan, NULL, NULL, true); if (SPIportal == NULL) { diff --git a/src/common/xy_vertex.cpp b/src/common/xy_vertex.cpp index 20902cb273..5ded779820 100644 --- a/src/common/xy_vertex.cpp +++ b/src/common/xy_vertex.cpp @@ -120,39 +120,5 @@ extract_vertices( std::vector (data_edges, data_edges + count)); } -#if 0 -/* the following might be needed when using withPoints */ -std::vector < XY_vertex > extract_vertices( - std::vector < XY_vertex > vertices, - const std::vector data_edges) { - if (data_edges.empty()) return vertices; - - vertices.reserve(vertices.size() + data_edges.size() * 2); - - for (const auto edge : data_edges) { - vertices.push_back(XY_vertex(edge.source, edge.x1, edge.y1)); - vertices.push_back(XY_vertex(edge.target, edge.x2, edge.y2)); - } - - /* - * sort and delete duplicates - */ - std::stable_sort(vertices.begin(), vertices.end(), - [](const XY_vertex &lhs, const XY_vertex &rhs) - {return lhs.id < rhs.id;}); - - vertices.erase( - std::unique(vertices.begin(), vertices.end(), - [](const XY_vertex &lhs, const XY_vertex &rhs) - {return lhs.id == rhs.id;}), vertices.end()); - return vertices; -} -std::vector < XY_vertex > extract_vertices( - std::vector < XY_vertex > vertices, - const Edge_xy_t *data_edges, int64_t count) { - return extract_vertices(vertices, - std::vector (data_edges, data_edges + count)); -} -#endif } // namespace pgrouting diff --git a/src/cpp_common/Dmatrix.cpp b/src/cpp_common/Dmatrix.cpp index 2acc3092c7..8a97de2f9c 100644 --- a/src/cpp_common/Dmatrix.cpp +++ b/src/cpp_common/Dmatrix.cpp @@ -205,36 +205,11 @@ std::ostream& operator<<(std::ostream &log, const Dmatrix &matrix) { log << "Internal(" << i << "," << j << ")" << "\tUsers(" << matrix.ids[i] << "," << matrix.ids[j] << ")" << "\t = " << cost -#if 0 - << "\t(" << matrix.get_index(matrix.ids[i]) - << "," << matrix.get_index(matrix.ids[j]) << ")" - << "\t = " << matrix.costs[i][j] - << "\t = " << matrix.costs[j][i] - << "=inf:" - << (matrix.costs[i][j] == - (std::numeric_limits::infinity)()) - << "=inf:" - << (matrix.costs[j][i] == - (std::numeric_limits::infinity)()) -#endif << "\n"; ++j; } ++i; } -#if 0 - for (size_t i = 0; i < matrix.costs.size(); ++i) { - for (size_t j = 0; j < matrix.costs.size(); ++j) { - for (size_t k = 0; k < matrix.costs.size(); ++k) { - log << matrix.costs[i][k] << " <= (" - << matrix.costs[i][j] << " + " << matrix.costs[j][k] << ")" - << (matrix.costs[i][k] - <= (matrix.costs[i][j] + matrix.costs[j][k])) - << "\n"; - } - } - } -#endif return log; } diff --git a/src/pickDeliver/fleet.cpp b/src/pickDeliver/fleet.cpp index f61fd5a4f1..d3646db335 100644 --- a/src/pickDeliver/fleet.cpp +++ b/src/pickDeliver/fleet.cpp @@ -80,10 +80,6 @@ Fleet::get_truck() { Vehicle_pickDeliver Fleet::get_truck(size_t order) { -#if 0 - msg().log << "Available vehicles: " << m_un_used << "\n"; - msg().log << "NOT Available vehicles: " << m_used << "\n"; -#endif size_t idx{0}; for (const auto &i : m_un_used) { @@ -138,9 +134,6 @@ Fleet::add_vehicle( vehicle.capacity, vehicle.speed, factor)); -#if 0 - msg().log << "inserting vehicle: " << m_trucks.back().tau() << "\n"; -#endif pgassert((m_trucks.back().idx() + 1) == m_trucks.size()); pgassert(m_trucks.back().is_ok()); } diff --git a/src/pickDeliver/initial_solution.cpp b/src/pickDeliver/initial_solution.cpp index 08924c85ee..2bc78b5034 100644 --- a/src/pickDeliver/initial_solution.cpp +++ b/src/pickDeliver/initial_solution.cpp @@ -78,30 +78,15 @@ Initial_solution::do_while_foo(int kind) { invariant(); pgassert(kind > 0 && kind <= OneDepot); -#if 0 - msg().log << "\nInitial_solution::do_while_foo\n"; -#endif Identifiers notused; while (!m_unassigned.empty()) { -#if 0 - msg().log << m_unassigned.size() << " m_unassigned: " << m_unassigned << "\n"; - msg().log << m_assigned.size() << " m_assigned:" << m_assigned << "\n"; -#endif auto current = m_unassigned.size(); auto truck = trucks.get_truck(m_unassigned.front()); -#if 0 - msg().log << "got truck:" << truck.tau() << "\n"; -#endif /* * kind 1 to 7 work with the same code structure */ truck.do_while_feasable((Initials_code)kind, m_unassigned, m_assigned); -#if 0 - msg().log << m_unassigned.size() << " m_unassigned: " << m_unassigned << "\n"; - msg().log << m_assigned.size() << " m_assigned:" << m_assigned << "\n"; - msg().log << "current" << current << " m_unassigned: " << m_unassigned.size(); -#endif pgassertwm(current > m_unassigned.size(), msg().get_log().c_str()); fleet.push_back(truck); diff --git a/src/pickDeliver/optimize.cpp b/src/pickDeliver/optimize.cpp index 540b78d00c..5331753b7f 100644 --- a/src/pickDeliver/optimize.cpp +++ b/src/pickDeliver/optimize.cpp @@ -102,17 +102,8 @@ Optimize::inter_swap() { for (auto &to : fleet) { if (&from == &to) break; -#if 0 - msg().log - << "\n to " << to.id() - << "from " << from.id(); - auto swapped = false; -#endif swap_worse(to, from); move_reduce_cost(from, to); -#if 0 - msg().log << "++++++++" << p_swaps; -#endif } } @@ -492,17 +483,11 @@ Optimize::save_if_best() { best_solution = (*this); msg().log << "\n*********** best by duration" << best_solution.cost_str(); -#if 0 - msg().dbg_log << best_solution.tau("best by duration"); -#endif } if (fleet.size() < best_solution.fleet.size()) { best_solution = (*this); msg().log << "\n*********** best by fleet size" << best_solution.cost_str(); -#if 0 - msg().dbg_log << best_solution.tau("best by fleet size"); -#endif } } diff --git a/src/pickDeliver/pd_orders.cpp b/src/pickDeliver/pd_orders.cpp index f53b8ce081..656ea1b99f 100644 --- a/src/pickDeliver/pd_orders.cpp +++ b/src/pickDeliver/pd_orders.cpp @@ -63,9 +63,6 @@ void PD_Orders::build_orders( const std::vector &pd_orders ) { -#if 0 - ENTERING(); -#endif for (const auto &order : pd_orders) { /* * SAMPLE CORRECT INFORMATION @@ -92,10 +89,6 @@ PD_Orders::build_orders( add_order(order, pickup, delivery); } // for (creating orders) - -#if 0 - EXITING(); -#endif } diff --git a/src/pickDeliver/pickDeliver.cpp b/src/pickDeliver/pickDeliver.cpp index b72bebb2e3..8872a04f5e 100644 --- a/src/pickDeliver/pickDeliver.cpp +++ b/src/pickDeliver/pickDeliver.cpp @@ -80,11 +80,7 @@ Pgr_pickDeliver::solve() { return rhs < lhs; }); -#if 1 solutions.push_back(Optimize(initial_sols.back(), m_max_cycles)); -#else - solutions.push_back(initial_sols.back()); -#endif pgassert(!solutions.empty()); msg.log << "best solution duration = " << solutions.back().duration(); @@ -162,30 +158,14 @@ Pgr_pickDeliver::Pgr_pickDeliver( return; } -#if 0 - pgassert(m_trucks.msg().get_error().empty()); - pgassert(msg().get_error().empty()); -#endif msg.log << "\n Checking fleet ..."; if (!m_trucks.is_fleet_ok()) { pgassert(msg.get_error().empty()); -#if 0 - pgassert(!m_trucks.msg.get_error().empty()); - msg.error << m_trucks.msg.get_error(); -#endif return; } msg.log << "fleet OK \n"; -#if 0 - for (const auto t : m_trucks) { - msg.log << t << "\n"; - } - for (const auto &o : m_orders) { - msg.log << o << "\n"; - } -#endif /* * check the (S, P, D, E) order on all vehicles @@ -199,39 +179,12 @@ Pgr_pickDeliver::Pgr_pickDeliver( << o.id() << " is not feasible on any truck"; msg.log << "\n" << o; -#if 0 - double old_speed(0); - for (auto t : m_trucks) { - if (old_speed == t.speed()) continue; - old_speed = t.speed(); - msg.log << "****** With speed: " << t.speed() << "\n"; - msg.log << t.start_site() << "\n"; - msg.log << o.pickup() << "\n"; - msg.log << "travel time to " - << t.start_site().travel_time_to( - o.pickup(), t.speed()) << "\n"; - - msg.log << o.delivery() << "\n"; - msg.log << t.end_site() << "\n"; - msg.log << "travel time to " - << t.start_site().travel_time_to( - o.delivery(), t.speed()) - << "\n"; - t.push_back(o); - } -#endif return; } } msg.log << "orders OK \n"; m_trucks.set_compatibles(m_orders); -#if 0 - msg.error << "foo"; - for (const auto t : m_trucks) { - msg.log << t << "\n"; - } -#endif EXITING(msg); } // constructor diff --git a/src/pickDeliver/vehicle.cpp b/src/pickDeliver/vehicle.cpp index 24c3cca2ee..6813eff026 100644 --- a/src/pickDeliver/vehicle.cpp +++ b/src/pickDeliver/vehicle.cpp @@ -429,17 +429,10 @@ Vehicle::Vehicle( m_capacity(p_m_capacity), m_factor(p_factor), m_speed(p_speed) { -#if 0 - ENTERING(); -#endif m_path.clear(); pgassert(starting_site.opens() <= starting_site.closes()); pgassert(ending_site.opens() <= ending_site.closes()); pgassert(capacity() > 0); -#if 0 - msg().log << "p_idx: " << p_idx << "\t idx(): " << idx() << "\n"; - msg().log << "p_id: " << p_id << "\tid(): " << id() << "\n"; -#endif m_path.push_back(starting_site); m_path.push_back(ending_site); @@ -447,9 +440,6 @@ Vehicle::Vehicle( evaluate(0); msg().log << tau() << "\n"; invariant(); -#if 0 - EXITING(); -#endif } diff --git a/src/pickDeliver/vehicle_pickDeliver.cpp b/src/pickDeliver/vehicle_pickDeliver.cpp index 4560f5bb62..5aa62b8d42 100644 --- a/src/pickDeliver/vehicle_pickDeliver.cpp +++ b/src/pickDeliver/vehicle_pickDeliver.cpp @@ -57,13 +57,7 @@ Vehicle_pickDeliver::Vehicle_pickDeliver( m_orders_in_vehicle(), m_orders(), m_feasable_orders() { -#if 0 - ENTERING(); -#endif invariant(); -#if 0 - EXITING(); -#endif } @@ -228,16 +222,9 @@ Vehicle_pickDeliver::do_while_feasable( Identifiers &unassigned, Identifiers &assigned) { pgassert(is_feasable()); -#if 0 - msg.log << "unasigned" << unassigned << "\n"; - msg.log << "m_feasable_orders" << m_feasable_orders << "\n"; -#endif auto current_feasable = m_feasable_orders * unassigned; while (!current_feasable.empty()) { -#if 0 - msg.log << "current_feasable" << current_feasable << "\n"; -#endif auto order = m_orders[current_feasable.front()]; switch (kind) { diff --git a/src/trsp/trspHandler.cpp b/src/trsp/trspHandler.cpp index ed1d58f35a..29963e5407 100644 --- a/src/trsp/trspHandler.cpp +++ b/src/trsp/trspHandler.cpp @@ -688,19 +688,6 @@ bool Pgr_trspHandler::addEdge(Edge_t edgeIn, bool directed) { } } -#if 0 - /* - * The edge was already inserted - * - * If the user has rows with repeated edge id, the subsequent edges will be ignored - * - * When changing to boost graph, the additional edges are to be added - */ - - if (m_mapEdgeId2Index.find(edgeIn.id) != m_mapEdgeId2Index.end()) { - return false; - } -#endif /* * the index of this new edge in the edges container is @@ -708,13 +695,6 @@ bool Pgr_trspHandler::addEdge(Edge_t edgeIn, bool directed) { */ EdgeInfo edge(edgeIn, m_edges.size()); -#if 0 - // Adding edge to the list - m_mapEdgeId2Index.insert( - std::make_pair( - edge.edgeID(), - m_edges.size())); -#endif m_edges.push_back(edge); diff --git a/src/tsp/tsp.cpp b/src/tsp/tsp.cpp index 5fb12ec4be..cfb0a1887a 100644 --- a/src/tsp/tsp.cpp +++ b/src/tsp/tsp.cpp @@ -510,14 +510,6 @@ std::ostream& operator<<(std::ostream &log, const TSP& data) { log << "Number of Edges is:" << num_edges(data.graph) << "\n"; log << "\n the print_graph\n"; boost::print_graph(data.graph, boost::get(boost::vertex_index, data.graph), log); -#if 0 - // to print with edge weights: - for (auto v : boost::make_iterator_range(boost::vertices(data.graph))) { - for (auto oe : boost::make_iterator_range(boost::out_edges(v, data.graph))) { - log << "Edge " << oe << " weight " << get(boost::edge_weight, data.graph)[oe] << "\n"; - } - } -#endif return log; } #endif From 501d982906e60e51b9d4204967705070fda34482 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 12 Oct 2024 23:04:21 -0600 Subject: [PATCH 14/16] (cpplint) ignoring flag because of clang-tidy fixes --- tools/scripts/code_checker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/scripts/code_checker.sh b/tools/scripts/code_checker.sh index 920c91c221..a7ef24cf22 100755 --- a/tools/scripts/code_checker.sh +++ b/tools/scripts/code_checker.sh @@ -54,7 +54,7 @@ if test -z "$DIRECTORY"; then echo "------ *.cpp ------" echo "--------------------" code_linter/cpplint/cpplint.py --linelength=120 \ - --filter=-runtime/references,-whitespace/indent_namespace,"${INCLUDE_ORDER}" \ + --filter=-readability/nolint,-runtime/references,-whitespace/indent_namespace,"${INCLUDE_ORDER}" \ --linelength=120 src/*/*.cpp echo "--------------------" From b15d07089271dd78f5531b17f6e686b83b5a9b1d Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 12:18:00 -0600 Subject: [PATCH 15/16] (tidy) Fixing errors --- include/breadthFirstSearch/breadthFirstSearch.hpp | 3 ++- include/lineGraph/lineGraphFull.hpp | 2 +- src/breadthFirstSearch/breadthFirstSearch_driver.cpp | 2 ++ src/coloring/bipartite_driver.cpp | 2 ++ src/coloring/edgeColoring.cpp | 2 ++ src/components/components.cpp | 1 + src/driving_distance/driving_distance_withPoints.c | 2 +- src/pickDeliver/optimize.cpp | 2 +- src/spanningTree/kruskal_driver.cpp | 2 ++ src/spanningTree/prim_driver.cpp | 2 ++ 10 files changed, 16 insertions(+), 4 deletions(-) diff --git a/include/breadthFirstSearch/breadthFirstSearch.hpp b/include/breadthFirstSearch/breadthFirstSearch.hpp index 7dd474b04e..83e139ad58 100644 --- a/include/breadthFirstSearch/breadthFirstSearch.hpp +++ b/include/breadthFirstSearch/breadthFirstSearch.hpp @@ -28,12 +28,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include +#include #include #include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/mst_rt.h" +#include "visitors/edges_order_bfs_visitor.hpp" //****************************************** diff --git a/include/lineGraph/lineGraphFull.hpp b/include/lineGraph/lineGraphFull.hpp index c433f3ad31..a6cf3dff59 100644 --- a/include/lineGraph/lineGraphFull.hpp +++ b/include/lineGraph/lineGraphFull.hpp @@ -55,7 +55,7 @@ class Pgr_lineGraphFull : public Pgr_base_graph { typedef typename boost::graph_traits < G >::in_edge_iterator EI_i; - explicit Pgr_lineGraphFull< G, T_V, T_E, t_directed>(bool directed) + explicit Pgr_lineGraphFull< G, T_V, T_E, t_directed>() : Pgr_base_graph(), m_num_edges(0) { } diff --git a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp index 728a454945..06eb026f2a 100644 --- a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp @@ -77,11 +77,13 @@ pgr_do_breadthFirstSearch( char *hint = nullptr; try { + // NOLINTBEGIN(clang-analyzer-cplusplus.NewDelete) pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); + // NOLINTEND(clang-analyzer-cplusplus.NewDelete) diff --git a/src/coloring/bipartite_driver.cpp b/src/coloring/bipartite_driver.cpp index 29e2014ffd..66f1f779eb 100644 --- a/src/coloring/bipartite_driver.cpp +++ b/src/coloring/bipartite_driver.cpp @@ -63,11 +63,13 @@ pgr_do_bipartite( try { + // NOLINTBEGIN(clang-analyzer-cplusplus.NewDelete) pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); + // NOLINTEND(clang-analyzer-cplusplus.NewDelete) hint = edges_sql; auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); diff --git a/src/coloring/edgeColoring.cpp b/src/coloring/edgeColoring.cpp index 1f427a8939..35ff877b0e 100644 --- a/src/coloring/edgeColoring.cpp +++ b/src/coloring/edgeColoring.cpp @@ -89,6 +89,7 @@ Pgr_edgeColoring::Pgr_edgeColoring(const std::vector &edges) { auto v1 = get_boost_vertex(edge.source); auto v2 = get_boost_vertex(edge.target); auto e_exists = boost::edge(v1, v2, graph); + // NOLINTNEXTLINE if (e_exists.second) continue; if (edge.source == edge.target) continue; @@ -96,6 +97,7 @@ Pgr_edgeColoring::Pgr_edgeColoring(const std::vector &edges) { if (edge.cost < 0 && edge.reverse_cost < 0) continue; E e; + // NOLINTNEXTLINE boost::tie(e, added) = boost::add_edge(v1, v2, graph); E_to_id.insert(std::make_pair(e, edge.id)); diff --git a/src/components/components.cpp b/src/components/components.cpp index f38c183c62..c2dbf824ad 100644 --- a/src/components/components.cpp +++ b/src/components/components.cpp @@ -110,6 +110,7 @@ biconnectedComponents( boost::associative_property_map bimap(bicmp_map); size_t num_comps; try { + // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDelete) num_comps = biconnected_components(graph.graph, bimap); } catch (...) { throw; diff --git a/src/driving_distance/driving_distance_withPoints.c b/src/driving_distance/driving_distance_withPoints.c index b320009d35..130e633f97 100644 --- a/src/driving_distance/driving_distance_withPoints.c +++ b/src/driving_distance/driving_distance_withPoints.c @@ -70,7 +70,7 @@ process( } } else { /* TODO remove on v4 */ - char d_side = (char)tolower(driving_side[0]); + d_side = (char)tolower(driving_side[0]); if (!((d_side == 'r') || (d_side == 'l'))) d_side = 'b'; } diff --git a/src/pickDeliver/optimize.cpp b/src/pickDeliver/optimize.cpp index 5331753b7f..983aeb5290 100644 --- a/src/pickDeliver/optimize.cpp +++ b/src/pickDeliver/optimize.cpp @@ -249,7 +249,7 @@ Optimize::swap_worse(Vehicle_pickDeliver &to, Vehicle_pickDeliver &from) { } } - return false && swapped; + return swapped; } diff --git a/src/spanningTree/kruskal_driver.cpp b/src/spanningTree/kruskal_driver.cpp index 05c4714824..91d9b2328a 100644 --- a/src/spanningTree/kruskal_driver.cpp +++ b/src/spanningTree/kruskal_driver.cpp @@ -68,11 +68,13 @@ pgr_do_kruskal( char *hint = nullptr; try { + // NOLINTBEGIN(clang-analyzer-cplusplus.NewDelete) pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); + // NOLINTEND(clang-analyzer-cplusplus.NewDelete) auto roots = get_intArray(starts, false); diff --git a/src/spanningTree/prim_driver.cpp b/src/spanningTree/prim_driver.cpp index e5a124bc9d..de2f06b5ff 100644 --- a/src/spanningTree/prim_driver.cpp +++ b/src/spanningTree/prim_driver.cpp @@ -70,11 +70,13 @@ pgr_do_prim( char *hint = nullptr; try { + // NOLINTBEGIN(clang-analyzer-cplusplus.NewDelete) pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); + // NOLINTEND(clang-analyzer-cplusplus.NewDelete) auto roots = get_intArray(starts, false); From f6a2e672cdc22dbd81f8a93752106c5aeb25cdae Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 12 Oct 2024 23:14:55 -0600 Subject: [PATCH 16/16] (C++) fix warning on C++13.2 --- include/chinese/chinesePostman.hpp | 2 -- src/astar/astar.c | 2 +- src/bdAstar/bdAstar.c | 4 ++-- src/bdDijkstra/bdDijkstra.c | 4 ++-- src/bellman_ford/bellman_ford.c | 4 ++-- src/bellman_ford/bellman_ford_neg.c | 2 +- src/bellman_ford/edwardMoore.c | 4 ++-- src/breadthFirstSearch/binaryBreadthFirstSearch.c | 4 ++-- src/common/basePath_SSEC.cpp | 2 -- src/dagShortestPath/dagShortestPath.c | 4 ++-- src/dijkstra/dijkstra.c | 4 ++-- src/driving_distance/driving_distance.c | 2 +- src/driving_distance/driving_distance_withPoints.c | 2 +- src/ksp/ksp.c | 6 +++--- src/ksp/turnRestrictedPath.c | 6 +++--- src/ksp/withPoints_ksp.c | 6 +++--- src/trsp/trsp.c | 8 ++++---- src/trsp/trsp_withPoints.c | 4 ++-- src/tsp/tsp.cpp | 8 ++++---- src/withPoints/withPoints.c | 4 ++-- src/withPoints/withPoints.cpp | 2 -- 21 files changed, 39 insertions(+), 45 deletions(-) diff --git a/include/chinese/chinesePostman.hpp b/include/chinese/chinesePostman.hpp index fe4d529a1e..501769a111 100644 --- a/include/chinese/chinesePostman.hpp +++ b/include/chinese/chinesePostman.hpp @@ -139,7 +139,6 @@ PgrDirectedChPPGraph::PgrDirectedChPPGraph(const std::vector &dataEdges) // calcu deg & build part of edges std::map deg; - size_t i(0); for (const auto &e : originalEdges) { pgassert(e.cost > 0); /* has out going edge */ @@ -165,7 +164,6 @@ PgrDirectedChPPGraph::PgrDirectedChPPGraph(const std::vector &dataEdges) edge.capacity = (std::numeric_limits::max)(); edge.cost = e.cost; edges.push_back(edge); - ++i; } superSource = deg.rbegin()->first + 1; diff --git a/src/astar/astar.c b/src/astar/astar.c index 444a29b754..1bf9284269 100644 --- a/src/astar/astar.c +++ b/src/astar/astar.c @@ -184,7 +184,7 @@ _pgr_astar(PG_FUNCTION_ARGS) { int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; values[0] = Int32GetDatum((int32_t)call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); diff --git a/src/bdAstar/bdAstar.c b/src/bdAstar/bdAstar.c index 06f2404c0a..64359b91dd 100644 --- a/src/bdAstar/bdAstar.c +++ b/src/bdAstar/bdAstar.c @@ -179,8 +179,8 @@ _pgr_bdastar(PG_FUNCTION_ARGS) { int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; - values[0] = Int32GetDatum(call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)call_cntr + 1); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); diff --git a/src/bdDijkstra/bdDijkstra.c b/src/bdDijkstra/bdDijkstra.c index ec75c82317..843efdf289 100644 --- a/src/bdDijkstra/bdDijkstra.c +++ b/src/bdDijkstra/bdDijkstra.c @@ -161,8 +161,8 @@ PGDLLEXPORT Datum _pgr_bddijkstra(PG_FUNCTION_ARGS) { int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; - values[0] = Int32GetDatum(call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)call_cntr + 1); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); diff --git a/src/bellman_ford/bellman_ford.c b/src/bellman_ford/bellman_ford.c index a26e0e6303..60962c06de 100644 --- a/src/bellman_ford/bellman_ford.c +++ b/src/bellman_ford/bellman_ford.c @@ -165,8 +165,8 @@ _pgr_bellmanford(PG_FUNCTION_ARGS) { int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[funcctx->call_cntr].node); diff --git a/src/bellman_ford/bellman_ford_neg.c b/src/bellman_ford/bellman_ford_neg.c index c922f781a5..d5c9f1fe4b 100644 --- a/src/bellman_ford/bellman_ford_neg.c +++ b/src/bellman_ford/bellman_ford_neg.c @@ -169,7 +169,7 @@ _pgr_bellmanfordneg(PG_FUNCTION_ARGS) { int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[funcctx->call_cntr].node); diff --git a/src/bellman_ford/edwardMoore.c b/src/bellman_ford/edwardMoore.c index 7e14b5dd3a..929dacf36d 100644 --- a/src/bellman_ford/edwardMoore.c +++ b/src/bellman_ford/edwardMoore.c @@ -158,8 +158,8 @@ PGDLLEXPORT Datum _pgr_edwardmoore(PG_FUNCTION_ARGS) { int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t) funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[funcctx->call_cntr].node); diff --git a/src/breadthFirstSearch/binaryBreadthFirstSearch.c b/src/breadthFirstSearch/binaryBreadthFirstSearch.c index 423628c0c2..e8a5734a29 100644 --- a/src/breadthFirstSearch/binaryBreadthFirstSearch.c +++ b/src/breadthFirstSearch/binaryBreadthFirstSearch.c @@ -158,8 +158,8 @@ PGDLLEXPORT Datum _pgr_binarybreadthfirstsearch(PG_FUNCTION_ARGS) { int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[funcctx->call_cntr].node); diff --git a/src/common/basePath_SSEC.cpp b/src/common/basePath_SSEC.cpp index d80d0caf42..c2f62c6825 100644 --- a/src/common/basePath_SSEC.cpp +++ b/src/common/basePath_SSEC.cpp @@ -234,7 +234,6 @@ void Path::append(const Path &other) { void Path::generate_postgres_data( Path_rt **postgres_data, size_t &sequence) const { - int i = 1; for (const auto e : path) { auto agg_cost = std::fabs( e.agg_cost - (std::numeric_limits::max)()) < 1? @@ -243,7 +242,6 @@ void Path::generate_postgres_data( std::numeric_limits::infinity() : e.cost; (*postgres_data)[sequence] = {start_id(), end_id(), e.node, e.edge, cost, agg_cost}; - ++i; ++sequence; } } diff --git a/src/dagShortestPath/dagShortestPath.c b/src/dagShortestPath/dagShortestPath.c index 8e50d3fe1e..74295b2a90 100644 --- a/src/dagShortestPath/dagShortestPath.c +++ b/src/dagShortestPath/dagShortestPath.c @@ -165,8 +165,8 @@ PGDLLEXPORT Datum _pgr_dagshortestpath(PG_FUNCTION_ARGS) { int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].node); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].edge); values[4] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); diff --git a/src/dijkstra/dijkstra.c b/src/dijkstra/dijkstra.c index 2dc6c82993..0e47f3a641 100644 --- a/src/dijkstra/dijkstra.c +++ b/src/dijkstra/dijkstra.c @@ -218,8 +218,8 @@ _pgr_dijkstra(PG_FUNCTION_ARGS) { int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; - values[0] = Int32GetDatum(call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)call_cntr + 1); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); diff --git a/src/driving_distance/driving_distance.c b/src/driving_distance/driving_distance.c index c60255f819..d687beb3da 100644 --- a/src/driving_distance/driving_distance.c +++ b/src/driving_distance/driving_distance.c @@ -142,7 +142,7 @@ _pgr_drivingdistancev4(PG_FUNCTION_ARGS) { for (i = 0; i < numb; ++i) { nulls[i] = false; } - values[0] = Int32GetDatum(funcctx->call_cntr + 1); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].depth); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].from_v); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].pred); diff --git a/src/driving_distance/driving_distance_withPoints.c b/src/driving_distance/driving_distance_withPoints.c index 130e633f97..236f23546c 100644 --- a/src/driving_distance/driving_distance_withPoints.c +++ b/src/driving_distance/driving_distance_withPoints.c @@ -176,7 +176,7 @@ _pgr_withpointsddv4(PG_FUNCTION_ARGS) { nulls[i] = false; } - values[0] = Int64GetDatum(funcctx->call_cntr + 1); + values[0] = Int64GetDatum((int64_t)funcctx->call_cntr + 1); values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].depth); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].from_v); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].pred); diff --git a/src/ksp/ksp.c b/src/ksp/ksp.c index 100b6708a2..5476f588bd 100644 --- a/src/ksp/ksp.c +++ b/src/ksp/ksp.c @@ -197,9 +197,9 @@ _pgr_ksp(PG_FUNCTION_ARGS) { } int64_t seq = funcctx->call_cntr == 0? 1 : path[funcctx->call_cntr - 1].end_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(path_id); - values[2] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)path_id); + values[2] = Int32GetDatum((int32_t)seq); if (PG_NARGS() != 6) { values[3] = Int64GetDatum(path[funcctx->call_cntr].start_id); values[4] = Int64GetDatum(path[funcctx->call_cntr].end_id); diff --git a/src/ksp/turnRestrictedPath.c b/src/ksp/turnRestrictedPath.c index 34eb7eb90e..e0de7adbf8 100644 --- a/src/ksp/turnRestrictedPath.c +++ b/src/ksp/turnRestrictedPath.c @@ -175,9 +175,9 @@ _pgr_turnrestrictedpath(PG_FUNCTION_ARGS) { int64_t seq = funcctx->call_cntr == 0? 1 : path[funcctx->call_cntr - 1].start_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(path[funcctx->call_cntr].start_id + 1); - values[2] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)path[funcctx->call_cntr].start_id + 1); + values[2] = Int32GetDatum((int32_t)seq); values[3] = Int64GetDatum(path[funcctx->call_cntr].node); values[4] = Int64GetDatum(path[funcctx->call_cntr].edge); values[5] = Float8GetDatum(path[funcctx->call_cntr].cost); diff --git a/src/ksp/withPoints_ksp.c b/src/ksp/withPoints_ksp.c index 0632ef6854..316bf102b5 100644 --- a/src/ksp/withPoints_ksp.c +++ b/src/ksp/withPoints_ksp.c @@ -249,9 +249,9 @@ PGDLLEXPORT Datum _pgr_withpointsksp(PG_FUNCTION_ARGS) { } int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].end_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(path_id); - values[2] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)path_id); + values[2] = Int32GetDatum((int32_t)seq); if (PG_NARGS() != 9) { values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].start_id); values[4] = Int64GetDatum(result_tuples[funcctx->call_cntr].end_id); diff --git a/src/trsp/trsp.c b/src/trsp/trsp.c index fe7a6cd3bc..8a221bd575 100644 --- a/src/trsp/trsp.c +++ b/src/trsp/trsp.c @@ -161,7 +161,7 @@ _pgr_trspv4(PG_FUNCTION_ARGS) { int64_t path_seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; values[0] = Int32GetDatum((int32_t)call_cntr + 1); - values[1] = Int32GetDatum(path_seq); + values[1] = Int32GetDatum((int32_t)path_seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); @@ -257,7 +257,7 @@ _v4trsp(PG_FUNCTION_ARGS) { int64_t path_seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; values[0] = Int32GetDatum((int32_t)call_cntr + 1); - values[1] = Int32GetDatum(path_seq); + values[1] = Int32GetDatum((int32_t)path_seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); @@ -341,8 +341,8 @@ _trsp(PG_FUNCTION_ARGS) { int64_t path_seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; - values[0] = Int32GetDatum(call_cntr + 1); - values[1] = Int32GetDatum(path_seq); + values[0] = Int32GetDatum((int32_t)call_cntr + 1); + values[1] = Int32GetDatum((int32_t)path_seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); diff --git a/src/trsp/trsp_withPoints.c b/src/trsp/trsp_withPoints.c index 5f0f04cee5..87052fd311 100644 --- a/src/trsp/trsp_withPoints.c +++ b/src/trsp/trsp_withPoints.c @@ -206,8 +206,8 @@ _pgr_trsp_withpoints(PG_FUNCTION_ARGS) { } int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; - values[0] = Int32GetDatum(call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)call_cntr + 1); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); diff --git a/src/tsp/tsp.cpp b/src/tsp/tsp.cpp index cfb0a1887a..8023905861 100644 --- a/src/tsp/tsp.cpp +++ b/src/tsp/tsp.cpp @@ -230,7 +230,7 @@ TSP::tsp( auto u = get_boost_vertex(start_vid); auto v = get_boost_vertex(end_vid); - auto dummy_node = add_vertex(num_vertices(graph), graph); + auto dummy_node = add_vertex(static_cast(num_vertices(graph)), graph); id_to_V.insert(std::make_pair(0, dummy_node)); V_to_id.insert(std::make_pair(dummy_node, 0)); boost::add_edge(u, dummy_node, 0, graph); @@ -299,8 +299,8 @@ TSP::TSP(std::vector &distances) { } } - size_t i {0}; - for (const auto id : ids) { + int i {0}; + for (const auto &id : ids) { auto v = add_vertex(i, graph); id_to_V.insert(std::make_pair(id, v)); V_to_id.insert(std::make_pair(v, id)); @@ -384,7 +384,7 @@ TSP::TSP(const std::vector &coordinates) { /* * Inserting vertices */ - size_t i{0}; + int i{0}; for (const auto &id : ids) { auto v = add_vertex(i, graph); id_to_V.insert(std::make_pair(id, v)); diff --git a/src/withPoints/withPoints.c b/src/withPoints/withPoints.c index 4325e8ce30..6a2036bab8 100644 --- a/src/withPoints/withPoints.c +++ b/src/withPoints/withPoints.c @@ -200,8 +200,8 @@ _pgr_withpoints(PG_FUNCTION_ARGS) { int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[funcctx->call_cntr].node); diff --git a/src/withPoints/withPoints.cpp b/src/withPoints/withPoints.cpp index df4c9f6a83..9123fed8de 100644 --- a/src/withPoints/withPoints.cpp +++ b/src/withPoints/withPoints.cpp @@ -341,7 +341,6 @@ Pg_points_graph::create_new_edges() { << point.vertex_id << "\n"; } - int64_t vertex_id = 1; std::vector< Point_on_edge_t > new_points; for (const auto edge : m_edges_of_points) { std::set< Point_on_edge_t, pointCompare> points_on_edge; @@ -400,7 +399,6 @@ Pg_points_graph::create_new_edges() { if (point.fraction > 0 && point.fraction < 1) { log << "vertex_id of the point is " << -point.pid << "\n"; point.vertex_id = -point.pid; - ++vertex_id; } new_points.push_back(point);