From 3273df0d2a95ec9646b95ce0c24dc78485c8fa61 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jul 2024 13:24:55 -0600 Subject: [PATCH 01/28] (include/initialsol) *.h -> *.hpp --- include/initialsol/{initials_code.h => initials_code.hpp} | 0 include/initialsol/{simple.h => simple.hpp} | 0 include/initialsol/{tabu.h => tabu.hpp} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename include/initialsol/{initials_code.h => initials_code.hpp} (100%) rename include/initialsol/{simple.h => simple.hpp} (100%) rename include/initialsol/{tabu.h => tabu.hpp} (100%) diff --git a/include/initialsol/initials_code.h b/include/initialsol/initials_code.hpp similarity index 100% rename from include/initialsol/initials_code.h rename to include/initialsol/initials_code.hpp diff --git a/include/initialsol/simple.h b/include/initialsol/simple.hpp similarity index 100% rename from include/initialsol/simple.h rename to include/initialsol/simple.hpp diff --git a/include/initialsol/tabu.h b/include/initialsol/tabu.hpp similarity index 100% rename from include/initialsol/tabu.h rename to include/initialsol/tabu.hpp From 6e5c671ed9d9e1112dbc64a1b0172c0b3fa5645b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 10:04:00 -0600 Subject: [PATCH 02/28] Adjusting code to header renames on include/initialsol --- include/initialsol/initials_code.hpp | 8 ++++---- include/initialsol/simple.hpp | 10 +++++----- include/initialsol/tabu.hpp | 8 ++++---- include/optimizers/simple.h | 2 +- include/vrp/initial_solution.h | 2 +- include/vrp/initials_code.h | 2 +- src/initialsol/simple.cpp | 2 +- src/initialsol/tabu.cpp | 2 +- src/optimize/optimize_driver.cpp | 2 +- src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp | 2 +- src/pgr_pickDeliver/pickDeliver_driver.cpp | 4 ++-- src/pickDeliver/pickDeliver_driver.cpp | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/initialsol/initials_code.hpp b/include/initialsol/initials_code.hpp index b48320d6d..98ae91305 100644 --- a/include/initialsol/initials_code.hpp +++ b/include/initialsol/initials_code.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: initials_code.h +FILE: initials_code.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. /*! @file */ -#ifndef INCLUDE_INITIALSOL_INITIALS_CODE_H_ -#define INCLUDE_INITIALSOL_INITIALS_CODE_H_ +#ifndef INCLUDE_INITIALSOL_INITIALS_CODE_HPP_ +#define INCLUDE_INITIALSOL_INITIALS_CODE_HPP_ #pragma once namespace vrprouting { @@ -49,4 +49,4 @@ enum Initials_code { } // namespace initialsol } // namespace vrprouting -#endif // INCLUDE_INITIALSOL_INITIALS_CODE_H_ +#endif // INCLUDE_INITIALSOL_INITIALS_CODE_HPP_ diff --git a/include/initialsol/simple.hpp b/include/initialsol/simple.hpp index a7059a528..0941f50d6 100644 --- a/include/initialsol/simple.hpp +++ b/include/initialsol/simple.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: initial_solution.h +FILE: simple.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. /*! @file */ -#ifndef INCLUDE_INITIALSOL_SIMPLE_H_ -#define INCLUDE_INITIALSOL_SIMPLE_H_ +#ifndef INCLUDE_INITIALSOL_SIMPLE_HPP_ +#define INCLUDE_INITIALSOL_SIMPLE_HPP_ #pragma once #include "cpp_common/identifiers.hpp" #include "problem/solution.h" -#include "initialsol/initials_code.h" +#include "initialsol/initials_code.hpp" namespace vrprouting { namespace problem { @@ -72,4 +72,4 @@ class Initial_solution : public problem::Solution { } // namespace initialsol } // namespace vrprouting -#endif // INCLUDE_INITIALSOL_SIMPLE_H_ +#endif // INCLUDE_INITIALSOL_SIMPLE_HPP_ diff --git a/include/initialsol/tabu.hpp b/include/initialsol/tabu.hpp index 47b58dd25..04fb96f71 100644 --- a/include/initialsol/tabu.hpp +++ b/include/initialsol/tabu.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: initial_solution.h +FILE: tabu.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. /** @file */ -#ifndef INCLUDE_INITIALSOL_TABU_H_ -#define INCLUDE_INITIALSOL_TABU_H_ +#ifndef INCLUDE_INITIALSOL_TABU_HPP_ +#define INCLUDE_INITIALSOL_TABU_HPP_ #pragma once #include "c_types/typedefs.h" @@ -76,4 +76,4 @@ class Initial_solution : public problem::Solution { } // namespace initialsol } // namespace vrprouting -#endif // INCLUDE_INITIALSOL_TABU_H_ +#endif // INCLUDE_INITIALSOL_TABU_HPP_ diff --git a/include/optimizers/simple.h b/include/optimizers/simple.h index d926082a3..612226701 100644 --- a/include/optimizers/simple.h +++ b/include/optimizers/simple.h @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "problem/solution.h" #include "problem/vehicle_pickDeliver.h" -#include "initialsol/initials_code.h" +#include "initialsol/initials_code.hpp" namespace vrprouting { namespace optimizers { diff --git a/include/vrp/initial_solution.h b/include/vrp/initial_solution.h index 22b1efb7e..2feea0d08 100644 --- a/include/vrp/initial_solution.h +++ b/include/vrp/initial_solution.h @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "vrp/pd_orders.h" #include "vrp/solution.h" -#include "vrp/initials_code.h" +#include "vrp/initials_code.hpp" #include "cpp_common/identifiers.hpp" namespace vrprouting { diff --git a/include/vrp/initials_code.h b/include/vrp/initials_code.h index f37ae7923..49989f54d 100644 --- a/include/vrp/initials_code.h +++ b/include/vrp/initials_code.h @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: initials_code.h +FILE: initials_code.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/initialsol/simple.cpp b/src/initialsol/simple.cpp index 5f1fcb6db..7aa0fd61d 100644 --- a/src/initialsol/simple.cpp +++ b/src/initialsol/simple.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "initialsol/simple.h" +#include "initialsol/simple.hpp" #include #include #include diff --git a/src/initialsol/tabu.cpp b/src/initialsol/tabu.cpp index dd37f6b5b..fe36f69c6 100644 --- a/src/initialsol/tabu.cpp +++ b/src/initialsol/tabu.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "initialsol/tabu.h" +#include "initialsol/tabu.hpp" #include #include #include diff --git a/src/optimize/optimize_driver.cpp b/src/optimize/optimize_driver.cpp index 85fbce4ed..6ec94d978 100644 --- a/src/optimize/optimize_driver.cpp +++ b/src/optimize/optimize_driver.cpp @@ -45,7 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgr_assert.h" #include "cpp_common/pgr_messages.h" -#include "initialsol/tabu.h" +#include "initialsol/tabu.hpp" #include "optimizers/tabu.h" #include "c_common/pgr_alloc.hpp" #include "cpp_common/interruption.h" diff --git a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp b/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp index 92746c1ad..e0214330b 100644 --- a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp +++ b/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgr_assert.h" #include "problem/matrix.h" -#include "initialsol/simple.h" +#include "initialsol/simple.hpp" #include "optimizers/simple.h" #include "problem/pickDeliver.h" diff --git a/src/pgr_pickDeliver/pickDeliver_driver.cpp b/src/pgr_pickDeliver/pickDeliver_driver.cpp index e0401e64c..ca5d2ddde 100644 --- a/src/pgr_pickDeliver/pickDeliver_driver.cpp +++ b/src/pgr_pickDeliver/pickDeliver_driver.cpp @@ -40,11 +40,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" #include "problem/solution.h" -#include "initialsol/simple.h" +#include "initialsol/simple.hpp" #include "optimizers/simple.h" #include "problem/pickDeliver.h" -#include "initialsol/initials_code.h" +#include "initialsol/initials_code.hpp" #include "problem/matrix.h" namespace { diff --git a/src/pickDeliver/pickDeliver_driver.cpp b/src/pickDeliver/pickDeliver_driver.cpp index 0068b2787..153c509be 100644 --- a/src/pickDeliver/pickDeliver_driver.cpp +++ b/src/pickDeliver/pickDeliver_driver.cpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "problem/matrix.h" #include "cpp_common/pgr_assert.h" -#include "initialsol/tabu.h" +#include "initialsol/tabu.hpp" #include "optimizers/tabu.h" #include "c_common/pgr_alloc.hpp" From 41a377671abf0bcd46ed59bc8c868f9c62c14b0e Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jul 2024 13:24:55 -0600 Subject: [PATCH 03/28] (include/drivers) subdir/*.h -> *.h --- ...eliverEuclidean_driver.h => pgr_pickDeliverEuclidean_driver.h} | 0 .../pickDeliver_driver.h => pgr_pickDeliver_driver.h} | 0 include/drivers/{vroom => }/vroom_driver.h | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename include/drivers/{pgr_pickDeliver/pickDeliverEuclidean_driver.h => pgr_pickDeliverEuclidean_driver.h} (100%) rename include/drivers/{pgr_pickDeliver/pickDeliver_driver.h => pgr_pickDeliver_driver.h} (100%) rename include/drivers/{vroom => }/vroom_driver.h (100%) diff --git a/include/drivers/pgr_pickDeliver/pickDeliverEuclidean_driver.h b/include/drivers/pgr_pickDeliverEuclidean_driver.h similarity index 100% rename from include/drivers/pgr_pickDeliver/pickDeliverEuclidean_driver.h rename to include/drivers/pgr_pickDeliverEuclidean_driver.h diff --git a/include/drivers/pgr_pickDeliver/pickDeliver_driver.h b/include/drivers/pgr_pickDeliver_driver.h similarity index 100% rename from include/drivers/pgr_pickDeliver/pickDeliver_driver.h rename to include/drivers/pgr_pickDeliver_driver.h diff --git a/include/drivers/vroom/vroom_driver.h b/include/drivers/vroom_driver.h similarity index 100% rename from include/drivers/vroom/vroom_driver.h rename to include/drivers/vroom_driver.h From bc228f7847ca791b0bd9c1cfc2af7c9319063cb5 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 10:18:07 -0600 Subject: [PATCH 04/28] Adjusting code to header renames on include/drivers --- include/drivers/optimize_driver.h | 2 +- include/drivers/pgr_pickDeliverEuclidean_driver.h | 8 ++++---- include/drivers/pgr_pickDeliver_driver.h | 8 ++++---- include/drivers/vroom_driver.h | 6 +++--- src/pgr_pickDeliver/pickDeliver.c | 2 +- src/pgr_pickDeliver/pickDeliverEuclidean.c | 2 +- src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp | 2 +- src/pgr_pickDeliver/pickDeliver_driver.cpp | 2 +- src/vroom/vroom.c | 2 +- src/vroom/vroom_driver.cpp | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/drivers/optimize_driver.h b/include/drivers/optimize_driver.h index cc7d897f1..2de6e557d 100644 --- a/include/drivers/optimize_driver.h +++ b/include/drivers/optimize_driver.h @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pickDeliver_driver.h +File: optimize_driver.h Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/drivers/pgr_pickDeliverEuclidean_driver.h b/include/drivers/pgr_pickDeliverEuclidean_driver.h index aec09017a..de1fb0296 100644 --- a/include/drivers/pgr_pickDeliverEuclidean_driver.h +++ b/include/drivers/pgr_pickDeliverEuclidean_driver.h @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pickDeliverEuclidean_driver.h +File: pgr_pickDeliverEuclidean_driver.h Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file pickDeliverEuclidean_driver.h */ -#ifndef INCLUDE_DRIVERS_PGR_PICKDELIVER_PICKDELIVEREUCLIDEAN_DRIVER_H_ -#define INCLUDE_DRIVERS_PGR_PICKDELIVER_PICKDELIVEREUCLIDEAN_DRIVER_H_ +#ifndef INCLUDE_DRIVERS_PGR_PICKDELIVEREUCLIDEAN_DRIVER_H_ +#define INCLUDE_DRIVERS_PGR_PICKDELIVEREUCLIDEAN_DRIVER_H_ #pragma once /* for size-t */ @@ -73,4 +73,4 @@ extern "C" { } #endif -#endif // INCLUDE_DRIVERS_PGR_PICKDELIVER_PICKDELIVEREUCLIDEAN_DRIVER_H_ +#endif // INCLUDE_DRIVERS_PGR_PICKDELIVEREUCLIDEAN_DRIVER_H_ diff --git a/include/drivers/pgr_pickDeliver_driver.h b/include/drivers/pgr_pickDeliver_driver.h index 8c3bdc72a..2e963c0c9 100644 --- a/include/drivers/pgr_pickDeliver_driver.h +++ b/include/drivers/pgr_pickDeliver_driver.h @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pickDeliver_driver.h +File: pgr_pickDeliver_driver.h Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file pickDeliver_driver.h */ -#ifndef INCLUDE_DRIVERS_PGR_PICKDELIVER_PICKDELIVER_DRIVER_H_ -#define INCLUDE_DRIVERS_PGR_PICKDELIVER_PICKDELIVER_DRIVER_H_ +#ifndef INCLUDE_DRIVERS_PGR_PICKDELIVER_DRIVER_H_ +#define INCLUDE_DRIVERS_PGR_PICKDELIVER_DRIVER_H_ #pragma once /* for size-t */ @@ -76,4 +76,4 @@ extern "C" { } #endif -#endif // INCLUDE_DRIVERS_PGR_PICKDELIVER_PICKDELIVER_DRIVER_H_ +#endif // INCLUDE_DRIVERS_PGR_PICKDELIVER_DRIVER_H_ diff --git a/include/drivers/vroom_driver.h b/include/drivers/vroom_driver.h index e91af2c29..223343ccd 100644 --- a/include/drivers/vroom_driver.h +++ b/include/drivers/vroom_driver.h @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DRIVERS_VROOM_VROOM_DRIVER_H_ -#define INCLUDE_DRIVERS_VROOM_VROOM_DRIVER_H_ +#ifndef INCLUDE_DRIVERS_VROOM_DRIVER_H_ +#define INCLUDE_DRIVERS_VROOM_DRIVER_H_ #pragma once #include "c_types/typedefs.h" @@ -61,4 +61,4 @@ extern "C" { } #endif -#endif // INCLUDE_DRIVERS_VROOM_VROOM_DRIVER_H_ +#endif // INCLUDE_DRIVERS_VROOM_DRIVER_H_ diff --git a/src/pgr_pickDeliver/pickDeliver.c b/src/pgr_pickDeliver/pickDeliver.c index d123f88f7..e7bc5b201 100644 --- a/src/pgr_pickDeliver/pickDeliver.c +++ b/src/pgr_pickDeliver/pickDeliver.c @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/matrixRows_input.h" #include "c_types/pickDeliveryOrders_t.h" #include "c_types/solution_rt.h" -#include "drivers/pgr_pickDeliver/pickDeliver_driver.h" +#include "drivers/pgr_pickDeliver_driver.h" PGDLLEXPORT Datum _vrp_pgr_pickdeliver(PG_FUNCTION_ARGS); diff --git a/src/pgr_pickDeliver/pickDeliverEuclidean.c b/src/pgr_pickDeliver/pickDeliverEuclidean.c index 9c0530cea..3749c0755 100644 --- a/src/pgr_pickDeliver/pickDeliverEuclidean.c +++ b/src/pgr_pickDeliver/pickDeliverEuclidean.c @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/pickDeliveryOrders_t.h" #include "c_types/solution_rt.h" -#include "drivers/pgr_pickDeliver/pickDeliverEuclidean_driver.h" +#include "drivers/pgr_pickDeliverEuclidean_driver.h" PGDLLEXPORT Datum _vrp_pgr_pickdelivereuclidean(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_vrp_pgr_pickdelivereuclidean); diff --git a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp b/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp index e0214330b..31f3c0c6b 100644 --- a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp +++ b/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "drivers/pgr_pickDeliver/pickDeliverEuclidean_driver.h" +#include "drivers/pgr_pickDeliverEuclidean_driver.h" #include #include diff --git a/src/pgr_pickDeliver/pickDeliver_driver.cpp b/src/pgr_pickDeliver/pickDeliver_driver.cpp index ca5d2ddde..7ee7bfebd 100644 --- a/src/pgr_pickDeliver/pickDeliver_driver.cpp +++ b/src/pgr_pickDeliver/pickDeliver_driver.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "drivers/pgr_pickDeliver/pickDeliver_driver.h" +#include "drivers/pgr_pickDeliver_driver.h" #include #include diff --git a/src/vroom/vroom.c b/src/vroom/vroom.c index 9d3b242e7..4294032a7 100644 --- a/src/vroom/vroom.c +++ b/src/vroom/vroom.c @@ -60,7 +60,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/vroom/vehicles_input.h" #include "c_common/vroom/matrix_input.h" -#include "drivers/vroom/vroom_driver.h" +#include "drivers//vroom_driver.h" PGDLLEXPORT Datum _vrp_vroom(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_vrp_vroom); diff --git a/src/vroom/vroom_driver.cpp b/src/vroom/vroom_driver.cpp index 39391a5cc..62a39676c 100644 --- a/src/vroom/vroom_driver.cpp +++ b/src/vroom/vroom_driver.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "drivers/vroom/vroom_driver.h" +#include "drivers//vroom_driver.h" #include #include From 4d79f7b3a4b45bfd22a7e4bd9ec540454d43376c Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 10:29:52 -0600 Subject: [PATCH 05/28] (include/cpp_common) *.h -> *.hpp --- include/cpp_common/{pgr_assert.h => assert.hpp} | 0 include/cpp_common/{base_matrix.h => base_matrix.hpp} | 0 include/cpp_common/{identifier.h => identifier.hpp} | 0 include/cpp_common/{interruption.h => interruption.hpp} | 0 include/cpp_common/{pgr_messages.h => messages.hpp} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename include/cpp_common/{pgr_assert.h => assert.hpp} (100%) rename include/cpp_common/{base_matrix.h => base_matrix.hpp} (100%) rename include/cpp_common/{identifier.h => identifier.hpp} (100%) rename include/cpp_common/{interruption.h => interruption.hpp} (100%) rename include/cpp_common/{pgr_messages.h => messages.hpp} (100%) diff --git a/include/cpp_common/pgr_assert.h b/include/cpp_common/assert.hpp similarity index 100% rename from include/cpp_common/pgr_assert.h rename to include/cpp_common/assert.hpp diff --git a/include/cpp_common/base_matrix.h b/include/cpp_common/base_matrix.hpp similarity index 100% rename from include/cpp_common/base_matrix.h rename to include/cpp_common/base_matrix.hpp diff --git a/include/cpp_common/identifier.h b/include/cpp_common/identifier.hpp similarity index 100% rename from include/cpp_common/identifier.h rename to include/cpp_common/identifier.hpp diff --git a/include/cpp_common/interruption.h b/include/cpp_common/interruption.hpp similarity index 100% rename from include/cpp_common/interruption.h rename to include/cpp_common/interruption.hpp diff --git a/include/cpp_common/pgr_messages.h b/include/cpp_common/messages.hpp similarity index 100% rename from include/cpp_common/pgr_messages.h rename to include/cpp_common/messages.hpp From bf4aea463a7fb29b04f317568fb9ab511d646670 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 10:40:13 -0600 Subject: [PATCH 06/28] Adjusting code to header renames on include/cpp_common --- include/cpp_common/assert.hpp | 10 +++++----- include/cpp_common/base_matrix.hpp | 8 ++++---- include/cpp_common/identifier.hpp | 9 +++++---- include/cpp_common/interruption.hpp | 8 +++++--- include/cpp_common/messages.hpp | 8 ++++---- include/cpp_common/vrp_vroom_problem.hpp | 9 +++++---- include/problem/matrix.h | 2 +- include/problem/order.h | 2 +- include/problem/orders.h | 2 +- include/problem/pickDeliver.h | 2 +- include/problem/tw_node.h | 2 +- include/problem/vehicle.h | 4 ++-- include/problem/vehicle_pickDeliver.h | 4 ++-- src/compatibleVehicles/compatibleVehicles_driver.cpp | 2 +- src/cpp_common/base_matrix.cpp | 4 ++-- src/cpp_common/identifier.cpp | 2 +- src/cpp_common/pgr_assert.cpp | 4 ++-- src/cpp_common/pgr_messages.cpp | 2 +- src/initialsol/simple.cpp | 2 +- src/initialsol/tabu.cpp | 6 +++--- src/optimize/optimize_driver.cpp | 6 +++--- src/optimizers/simple.cpp | 2 +- src/optimizers/tabu.cpp | 4 ++-- src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp | 2 +- src/pgr_pickDeliver/pickDeliver_driver.cpp | 2 +- src/pickDeliver/pickDeliver_driver.cpp | 2 +- src/problem/matrix.cpp | 2 +- src/problem/orders.cpp | 2 +- src/problem/tw_node.cpp | 2 +- src/problem/vehicle.cpp | 4 ++-- src/problem/vehicle_node.cpp | 2 +- src/vroom/vroom_driver.cpp | 2 +- 32 files changed, 64 insertions(+), 60 deletions(-) diff --git a/include/cpp_common/assert.hpp b/include/cpp_common/assert.hpp index 0fde805da..8d69589a8 100644 --- a/include/cpp_common/assert.hpp +++ b/include/cpp_common/assert.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: pgr_assert +FILE: assert.hpp Copyright 2015~ Vicky Vergara Copyright 2014 Stephen Woodbridge @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CPP_COMMON_PGR_ASSERT_H_ -#define INCLUDE_CPP_COMMON_PGR_ASSERT_H_ +#ifndef INCLUDE_CPP_COMMON_PGR_ASSERT_HPP_ +#define INCLUDE_CPP_COMMON_PGR_ASSERT_HPP_ #pragma once #include @@ -68,7 +68,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * Example: * @code #include - #include "pgr_assert.h" + #include "assert.h" int main() { @@ -147,4 +147,4 @@ class AssertFailedException : public std::exception { virtual ~AssertFailedException() throw() {} }; -#endif // INCLUDE_CPP_COMMON_PGR_ASSERT_H_ +#endif // INCLUDE_CPP_COMMON_PGR_ASSERT_HPP_ diff --git a/include/cpp_common/base_matrix.hpp b/include/cpp_common/base_matrix.hpp index be4433986..3e5b7e0f1 100644 --- a/include/cpp_common/base_matrix.hpp +++ b/include/cpp_common/base_matrix.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: matrix.h +FILE: base_matrix.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. /*! @file */ -#ifndef INCLUDE_CPP_COMMON_BASE_MATRIX_H_ -#define INCLUDE_CPP_COMMON_BASE_MATRIX_H_ +#ifndef INCLUDE_CPP_COMMON_BASE_MATRIX_HPP_ +#define INCLUDE_CPP_COMMON_BASE_MATRIX_HPP_ #pragma once #include @@ -135,4 +135,4 @@ class Base_Matrix { } // namespace base } // namespace vrprouting -#endif // INCLUDE_CPP_COMMON_BASE_MATRIX_H_ +#endif // INCLUDE_CPP_COMMON_BASE_MATRIX_HPP_ diff --git a/include/cpp_common/identifier.hpp b/include/cpp_common/identifier.hpp index 6ff24d2cc..c8af73f6e 100644 --- a/include/cpp_common/identifier.hpp +++ b/include/cpp_common/identifier.hpp @@ -1,5 +1,6 @@ /*PGR-GNU***************************************************************** - * + +FILE: identifier.hpp Copyright (c) 2017 Celia Virginia Vergara Castillo vicky_vergara@hotmail.com @@ -26,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. File from pgRouting */ -#ifndef INCLUDE_CPP_COMMON_IDENTIFIER_H_ -#define INCLUDE_CPP_COMMON_IDENTIFIER_H_ +#ifndef INCLUDE_CPP_COMMON_IDENTIFIER_HPP_ +#define INCLUDE_CPP_COMMON_IDENTIFIER_HPP_ #pragma once #if defined(__MINGW32__) || defined(_MSC_VER) @@ -89,4 +90,4 @@ class Identifier { } // namespace vrprouting -#endif // INCLUDE_CPP_COMMON_IDENTIFIER_H_ +#endif // INCLUDE_CPP_COMMON_IDENTIFIER_HPP_ diff --git a/include/cpp_common/interruption.hpp b/include/cpp_common/interruption.hpp index 312b9dcad..652bf08bb 100644 --- a/include/cpp_common/interruption.hpp +++ b/include/cpp_common/interruption.hpp @@ -1,5 +1,7 @@ /*PGR-GNU***************************************************************** +FILE: interruption.hpp + Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -24,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CPP_COMMON_INTERRUPTION_H_ -#define INCLUDE_CPP_COMMON_INTERRUPTION_H_ +#ifndef INCLUDE_CPP_COMMON_INTERRUPTION_HPP_ +#define INCLUDE_CPP_COMMON_INTERRUPTION_HPP_ #ifdef _MSC_VER #define __PGR_PRETTY_FUNCTION__ __FUNCSIG__ @@ -83,4 +85,4 @@ extern void pgwin32_dispatch_queued_signals(void); #endif } -#endif // INCLUDE_CPP_COMMON_INTERRUPTION_H_ +#endif // INCLUDE_CPP_COMMON_INTERRUPTION_HPP_ diff --git a/include/cpp_common/messages.hpp b/include/cpp_common/messages.hpp index 068070c8c..ae2ab87d2 100644 --- a/include/cpp_common/messages.hpp +++ b/include/cpp_common/messages.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: pgr_messages.h +FILE: messages.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. File from pgRouting */ -#ifndef INCLUDE_CPP_COMMON_PGR_MESSAGES_H_ -#define INCLUDE_CPP_COMMON_PGR_MESSAGES_H_ +#ifndef INCLUDE_CPP_COMMON_PGR_MESSAGES_HPP_ +#define INCLUDE_CPP_COMMON_PGR_MESSAGES_HPP_ #pragma once @@ -109,4 +109,4 @@ class Pgr_messages { } // namespace vrprouting -#endif // INCLUDE_CPP_COMMON_PGR_MESSAGES_H_ +#endif // INCLUDE_CPP_COMMON_PGR_MESSAGES_HPP_ diff --git a/include/cpp_common/vrp_vroom_problem.hpp b/include/cpp_common/vrp_vroom_problem.hpp index 907acaf33..24732ec21 100644 --- a/include/cpp_common/vrp_vroom_problem.hpp +++ b/include/cpp_common/vrp_vroom_problem.hpp @@ -1,5 +1,6 @@ /*PGR-GNU***************************************************************** -File: vrp_vroom_problem.hpp + +FILE: vrp_vroom_problem.hpp Copyright (c) 2021 pgRouting developers Mail: project@pgrouting.org @@ -42,9 +43,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/vroom/vroom_shipment_t.h" #include "c_types/vroom/vroom_time_window_t.h" #include "c_types/vroom/vroom_vehicle_t.h" -#include "cpp_common/base_matrix.h" -#include "cpp_common/interruption.h" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/base_matrix.hpp" +#include "cpp_common/interruption.hpp" +#include "cpp_common/messages.hpp" #include "structures/vroom/input/input.h" #include "structures/vroom/job.h" #include "structures/vroom/vehicle.h" diff --git a/include/problem/matrix.h b/include/problem/matrix.h index 9cbe705fd..d6118ef47 100644 --- a/include/problem/matrix.h +++ b/include/problem/matrix.h @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/base_matrix.h" +#include "cpp_common/base_matrix.hpp" #include "cpp_common/identifiers.hpp" #include "c_types/typedefs.h" diff --git a/include/problem/order.h b/include/problem/order.h index 07fcd75cb..0c5e59670 100644 --- a/include/problem/order.h +++ b/include/problem/order.h @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #pragma once -#include "cpp_common/identifier.h" +#include "cpp_common/identifier.hpp" #include "cpp_common/identifiers.hpp" #include "problem/vehicle_node.h" diff --git a/include/problem/orders.h b/include/problem/orders.h index 8c364f610..3fbe3456e 100644 --- a/include/problem/orders.h +++ b/include/problem/orders.h @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "problem/order.h" #include "c_types/pickDeliveryOrders_t.h" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/assert.hpp" #include "cpp_common/identifiers.hpp" #include "problem/tw_node.h" #include "problem/vehicle_node.h" diff --git a/include/problem/pickDeliver.h b/include/problem/pickDeliver.h index 685ac60c1..470ca24bc 100644 --- a/include/problem/pickDeliver.h +++ b/include/problem/pickDeliver.h @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/solution_rt.h" #include "c_types/pickDeliveryOrders_t.h" #include "c_types/vehicle_t.h" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/messages.hpp" #include "problem/vehicle_node.h" #include "problem/orders.h" #include "problem/fleet.h" diff --git a/include/problem/tw_node.h b/include/problem/tw_node.h index 00672e502..6520e8a70 100644 --- a/include/problem/tw_node.h +++ b/include/problem/tw_node.h @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_types/typedefs.h" -#include "cpp_common/identifier.h" +#include "cpp_common/identifier.hpp" #include "problem/node_types.h" diff --git a/include/problem/vehicle.h b/include/problem/vehicle.h index 4b742011d..ee8ef1ca3 100644 --- a/include/problem/vehicle.h +++ b/include/problem/vehicle.h @@ -35,8 +35,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_types/solution_rt.h" -#include "cpp_common/pgr_assert.h" -#include "cpp_common/identifier.h" +#include "cpp_common/assert.hpp" +#include "cpp_common/identifier.hpp" #include "problem/vehicle_node.h" namespace vrprouting { diff --git a/include/problem/vehicle_pickDeliver.h b/include/problem/vehicle_pickDeliver.h index 449f20b6a..b54688b3f 100644 --- a/include/problem/vehicle_pickDeliver.h +++ b/include/problem/vehicle_pickDeliver.h @@ -32,8 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include "c_types/typedefs.h" -#include "cpp_common/pgr_assert.h" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/assert.hpp" +#include "cpp_common/messages.hpp" #include "cpp_common/identifiers.hpp" #include "problem/vehicle.h" #include "problem/orders.h" diff --git a/src/compatibleVehicles/compatibleVehicles_driver.cpp b/src/compatibleVehicles/compatibleVehicles_driver.cpp index 648f567a8..eb4a03c02 100644 --- a/src/compatibleVehicles/compatibleVehicles_driver.cpp +++ b/src/compatibleVehicles/compatibleVehicles_driver.cpp @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/compatibleVehicles_rt.h" #include "c_types/vehicle_t.h" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/assert.hpp" #include "c_common/pgr_alloc.hpp" /** diff --git a/src/cpp_common/base_matrix.cpp b/src/cpp_common/base_matrix.cpp index 504b1e895..93a2a2f5a 100644 --- a/src/cpp_common/base_matrix.cpp +++ b/src/cpp_common/base_matrix.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /** @file */ -#include "cpp_common/base_matrix.h" +#include "cpp_common/base_matrix.hpp" #include #include @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/assert.hpp" #include "c_types/matrix_cell_t.h" #include "c_types/vroom/vroom_matrix_t.h" diff --git a/src/cpp_common/identifier.cpp b/src/cpp_common/identifier.cpp index 4fd791821..efb62e6b3 100644 --- a/src/cpp_common/identifier.cpp +++ b/src/cpp_common/identifier.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/identifier.h" +#include "cpp_common/identifier.hpp" namespace vrprouting { diff --git a/src/cpp_common/pgr_assert.cpp b/src/cpp_common/pgr_assert.cpp index 7a6a41090..6c46e10c0 100644 --- a/src/cpp_common/pgr_assert.cpp +++ b/src/cpp_common/pgr_assert.cpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: pgr_assert.cpp +FILE: assert.cpp Copyright 2015~ Vicky Vergara Copyright 2014 Stephen Woodbridge @@ -23,7 +23,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.h" +#include "cpp_common/assert.hpp" #include #include diff --git a/src/cpp_common/pgr_messages.cpp b/src/cpp_common/pgr_messages.cpp index 6b5f5a1e3..8a8d35384 100644 --- a/src/cpp_common/pgr_messages.cpp +++ b/src/cpp_common/pgr_messages.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_messages.h" +#include "cpp_common/messages.hpp" namespace vrprouting { diff --git a/src/initialsol/simple.cpp b/src/initialsol/simple.cpp index 7aa0fd61d..5549e7bb1 100644 --- a/src/initialsol/simple.cpp +++ b/src/initialsol/simple.cpp @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/assert.hpp" #include "problem/node_types.h" #include "problem/orders.h" #include "problem/pickDeliver.h" diff --git a/src/initialsol/tabu.cpp b/src/initialsol/tabu.cpp index fe36f69c6..514ef1119 100644 --- a/src/initialsol/tabu.cpp +++ b/src/initialsol/tabu.cpp @@ -31,11 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/assert.hpp" +#include "cpp_common/messages.hpp" #include "problem/pickDeliver.h" #if 0 -#include "cpp_common/fleet.h" +#include "cpp_common/fleet.hpp" #endif namespace vrprouting { diff --git a/src/optimize/optimize_driver.cpp b/src/optimize/optimize_driver.cpp index 6ec94d978..f75fb1200 100644 --- a/src/optimize/optimize_driver.cpp +++ b/src/optimize/optimize_driver.cpp @@ -43,12 +43,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/vehicle_t.h" #include "problem/matrix.h" -#include "cpp_common/pgr_assert.h" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/assert.hpp" +#include "cpp_common/messages.hpp" #include "initialsol/tabu.hpp" #include "optimizers/tabu.h" #include "c_common/pgr_alloc.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" namespace { diff --git a/src/optimizers/simple.cpp b/src/optimizers/simple.cpp index 3bd390839..feb5021db 100644 --- a/src/optimizers/simple.cpp +++ b/src/optimizers/simple.cpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/assert.hpp" namespace vrprouting { namespace optimizers { diff --git a/src/optimizers/tabu.cpp b/src/optimizers/tabu.cpp index ed2b2b159..7aa5459b9 100644 --- a/src/optimizers/tabu.cpp +++ b/src/optimizers/tabu.cpp @@ -32,8 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/assert.hpp" +#include "cpp_common/messages.hpp" #include "optimizers/move.h" diff --git a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp b/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp index 31f3c0c6b..6f494f02c 100644 --- a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp +++ b/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/pickDeliveryOrders_t.h" #include "c_types/solution_rt.h" #include "c_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/assert.hpp" #include "problem/matrix.h" #include "initialsol/simple.hpp" diff --git a/src/pgr_pickDeliver/pickDeliver_driver.cpp b/src/pgr_pickDeliver/pickDeliver_driver.cpp index 7ee7bfebd..4ffd2dc9e 100644 --- a/src/pgr_pickDeliver/pickDeliver_driver.cpp +++ b/src/pgr_pickDeliver/pickDeliver_driver.cpp @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/pickDeliveryOrders_t.h" #include "c_types/solution_rt.h" #include "c_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/assert.hpp" #include "problem/solution.h" #include "initialsol/simple.hpp" #include "optimizers/simple.h" diff --git a/src/pickDeliver/pickDeliver_driver.cpp b/src/pickDeliver/pickDeliver_driver.cpp index 153c509be..0687bef02 100644 --- a/src/pickDeliver/pickDeliver_driver.cpp +++ b/src/pickDeliver/pickDeliver_driver.cpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/vehicle_t.h" #include "problem/matrix.h" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/assert.hpp" #include "initialsol/tabu.hpp" #include "optimizers/tabu.h" #include "c_common/pgr_alloc.hpp" diff --git a/src/problem/matrix.cpp b/src/problem/matrix.cpp index 23fe6ae81..163011ec0 100644 --- a/src/problem/matrix.cpp +++ b/src/problem/matrix.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/assert.hpp" #include "c_types/matrix_cell_t.h" #include "c_types/time_multipliers_t.h" diff --git a/src/problem/orders.cpp b/src/problem/orders.cpp index dba4e310e..50b75fe92 100644 --- a/src/problem/orders.cpp +++ b/src/problem/orders.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/assert.hpp" #include "cpp_common/identifiers.hpp" diff --git a/src/problem/tw_node.cpp b/src/problem/tw_node.cpp index 5b1bbe937..abec98b15 100644 --- a/src/problem/tw_node.cpp +++ b/src/problem/tw_node.cpp @@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/assert.hpp" #include "problem/matrix.h" #include "c_types/pickDeliveryOrders_t.h" #include "c_types/vehicle_t.h" diff --git a/src/problem/vehicle.cpp b/src/problem/vehicle.cpp index 6b1cb5dbb..c53b965dd 100644 --- a/src/problem/vehicle.cpp +++ b/src/problem/vehicle.cpp @@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/solution_rt.h" -#include "cpp_common/pgr_assert.h" -#include "cpp_common/identifier.h" +#include "cpp_common/assert.hpp" +#include "cpp_common/identifier.hpp" #include "problem/vehicle_node.h" namespace vrprouting { diff --git a/src/problem/vehicle_node.cpp b/src/problem/vehicle_node.cpp index 495bed12a..8b3ab6469 100644 --- a/src/problem/vehicle_node.cpp +++ b/src/problem/vehicle_node.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "problem/vehicle_node.h" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/assert.hpp" #include "c_types/solution_rt.h" diff --git a/src/vroom/vroom_driver.cpp b/src/vroom/vroom_driver.cpp index 62a39676c..343b11992 100644 --- a/src/vroom/vroom_driver.cpp +++ b/src/vroom/vroom_driver.cpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/assert.hpp" #include "cpp_common/vrp_vroom_problem.hpp" /** @file vroom_driver.cpp From b2e33088711164033f029bc64705c570a4f569be Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jul 2024 13:24:55 -0600 Subject: [PATCH 07/28] (include/problem) *.h -> *.hpp --- include/problem/{fleet.h => fleet.hpp} | 0 include/problem/{matrix.h => matrix.hpp} | 0 include/problem/{node_types.h => node_types.hpp} | 0 include/problem/{order.h => order.hpp} | 0 include/problem/{orders.h => orders.hpp} | 0 include/problem/{pickDeliver.h => pickDeliver.hpp} | 0 include/problem/{solution.h => solution.hpp} | 0 include/problem/{tw_node.h => tw_node.hpp} | 0 include/problem/{vehicle.h => vehicle.hpp} | 0 include/problem/{vehicle_node.h => vehicle_node.hpp} | 0 .../problem/{vehicle_pickDeliver.h => vehicle_pickDeliver.hpp} | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename include/problem/{fleet.h => fleet.hpp} (100%) rename include/problem/{matrix.h => matrix.hpp} (100%) rename include/problem/{node_types.h => node_types.hpp} (100%) rename include/problem/{order.h => order.hpp} (100%) rename include/problem/{orders.h => orders.hpp} (100%) rename include/problem/{pickDeliver.h => pickDeliver.hpp} (100%) rename include/problem/{solution.h => solution.hpp} (100%) rename include/problem/{tw_node.h => tw_node.hpp} (100%) rename include/problem/{vehicle.h => vehicle.hpp} (100%) rename include/problem/{vehicle_node.h => vehicle_node.hpp} (100%) rename include/problem/{vehicle_pickDeliver.h => vehicle_pickDeliver.hpp} (100%) diff --git a/include/problem/fleet.h b/include/problem/fleet.hpp similarity index 100% rename from include/problem/fleet.h rename to include/problem/fleet.hpp diff --git a/include/problem/matrix.h b/include/problem/matrix.hpp similarity index 100% rename from include/problem/matrix.h rename to include/problem/matrix.hpp diff --git a/include/problem/node_types.h b/include/problem/node_types.hpp similarity index 100% rename from include/problem/node_types.h rename to include/problem/node_types.hpp diff --git a/include/problem/order.h b/include/problem/order.hpp similarity index 100% rename from include/problem/order.h rename to include/problem/order.hpp diff --git a/include/problem/orders.h b/include/problem/orders.hpp similarity index 100% rename from include/problem/orders.h rename to include/problem/orders.hpp diff --git a/include/problem/pickDeliver.h b/include/problem/pickDeliver.hpp similarity index 100% rename from include/problem/pickDeliver.h rename to include/problem/pickDeliver.hpp diff --git a/include/problem/solution.h b/include/problem/solution.hpp similarity index 100% rename from include/problem/solution.h rename to include/problem/solution.hpp diff --git a/include/problem/tw_node.h b/include/problem/tw_node.hpp similarity index 100% rename from include/problem/tw_node.h rename to include/problem/tw_node.hpp diff --git a/include/problem/vehicle.h b/include/problem/vehicle.hpp similarity index 100% rename from include/problem/vehicle.h rename to include/problem/vehicle.hpp diff --git a/include/problem/vehicle_node.h b/include/problem/vehicle_node.hpp similarity index 100% rename from include/problem/vehicle_node.h rename to include/problem/vehicle_node.hpp diff --git a/include/problem/vehicle_pickDeliver.h b/include/problem/vehicle_pickDeliver.hpp similarity index 100% rename from include/problem/vehicle_pickDeliver.h rename to include/problem/vehicle_pickDeliver.hpp From a842cdbc19a76a27e0c4b2df6ae409772b4ff1e7 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 10:10:47 -0600 Subject: [PATCH 08/28] Adjusting code to header renames on include/problem --- include/initialsol/simple.hpp | 2 +- include/initialsol/tabu.hpp | 4 ++-- include/optimizers/simple.h | 4 ++-- include/optimizers/tabu.h | 2 +- include/problem/fleet.hpp | 10 +++++----- include/problem/matrix.hpp | 8 ++++---- include/problem/node_types.hpp | 8 ++++---- include/problem/order.hpp | 10 +++++----- include/problem/orders.hpp | 16 ++++++++-------- include/problem/pickDeliver.hpp | 16 ++++++++-------- include/problem/solution.hpp | 12 ++++++------ include/problem/tw_node.hpp | 10 +++++----- include/problem/vehicle.hpp | 10 +++++----- include/problem/vehicle_node.hpp | 10 +++++----- include/problem/vehicle_pickDeliver.hpp | 12 ++++++------ .../compatibleVehicles_driver.cpp | 4 ++-- src/initialsol/simple.cpp | 7 ++++--- src/initialsol/tabu.cpp | 2 +- src/optimize/optimize_driver.cpp | 4 ++-- src/optimizers/move.cpp | 4 ++-- .../pickDeliverEuclidean_driver.cpp | 4 ++-- src/pgr_pickDeliver/pickDeliver_driver.cpp | 6 +++--- src/pickDeliver/pickDeliver_driver.cpp | 4 ++-- src/problem/fleet.cpp | 2 +- src/problem/matrix.cpp | 2 +- src/problem/order.cpp | 2 +- src/problem/orders.cpp | 2 +- src/problem/solution.cpp | 4 ++-- src/problem/tw_node.cpp | 4 ++-- src/problem/vehicle.cpp | 4 ++-- src/problem/vehicle_node.cpp | 2 +- src/problem/vehicle_pickDeliver.cpp | 8 ++++---- 32 files changed, 100 insertions(+), 99 deletions(-) diff --git a/include/initialsol/simple.hpp b/include/initialsol/simple.hpp index 0941f50d6..ac31a71f4 100644 --- a/include/initialsol/simple.hpp +++ b/include/initialsol/simple.hpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #pragma once #include "cpp_common/identifiers.hpp" -#include "problem/solution.h" +#include "problem/solution.hpp" #include "initialsol/initials_code.hpp" namespace vrprouting { diff --git a/include/initialsol/tabu.hpp b/include/initialsol/tabu.hpp index 04fb96f71..c0b96f619 100644 --- a/include/initialsol/tabu.hpp +++ b/include/initialsol/tabu.hpp @@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/typedefs.h" #include "cpp_common/identifiers.hpp" -#include "problem/solution.h" -#include "problem/vehicle_pickDeliver.h" +#include "problem/solution.hpp" +#include "problem/vehicle_pickDeliver.hpp" namespace vrprouting { namespace problem { diff --git a/include/optimizers/simple.h b/include/optimizers/simple.h index 612226701..a0da38992 100644 --- a/include/optimizers/simple.h +++ b/include/optimizers/simple.h @@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_OPTIMIZERS_SIMPLE_H_ #pragma once -#include "problem/solution.h" -#include "problem/vehicle_pickDeliver.h" +#include "problem/solution.hpp" +#include "problem/vehicle_pickDeliver.hpp" #include "initialsol/initials_code.hpp" namespace vrprouting { diff --git a/include/optimizers/tabu.h b/include/optimizers/tabu.h index 532b1e7f9..13799c8c0 100644 --- a/include/optimizers/tabu.h +++ b/include/optimizers/tabu.h @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_OPTIMIZERS_TABU_H_ #pragma once -#include "problem/solution.h" +#include "problem/solution.hpp" #include "optimizers/tabu_list.h" namespace vrprouting { diff --git a/include/problem/fleet.hpp b/include/problem/fleet.hpp index 15253490f..ddaeebc64 100644 --- a/include/problem/fleet.hpp +++ b/include/problem/fleet.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: fleet.h +FILE: fleet.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /** @file */ -#ifndef INCLUDE_PROBLEM_FLEET_H_ -#define INCLUDE_PROBLEM_FLEET_H_ +#ifndef INCLUDE_PROBLEM_FLEET_HPP_ +#define INCLUDE_PROBLEM_FLEET_HPP_ #pragma once #include @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/typedefs.h" #include "c_types/short_vehicle.h" -#include "problem/vehicle_pickDeliver.h" +#include "problem/vehicle_pickDeliver.hpp" typedef struct Vehicle_t Vehicle_t; @@ -154,4 +154,4 @@ class Fleet: protected std::vector { } // namespace problem } // namespace vrprouting -#endif // INCLUDE_PROBLEM_FLEET_H_ +#endif // INCLUDE_PROBLEM_FLEET_HPP_ diff --git a/include/problem/matrix.hpp b/include/problem/matrix.hpp index d6118ef47..25a59c5af 100644 --- a/include/problem/matrix.hpp +++ b/include/problem/matrix.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: matrix.h +FILE: matrix.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. /*! @file */ -#ifndef INCLUDE_PROBLEM_MATRIX_H_ -#define INCLUDE_PROBLEM_MATRIX_H_ +#ifndef INCLUDE_PROBLEM_MATRIX_HPP_ +#define INCLUDE_PROBLEM_MATRIX_HPP_ #pragma once #include @@ -81,4 +81,4 @@ class Matrix : public base::Base_Matrix { } // namespace problem } // namespace vrprouting -#endif // INCLUDE_PROBLEM_MATRIX_H_ +#endif // INCLUDE_PROBLEM_MATRIX_HPP_ diff --git a/include/problem/node_types.hpp b/include/problem/node_types.hpp index 6aef9c79e..7b525be81 100644 --- a/include/problem/node_types.hpp +++ b/include/problem/node_types.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: tw_node.h +FILE: node_types.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. /** @file */ -#ifndef INCLUDE_PROBLEM_NODE_TYPES_H_ -#define INCLUDE_PROBLEM_NODE_TYPES_H_ +#ifndef INCLUDE_PROBLEM_NODE_TYPES_HPP_ +#define INCLUDE_PROBLEM_NODE_TYPES_HPP_ #pragma once namespace vrprouting { @@ -44,4 +44,4 @@ enum NodeType { } // namespace problem } // namespace vrprouting -#endif // INCLUDE_PROBLEM_NODE_TYPES_H_ +#endif // INCLUDE_PROBLEM_NODE_TYPES_HPP_ diff --git a/include/problem/order.hpp b/include/problem/order.hpp index 0c5e59670..762101cca 100644 --- a/include/problem/order.hpp +++ b/include/problem/order.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: order.h +FILE: order.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,14 +25,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /** @file */ -#ifndef INCLUDE_PROBLEM_ORDER_H_ -#define INCLUDE_PROBLEM_ORDER_H_ +#ifndef INCLUDE_PROBLEM_ORDER_HPP_ +#define INCLUDE_PROBLEM_ORDER_HPP_ #pragma once #include "cpp_common/identifier.hpp" #include "cpp_common/identifiers.hpp" -#include "problem/vehicle_node.h" +#include "problem/vehicle_node.hpp" namespace vrprouting { namespace problem { @@ -122,4 +122,4 @@ class Order : public Identifier { } // namespace problem } // namespace vrprouting -#endif // INCLUDE_PROBLEM_ORDER_H_ +#endif // INCLUDE_PROBLEM_ORDER_HPP_ diff --git a/include/problem/orders.hpp b/include/problem/orders.hpp index 3fbe3456e..de1d7a232 100644 --- a/include/problem/orders.hpp +++ b/include/problem/orders.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: orders.h +FILE: orders.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,20 +25,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_PROBLEM_ORDERS_H_ -#define INCLUDE_PROBLEM_ORDERS_H_ +#ifndef INCLUDE_PROBLEM_ORDERS_HPP_ +#define INCLUDE_PROBLEM_ORDERS_HPP_ #pragma once #include #include -#include "problem/order.h" +#include "problem/order.hpp" #include "c_types/pickDeliveryOrders_t.h" #include "cpp_common/assert.hpp" #include "cpp_common/identifiers.hpp" -#include "problem/tw_node.h" -#include "problem/vehicle_node.h" -#include "problem/node_types.h" +#include "problem/tw_node.hpp" +#include "problem/vehicle_node.hpp" +#include "problem/node_types.hpp" @@ -130,4 +130,4 @@ Orders::build_orders(PickDeliveryOrders_t *orders, size_t size_orders, const PTR } // namespace problem } // namespace vrprouting -#endif // INCLUDE_PROBLEM_ORDERS_H_ +#endif // INCLUDE_PROBLEM_ORDERS_HPP_ diff --git a/include/problem/pickDeliver.hpp b/include/problem/pickDeliver.hpp index 470ca24bc..ec06b2c6b 100644 --- a/include/problem/pickDeliver.hpp +++ b/include/problem/pickDeliver.hpp @@ -1,6 +1,6 @@ /*WC-GNU***************************************************************** -FILE: pgr_pickDeliver.h +FILE: pickDeliver.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /** @file */ -#ifndef INCLUDE_PROBLEM_PICKDELIVER_H_ -#define INCLUDE_PROBLEM_PICKDELIVER_H_ +#ifndef INCLUDE_PROBLEM_PICKDELIVER_HPP_ +#define INCLUDE_PROBLEM_PICKDELIVER_HPP_ #pragma once @@ -38,10 +38,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/pickDeliveryOrders_t.h" #include "c_types/vehicle_t.h" #include "cpp_common/messages.hpp" -#include "problem/vehicle_node.h" -#include "problem/orders.h" -#include "problem/fleet.h" -#include "problem/matrix.h" +#include "problem/vehicle_node.hpp" +#include "problem/orders.hpp" +#include "problem/fleet.hpp" +#include "problem/matrix.hpp" namespace vrprouting { namespace problem { @@ -135,4 +135,4 @@ class PickDeliver { } // namespace problem } // namespace vrprouting -#endif // INCLUDE_PROBLEM_PICKDELIVER_H_ +#endif // INCLUDE_PROBLEM_PICKDELIVER_HPP_ diff --git a/include/problem/solution.hpp b/include/problem/solution.hpp index 4025f1f97..fa1e6895f 100644 --- a/include/problem/solution.hpp +++ b/include/problem/solution.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: solution.h +FILE: solution.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. /** @file */ -#ifndef INCLUDE_PROBLEM_SOLUTION_H_ -#define INCLUDE_PROBLEM_SOLUTION_H_ +#ifndef INCLUDE_PROBLEM_SOLUTION_HPP_ +#define INCLUDE_PROBLEM_SOLUTION_HPP_ #pragma once #include @@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "problem/vehicle_pickDeliver.h" -#include "problem/fleet.h" +#include "problem/vehicle_pickDeliver.hpp" +#include "problem/fleet.hpp" #include "c_types/short_vehicle.h" typedef struct Solution_rt Solution_rt; @@ -133,4 +133,4 @@ class Solution { } // namespace problem } // namespace vrprouting -#endif // INCLUDE_PROBLEM_SOLUTION_H_ +#endif // INCLUDE_PROBLEM_SOLUTION_HPP_ diff --git a/include/problem/tw_node.hpp b/include/problem/tw_node.hpp index 6520e8a70..7eeff17ed 100644 --- a/include/problem/tw_node.hpp +++ b/include/problem/tw_node.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: tw_node.h +FILE: tw_node.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,14 +25,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /** @file */ -#ifndef INCLUDE_PROBLEM_TW_NODE_H_ -#define INCLUDE_PROBLEM_TW_NODE_H_ +#ifndef INCLUDE_PROBLEM_TW_NODE_HPP_ +#define INCLUDE_PROBLEM_TW_NODE_HPP_ #pragma once #include #include "c_types/typedefs.h" #include "cpp_common/identifier.hpp" -#include "problem/node_types.h" +#include "problem/node_types.hpp" namespace vrprouting { @@ -189,4 +189,4 @@ class Tw_node : public Identifier { } // namespace problem } // namespace vrprouting -#endif // INCLUDE_PROBLEM_TW_NODE_H_ +#endif // INCLUDE_PROBLEM_TW_NODE_HPP_ diff --git a/include/problem/vehicle.hpp b/include/problem/vehicle.hpp index ee8ef1ca3..50d8b38b2 100644 --- a/include/problem/vehicle.hpp +++ b/include/problem/vehicle.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: vehicle.h +FILE: vehicle.hpp Copyright (c) 2021 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_PROBLEM_VEHICLE_H_ -#define INCLUDE_PROBLEM_VEHICLE_H_ +#ifndef INCLUDE_PROBLEM_VEHICLE_HPP_ +#define INCLUDE_PROBLEM_VEHICLE_HPP_ #pragma once #include @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/solution_rt.h" #include "cpp_common/assert.hpp" #include "cpp_common/identifier.hpp" -#include "problem/vehicle_node.h" +#include "problem/vehicle_node.hpp" namespace vrprouting { namespace problem { @@ -185,4 +185,4 @@ class Vehicle : public Identifier, protected std::deque { } // namespace problem } // namespace vrprouting -#endif // INCLUDE_PROBLEM_VEHICLE_H_ +#endif // INCLUDE_PROBLEM_VEHICLE_HPP_ diff --git a/include/problem/vehicle_node.hpp b/include/problem/vehicle_node.hpp index 8e5857297..bb46b980f 100644 --- a/include/problem/vehicle_node.hpp +++ b/include/problem/vehicle_node.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: vehicle_node.h +FILE: vehicle_node.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,14 +25,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /** @file */ -#ifndef INCLUDE_PROBLEM_VEHICLE_NODE_H_ -#define INCLUDE_PROBLEM_VEHICLE_NODE_H_ +#ifndef INCLUDE_PROBLEM_VEHICLE_NODE_HPP_ +#define INCLUDE_PROBLEM_VEHICLE_NODE_HPP_ #pragma once #include -#include "problem/tw_node.h" +#include "problem/tw_node.hpp" typedef struct Solution_rt Solution_rt; @@ -181,4 +181,4 @@ class Vehicle_node: public Tw_node { } // namespace problem } // namespace vrprouting -#endif // INCLUDE_PROBLEM_VEHICLE_NODE_H_ +#endif // INCLUDE_PROBLEM_VEHICLE_NODE_HPP_ diff --git a/include/problem/vehicle_pickDeliver.hpp b/include/problem/vehicle_pickDeliver.hpp index b54688b3f..82f6da6a3 100644 --- a/include/problem/vehicle_pickDeliver.hpp +++ b/include/problem/vehicle_pickDeliver.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: vehicle_pickDeliver.h +FILE: vehicle_pickDeliver.hpp Copyright (c) 2016 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_PROBLEM_VEHICLE_PICKDELIVER_H_ -#define INCLUDE_PROBLEM_VEHICLE_PICKDELIVER_H_ +#ifndef INCLUDE_PROBLEM_VEHICLE_PICKDELIVER_HPP_ +#define INCLUDE_PROBLEM_VEHICLE_PICKDELIVER_HPP_ #pragma once #include @@ -35,8 +35,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/assert.hpp" #include "cpp_common/messages.hpp" #include "cpp_common/identifiers.hpp" -#include "problem/vehicle.h" -#include "problem/orders.h" +#include "problem/vehicle.hpp" +#include "problem/orders.hpp" namespace vrprouting { namespace problem { @@ -177,4 +177,4 @@ class Vehicle_pickDeliver : public Vehicle { } // namespace problem } // namespace vrprouting -#endif // INCLUDE_PROBLEM_VEHICLE_PICKDELIVER_H_ +#endif // INCLUDE_PROBLEM_VEHICLE_PICKDELIVER_HPP_ diff --git a/src/compatibleVehicles/compatibleVehicles_driver.cpp b/src/compatibleVehicles/compatibleVehicles_driver.cpp index eb4a03c02..36ae37f8d 100644 --- a/src/compatibleVehicles/compatibleVehicles_driver.cpp +++ b/src/compatibleVehicles/compatibleVehicles_driver.cpp @@ -34,8 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "problem/pickDeliver.h" -#include "problem/matrix.h" +#include "problem/pickDeliver.hpp" +#include "problem/matrix.hpp" #include "c_types/pickDeliveryOrders_t.h" #include "c_types/compatibleVehicles_rt.h" #include "c_types/vehicle_t.h" diff --git a/src/initialsol/simple.cpp b/src/initialsol/simple.cpp index 5549e7bb1..d0f4cfb57 100644 --- a/src/initialsol/simple.cpp +++ b/src/initialsol/simple.cpp @@ -27,10 +27,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include + #include "cpp_common/assert.hpp" -#include "problem/node_types.h" -#include "problem/orders.h" -#include "problem/pickDeliver.h" +#include "problem/node_types.hpp" +#include "problem/orders.hpp" +#include "problem/pickDeliver.hpp" namespace vrprouting { namespace initialsol { diff --git a/src/initialsol/tabu.cpp b/src/initialsol/tabu.cpp index 514ef1119..42e152e98 100644 --- a/src/initialsol/tabu.cpp +++ b/src/initialsol/tabu.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/assert.hpp" #include "cpp_common/messages.hpp" -#include "problem/pickDeliver.h" +#include "problem/pickDeliver.hpp" #if 0 #include "cpp_common/fleet.hpp" #endif diff --git a/src/optimize/optimize_driver.cpp b/src/optimize/optimize_driver.cpp index f75fb1200..f6502c69b 100644 --- a/src/optimize/optimize_driver.cpp +++ b/src/optimize/optimize_driver.cpp @@ -37,11 +37,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "problem/pickDeliver.h" +#include "problem/pickDeliver.hpp" #include "c_types/pickDeliveryOrders_t.h" #include "c_types/short_vehicle_rt.h" #include "c_types/vehicle_t.h" -#include "problem/matrix.h" +#include "problem/matrix.hpp" #include "cpp_common/assert.hpp" #include "cpp_common/messages.hpp" diff --git a/src/optimizers/move.cpp b/src/optimizers/move.cpp index 3b356ea82..726f0f622 100644 --- a/src/optimizers/move.cpp +++ b/src/optimizers/move.cpp @@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "optimizers/move.h" #include -#include "problem/vehicle_pickDeliver.h" -#include "problem/order.h" +#include "problem/vehicle_pickDeliver.hpp" +#include "problem/order.hpp" namespace vrprouting { namespace optimizers { diff --git a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp b/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp index 6f494f02c..e2a0eea82 100644 --- a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp +++ b/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp @@ -40,10 +40,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/pgr_alloc.hpp" #include "cpp_common/assert.hpp" -#include "problem/matrix.h" +#include "problem/matrix.hpp" #include "initialsol/simple.hpp" #include "optimizers/simple.h" -#include "problem/pickDeliver.h" +#include "problem/pickDeliver.hpp" namespace { vrprouting::problem::Solution diff --git a/src/pgr_pickDeliver/pickDeliver_driver.cpp b/src/pgr_pickDeliver/pickDeliver_driver.cpp index 4ffd2dc9e..397f85dac 100644 --- a/src/pgr_pickDeliver/pickDeliver_driver.cpp +++ b/src/pgr_pickDeliver/pickDeliver_driver.cpp @@ -39,13 +39,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/solution_rt.h" #include "c_common/pgr_alloc.hpp" #include "cpp_common/assert.hpp" -#include "problem/solution.h" +#include "problem/solution.hpp" #include "initialsol/simple.hpp" #include "optimizers/simple.h" -#include "problem/pickDeliver.h" +#include "problem/pickDeliver.hpp" #include "initialsol/initials_code.hpp" -#include "problem/matrix.h" +#include "problem/matrix.hpp" namespace { vrprouting::problem::Solution diff --git a/src/pickDeliver/pickDeliver_driver.cpp b/src/pickDeliver/pickDeliver_driver.cpp index 0687bef02..fba52974f 100644 --- a/src/pickDeliver/pickDeliver_driver.cpp +++ b/src/pickDeliver/pickDeliver_driver.cpp @@ -35,11 +35,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "problem/pickDeliver.h" +#include "problem/pickDeliver.hpp" #include "c_types/pickDeliveryOrders_t.h" #include "c_types/solution_rt.h" #include "c_types/vehicle_t.h" -#include "problem/matrix.h" +#include "problem/matrix.hpp" #include "cpp_common/assert.hpp" #include "initialsol/tabu.hpp" diff --git a/src/problem/fleet.cpp b/src/problem/fleet.cpp index 2459986fe..9325e03f0 100644 --- a/src/problem/fleet.cpp +++ b/src/problem/fleet.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /** @file */ -#include "problem/fleet.h" +#include "problem/fleet.hpp" #include #include diff --git a/src/problem/matrix.cpp b/src/problem/matrix.cpp index 163011ec0..89ddcc86b 100644 --- a/src/problem/matrix.cpp +++ b/src/problem/matrix.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "problem/matrix.h" +#include "problem/matrix.hpp" #include #include diff --git a/src/problem/order.cpp b/src/problem/order.cpp index 465e7f1f4..9f567ddec 100644 --- a/src/problem/order.cpp +++ b/src/problem/order.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /** @file */ -#include "problem/order.h" +#include "problem/order.hpp" namespace vrprouting { namespace problem { diff --git a/src/problem/orders.cpp b/src/problem/orders.cpp index 50b75fe92..60fcdcf8d 100644 --- a/src/problem/orders.cpp +++ b/src/problem/orders.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#include "problem/orders.h" +#include "problem/orders.hpp" #include #include diff --git a/src/problem/solution.cpp b/src/problem/solution.cpp index 4105321df..928e707e4 100644 --- a/src/problem/solution.cpp +++ b/src/problem/solution.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /** @file */ -#include "problem/solution.h" +#include "problem/solution.hpp" #include #include @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include -#include "problem/pickDeliver.h" +#include "problem/pickDeliver.hpp" #include "c_types/short_vehicle.h" typedef struct Solution_rt Solution_rt; diff --git a/src/problem/tw_node.cpp b/src/problem/tw_node.cpp index abec98b15..4be73f44e 100644 --- a/src/problem/tw_node.cpp +++ b/src/problem/tw_node.cpp @@ -23,13 +23,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "problem/tw_node.h" +#include "problem/tw_node.hpp" #include #include #include "cpp_common/assert.hpp" -#include "problem/matrix.h" +#include "problem/matrix.hpp" #include "c_types/pickDeliveryOrders_t.h" #include "c_types/vehicle_t.h" diff --git a/src/problem/vehicle.cpp b/src/problem/vehicle.cpp index c53b965dd..4790c63e4 100644 --- a/src/problem/vehicle.cpp +++ b/src/problem/vehicle.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#include "problem/vehicle.h" +#include "problem/vehicle.hpp" #include #include #include @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/solution_rt.h" #include "cpp_common/assert.hpp" #include "cpp_common/identifier.hpp" -#include "problem/vehicle_node.h" +#include "problem/vehicle_node.hpp" namespace vrprouting { namespace problem { diff --git a/src/problem/vehicle_node.cpp b/src/problem/vehicle_node.cpp index 8b3ab6469..0a375f700 100644 --- a/src/problem/vehicle_node.cpp +++ b/src/problem/vehicle_node.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "problem/vehicle_node.h" +#include "problem/vehicle_node.hpp" #include "cpp_common/assert.hpp" #include "c_types/solution_rt.h" diff --git a/src/problem/vehicle_pickDeliver.cpp b/src/problem/vehicle_pickDeliver.cpp index 1b5cb94db..4fc6f13b4 100644 --- a/src/problem/vehicle_pickDeliver.cpp +++ b/src/problem/vehicle_pickDeliver.cpp @@ -25,15 +25,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#include "problem/vehicle_pickDeliver.h" +#include "problem/vehicle_pickDeliver.hpp" #include #include #include -#include "problem/vehicle.h" -#include "problem/order.h" -#include "problem/orders.h" +#include "problem/vehicle.hpp" +#include "problem/order.hpp" +#include "problem/orders.hpp" namespace vrprouting { namespace problem { From 27b5040d73e6a8463e636395cf0877686b42cc03 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 08:12:29 -0600 Subject: [PATCH 09/28] Moving include/c_types/*.h include/cpp_common/*.hpp Although these are still used on the C code These types will not be used on the C code in the near future --- include/{c_types/column_info_t.h => cpp_common/info.hpp} | 0 include/{c_types/matrix_cell_t.h => cpp_common/matrix_cell_t.hpp} | 0 .../{c_types/pickDeliveryOrders_t.h => cpp_common/orders_t.hpp} | 0 include/{c_types/short_vehicle.h => cpp_common/short_vehicle.hpp} | 0 .../time_multipliers_t.h => cpp_common/time_multipliers_t.hpp} | 0 include/{c_types/vehicle_t.h => cpp_common/vehicle_t.hpp} | 0 .../vroom/vroom_break_t.h => cpp_common/vroom_break_t.hpp} | 0 .../{c_types/vroom/vroom_job_t.h => cpp_common/vroom_job_t.hpp} | 0 .../vroom/vroom_matrix_t.h => cpp_common/vroom_matrix_t.hpp} | 0 .../vroom/vroom_shipment_t.h => cpp_common/vroom_shipment_t.hpp} | 0 .../vroom_time_window_t.h => cpp_common/vroom_time_window_t.hpp} | 0 .../vroom/vroom_vehicle_t.h => cpp_common/vroom_vehicle_t.hpp} | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename include/{c_types/column_info_t.h => cpp_common/info.hpp} (100%) rename include/{c_types/matrix_cell_t.h => cpp_common/matrix_cell_t.hpp} (100%) rename include/{c_types/pickDeliveryOrders_t.h => cpp_common/orders_t.hpp} (100%) rename include/{c_types/short_vehicle.h => cpp_common/short_vehicle.hpp} (100%) rename include/{c_types/time_multipliers_t.h => cpp_common/time_multipliers_t.hpp} (100%) rename include/{c_types/vehicle_t.h => cpp_common/vehicle_t.hpp} (100%) rename include/{c_types/vroom/vroom_break_t.h => cpp_common/vroom_break_t.hpp} (100%) rename include/{c_types/vroom/vroom_job_t.h => cpp_common/vroom_job_t.hpp} (100%) rename include/{c_types/vroom/vroom_matrix_t.h => cpp_common/vroom_matrix_t.hpp} (100%) rename include/{c_types/vroom/vroom_shipment_t.h => cpp_common/vroom_shipment_t.hpp} (100%) rename include/{c_types/vroom/vroom_time_window_t.h => cpp_common/vroom_time_window_t.hpp} (100%) rename include/{c_types/vroom/vroom_vehicle_t.h => cpp_common/vroom_vehicle_t.hpp} (100%) diff --git a/include/c_types/column_info_t.h b/include/cpp_common/info.hpp similarity index 100% rename from include/c_types/column_info_t.h rename to include/cpp_common/info.hpp diff --git a/include/c_types/matrix_cell_t.h b/include/cpp_common/matrix_cell_t.hpp similarity index 100% rename from include/c_types/matrix_cell_t.h rename to include/cpp_common/matrix_cell_t.hpp diff --git a/include/c_types/pickDeliveryOrders_t.h b/include/cpp_common/orders_t.hpp similarity index 100% rename from include/c_types/pickDeliveryOrders_t.h rename to include/cpp_common/orders_t.hpp diff --git a/include/c_types/short_vehicle.h b/include/cpp_common/short_vehicle.hpp similarity index 100% rename from include/c_types/short_vehicle.h rename to include/cpp_common/short_vehicle.hpp diff --git a/include/c_types/time_multipliers_t.h b/include/cpp_common/time_multipliers_t.hpp similarity index 100% rename from include/c_types/time_multipliers_t.h rename to include/cpp_common/time_multipliers_t.hpp diff --git a/include/c_types/vehicle_t.h b/include/cpp_common/vehicle_t.hpp similarity index 100% rename from include/c_types/vehicle_t.h rename to include/cpp_common/vehicle_t.hpp diff --git a/include/c_types/vroom/vroom_break_t.h b/include/cpp_common/vroom_break_t.hpp similarity index 100% rename from include/c_types/vroom/vroom_break_t.h rename to include/cpp_common/vroom_break_t.hpp diff --git a/include/c_types/vroom/vroom_job_t.h b/include/cpp_common/vroom_job_t.hpp similarity index 100% rename from include/c_types/vroom/vroom_job_t.h rename to include/cpp_common/vroom_job_t.hpp diff --git a/include/c_types/vroom/vroom_matrix_t.h b/include/cpp_common/vroom_matrix_t.hpp similarity index 100% rename from include/c_types/vroom/vroom_matrix_t.h rename to include/cpp_common/vroom_matrix_t.hpp diff --git a/include/c_types/vroom/vroom_shipment_t.h b/include/cpp_common/vroom_shipment_t.hpp similarity index 100% rename from include/c_types/vroom/vroom_shipment_t.h rename to include/cpp_common/vroom_shipment_t.hpp diff --git a/include/c_types/vroom/vroom_time_window_t.h b/include/cpp_common/vroom_time_window_t.hpp similarity index 100% rename from include/c_types/vroom/vroom_time_window_t.h rename to include/cpp_common/vroom_time_window_t.hpp diff --git a/include/c_types/vroom/vroom_vehicle_t.h b/include/cpp_common/vroom_vehicle_t.hpp similarity index 100% rename from include/c_types/vroom/vroom_vehicle_t.h rename to include/cpp_common/vroom_vehicle_t.hpp From 11aa145c28835b18c1d378939d949a9da58f2571 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 09:41:45 -0600 Subject: [PATCH 10/28] Adjusting code to header moved to include/cpp_common --- include/c_common/get_check_data.h | 2 +- include/c_common/vroom/breaks_input.h | 4 ++-- include/c_common/vroom/jobs_input.h | 4 ++-- include/c_common/vroom/matrix_input.h | 4 ++-- include/c_common/vroom/shipments_input.h | 4 ++-- include/c_common/vroom/time_windows_input.h | 4 ++-- include/c_common/vroom/vehicles_input.h | 4 ++-- include/cpp_common/vrp_vroom_problem.hpp | 12 ++++++------ include/drivers/pgr_pickDeliverEuclidean_driver.h | 2 +- include/drivers/pgr_pickDeliver_driver.h | 4 ++-- include/problem/fleet.hpp | 2 +- include/problem/orders.hpp | 2 +- include/problem/pickDeliver.hpp | 4 ++-- include/problem/solution.hpp | 2 +- src/common/matrixRows_input.c | 4 ++-- src/common/orders_input.c | 4 ++-- src/common/time_multipliers_input.c | 4 ++-- src/common/vehicles_input.c | 4 ++-- src/compatibleVehicles/compatibleVehicles.c | 2 +- src/compatibleVehicles/compatibleVehicles_driver.cpp | 4 ++-- src/cpp_common/base_matrix.cpp | 4 ++-- src/optimize/optimize.c | 2 +- src/optimize/optimize_driver.cpp | 4 ++-- src/pgr_pickDeliver/pickDeliver.c | 2 +- src/pgr_pickDeliver/pickDeliverEuclidean.c | 2 +- src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp | 2 +- src/pgr_pickDeliver/pickDeliver_driver.cpp | 2 +- src/pickDeliver/pickDeliver.c | 2 +- src/pickDeliver/pickDeliver_driver.cpp | 4 ++-- src/problem/fleet.cpp | 2 +- src/problem/matrix.cpp | 4 ++-- src/problem/solution.cpp | 2 +- src/problem/tw_node.cpp | 4 ++-- src/vroom/vroom.c | 10 +++++----- src/vroom/vroom_driver.cpp | 2 +- 35 files changed, 62 insertions(+), 62 deletions(-) diff --git a/include/c_common/get_check_data.h b/include/c_common/get_check_data.h index 3c067f210..67a92a5ce 100644 --- a/include/c_common/get_check_data.h +++ b/include/c_common/get_check_data.h @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #pragma once #include "c_common/postgres_connection.h" -#include "c_types/column_info_t.h" +#include "cpp_common/info.hpp" #include "c_types/typedefs.h" /** @brief Check whether the colNumber represent any specific column or NULL (SPI_ERROR_NOATTRIBUTE). */ diff --git a/include/c_common/vroom/breaks_input.h b/include/c_common/vroom/breaks_input.h index 7dec72a15..74cfc9e68 100644 --- a/include/c_common/vroom/breaks_input.h +++ b/include/c_common/vroom/breaks_input.h @@ -33,8 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/get_check_data.h" -#include "c_types/column_info_t.h" -#include "c_types/vroom/vroom_break_t.h" +#include "cpp_common/info.hpp" +#include "cpp_common/vroom_break_t.hpp" #ifdef PROFILE #include "c_common/debug_macro.h" diff --git a/include/c_common/vroom/jobs_input.h b/include/c_common/vroom/jobs_input.h index 9c4e33076..cf0431e85 100644 --- a/include/c_common/vroom/jobs_input.h +++ b/include/c_common/vroom/jobs_input.h @@ -33,8 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/get_check_data.h" -#include "c_types/column_info_t.h" -#include "c_types/vroom/vroom_job_t.h" +#include "cpp_common/info.hpp" +#include "cpp_common/vroom_job_t.hpp" #ifdef PROFILE #include "c_common/debug_macro.h" diff --git a/include/c_common/vroom/matrix_input.h b/include/c_common/vroom/matrix_input.h index e3f39a8e0..c5755fb15 100644 --- a/include/c_common/vroom/matrix_input.h +++ b/include/c_common/vroom/matrix_input.h @@ -33,8 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/get_check_data.h" -#include "c_types/column_info_t.h" -#include "c_types/vroom/vroom_matrix_t.h" +#include "cpp_common/info.hpp" +#include "cpp_common/vroom_matrix_t.hpp" #ifdef PROFILE #include "c_common/debug_macro.h" diff --git a/include/c_common/vroom/shipments_input.h b/include/c_common/vroom/shipments_input.h index 7cf074e48..c9ddde7ac 100644 --- a/include/c_common/vroom/shipments_input.h +++ b/include/c_common/vroom/shipments_input.h @@ -33,8 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/get_check_data.h" -#include "c_types/column_info_t.h" -#include "c_types/vroom/vroom_shipment_t.h" +#include "cpp_common/info.hpp" +#include "cpp_common/vroom_shipment_t.hpp" #ifdef PROFILE #include "c_common/debug_macro.h" diff --git a/include/c_common/vroom/time_windows_input.h b/include/c_common/vroom/time_windows_input.h index 1ffa8bc16..05c7faff0 100644 --- a/include/c_common/vroom/time_windows_input.h +++ b/include/c_common/vroom/time_windows_input.h @@ -34,8 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/get_check_data.h" -#include "c_types/column_info_t.h" -#include "c_types/vroom/vroom_time_window_t.h" +#include "cpp_common/info.hpp" +#include "cpp_common/vroom_time_window_t.hpp" #ifdef PROFILE #include "c_common/debug_macro.h" diff --git a/include/c_common/vroom/vehicles_input.h b/include/c_common/vroom/vehicles_input.h index 851b15392..d3eb3db09 100644 --- a/include/c_common/vroom/vehicles_input.h +++ b/include/c_common/vroom/vehicles_input.h @@ -33,8 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/get_check_data.h" -#include "c_types/column_info_t.h" -#include "c_types/vroom/vroom_vehicle_t.h" +#include "cpp_common/info.hpp" +#include "cpp_common/vroom_vehicle_t.hpp" #ifdef PROFILE #include "c_common/debug_macro.h" diff --git a/include/cpp_common/vrp_vroom_problem.hpp b/include/cpp_common/vrp_vroom_problem.hpp index 24732ec21..6dbf10beb 100644 --- a/include/cpp_common/vrp_vroom_problem.hpp +++ b/include/cpp_common/vrp_vroom_problem.hpp @@ -36,13 +36,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/matrix_cell_t.h" -#include "c_types/vroom/vroom_break_t.h" -#include "c_types/vroom/vroom_job_t.h" +#include "cpp_common/matrix_cell_t.hpp" +#include "cpp_common/vroom_break_t.hpp" +#include "cpp_common/vroom_job_t.hpp" #include "c_types/vroom/vroom_rt.h" -#include "c_types/vroom/vroom_shipment_t.h" -#include "c_types/vroom/vroom_time_window_t.h" -#include "c_types/vroom/vroom_vehicle_t.h" +#include "cpp_common/vroom_shipment_t.hpp" +#include "cpp_common/vroom_time_window_t.hpp" +#include "cpp_common/vroom_vehicle_t.hpp" #include "cpp_common/base_matrix.hpp" #include "cpp_common/interruption.hpp" #include "cpp_common/messages.hpp" diff --git a/include/drivers/pgr_pickDeliverEuclidean_driver.h b/include/drivers/pgr_pickDeliverEuclidean_driver.h index de1fb0296..8fada01b4 100644 --- a/include/drivers/pgr_pickDeliverEuclidean_driver.h +++ b/include/drivers/pgr_pickDeliverEuclidean_driver.h @@ -39,9 +39,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # include #endif -#include "c_types/vehicle_t.h" typedef struct PickDeliveryOrders_t PickDeliveryOrders_t; typedef struct Solution_rt Solution_rt; +typedef struct Vehicle_t Vehicle_t; #ifdef __cplusplus extern "C" { diff --git a/include/drivers/pgr_pickDeliver_driver.h b/include/drivers/pgr_pickDeliver_driver.h index 2e963c0c9..a043c49ab 100644 --- a/include/drivers/pgr_pickDeliver_driver.h +++ b/include/drivers/pgr_pickDeliver_driver.h @@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # include #endif -#include "c_types/vehicle_t.h" -#include "c_types/matrix_cell_t.h" +#include "cpp_common/vehicle_t.hpp" +#include "cpp_common/matrix_cell_t.hpp" typedef struct PickDeliveryOrders_t PickDeliveryOrders_t; typedef struct Solution_rt Solution_rt; diff --git a/include/problem/fleet.hpp b/include/problem/fleet.hpp index ddaeebc64..e9f2427d0 100644 --- a/include/problem/fleet.hpp +++ b/include/problem/fleet.hpp @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_types/typedefs.h" -#include "c_types/short_vehicle.h" +#include "cpp_common/short_vehicle.hpp" #include "problem/vehicle_pickDeliver.hpp" typedef struct Vehicle_t Vehicle_t; diff --git a/include/problem/orders.hpp b/include/problem/orders.hpp index de1d7a232..a6dc73b6f 100644 --- a/include/problem/orders.hpp +++ b/include/problem/orders.hpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "problem/order.hpp" -#include "c_types/pickDeliveryOrders_t.h" +#include "cpp_common/orders_t.hpp" #include "cpp_common/assert.hpp" #include "cpp_common/identifiers.hpp" #include "problem/tw_node.hpp" diff --git a/include/problem/pickDeliver.hpp b/include/problem/pickDeliver.hpp index ec06b2c6b..6edb46b12 100644 --- a/include/problem/pickDeliver.hpp +++ b/include/problem/pickDeliver.hpp @@ -35,8 +35,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_types/compatibleVehicles_rt.h" #include "c_types/solution_rt.h" -#include "c_types/pickDeliveryOrders_t.h" -#include "c_types/vehicle_t.h" +#include "cpp_common/orders_t.hpp" +#include "cpp_common/vehicle_t.hpp" #include "cpp_common/messages.hpp" #include "problem/vehicle_node.hpp" #include "problem/orders.hpp" diff --git a/include/problem/solution.hpp b/include/problem/solution.hpp index fa1e6895f..c3e6e06ff 100644 --- a/include/problem/solution.hpp +++ b/include/problem/solution.hpp @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "problem/vehicle_pickDeliver.hpp" #include "problem/fleet.hpp" -#include "c_types/short_vehicle.h" +#include "cpp_common/short_vehicle.hpp" typedef struct Solution_rt Solution_rt; diff --git a/src/common/matrixRows_input.c b/src/common/matrixRows_input.c index eeddb91f9..766827b94 100644 --- a/src/common/matrixRows_input.c +++ b/src/common/matrixRows_input.c @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/matrixRows_input.h" -#include "c_types/column_info_t.h" -#include "c_types/matrix_cell_t.h" +#include "cpp_common/info.hpp" +#include "cpp_common/matrix_cell_t.hpp" #include "c_common/get_check_data.h" diff --git a/src/common/orders_input.c b/src/common/orders_input.c index 5c10d553c..e25caa91b 100644 --- a/src/common/orders_input.c +++ b/src/common/orders_input.c @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/orders_input.h" -#include "c_types/pickDeliveryOrders_t.h" -#include "c_types/column_info_t.h" +#include "cpp_common/orders_t.hpp" +#include "cpp_common/info.hpp" #include "c_common/debug_macro.h" #include "c_common/get_check_data.h" diff --git a/src/common/time_multipliers_input.c b/src/common/time_multipliers_input.c index 12741abc0..345aaeefb 100644 --- a/src/common/time_multipliers_input.c +++ b/src/common/time_multipliers_input.c @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/time_multipliers_input.h" -#include "c_types/column_info_t.h" -#include "c_types/time_multipliers_t.h" +#include "cpp_common/info.hpp" +#include "cpp_common/time_multipliers_t.hpp" #include "c_common/get_check_data.h" #ifdef PROFILE diff --git a/src/common/vehicles_input.c b/src/common/vehicles_input.c index 0dc95d569..0b5e4866f 100644 --- a/src/common/vehicles_input.c +++ b/src/common/vehicles_input.c @@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "c_types/column_info_t.h" -#include "c_types/vehicle_t.h" +#include "cpp_common/info.hpp" +#include "cpp_common/vehicle_t.hpp" #include "c_common/get_check_data.h" diff --git a/src/compatibleVehicles/compatibleVehicles.c b/src/compatibleVehicles/compatibleVehicles.c index da1e9f796..79d23a8e4 100644 --- a/src/compatibleVehicles/compatibleVehicles.c +++ b/src/compatibleVehicles/compatibleVehicles.c @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/vehicles_input.h" #include "c_common/matrixRows_input.h" #include "c_common/time_multipliers_input.h" -#include "c_types/pickDeliveryOrders_t.h" +#include "cpp_common/orders_t.hpp" #include "c_types/compatibleVehicles_rt.h" #include "drivers/compatibleVehicles_driver.h" diff --git a/src/compatibleVehicles/compatibleVehicles_driver.cpp b/src/compatibleVehicles/compatibleVehicles_driver.cpp index 36ae37f8d..6f5fa74df 100644 --- a/src/compatibleVehicles/compatibleVehicles_driver.cpp +++ b/src/compatibleVehicles/compatibleVehicles_driver.cpp @@ -36,9 +36,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "problem/pickDeliver.hpp" #include "problem/matrix.hpp" -#include "c_types/pickDeliveryOrders_t.h" +#include "cpp_common/orders_t.hpp" #include "c_types/compatibleVehicles_rt.h" -#include "c_types/vehicle_t.h" +#include "cpp_common/vehicle_t.hpp" #include "cpp_common/assert.hpp" #include "c_common/pgr_alloc.hpp" diff --git a/src/cpp_common/base_matrix.cpp b/src/cpp_common/base_matrix.cpp index 93a2a2f5a..f287a98ca 100644 --- a/src/cpp_common/base_matrix.cpp +++ b/src/cpp_common/base_matrix.cpp @@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/identifiers.hpp" #include "cpp_common/assert.hpp" -#include "c_types/matrix_cell_t.h" -#include "c_types/vroom/vroom_matrix_t.h" +#include "cpp_common/matrix_cell_t.hpp" +#include "cpp_common/vroom_matrix_t.hpp" namespace vrprouting { diff --git a/src/optimize/optimize.c b/src/optimize/optimize.c index 5445da072..a5b1abcea 100644 --- a/src/optimize/optimize.c +++ b/src/optimize/optimize.c @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/matrixRows_input.h" #include "c_common/time_multipliers_input.h" #include "c_types/short_vehicle_rt.h" -#include "c_types/pickDeliveryOrders_t.h" +#include "cpp_common/orders_t.hpp" #include "drivers/optimize_driver.h" PGDLLEXPORT Datum diff --git a/src/optimize/optimize_driver.cpp b/src/optimize/optimize_driver.cpp index f6502c69b..572771a4a 100644 --- a/src/optimize/optimize_driver.cpp +++ b/src/optimize/optimize_driver.cpp @@ -38,9 +38,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "problem/pickDeliver.hpp" -#include "c_types/pickDeliveryOrders_t.h" +#include "cpp_common/orders_t.hpp" #include "c_types/short_vehicle_rt.h" -#include "c_types/vehicle_t.h" +#include "cpp_common/vehicle_t.hpp" #include "problem/matrix.hpp" #include "cpp_common/assert.hpp" diff --git a/src/pgr_pickDeliver/pickDeliver.c b/src/pgr_pickDeliver/pickDeliver.c index e7bc5b201..c9faf45af 100644 --- a/src/pgr_pickDeliver/pickDeliver.c +++ b/src/pgr_pickDeliver/pickDeliver.c @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/orders_input.h" #include "c_common/vehicles_input.h" #include "c_common/matrixRows_input.h" -#include "c_types/pickDeliveryOrders_t.h" +#include "cpp_common/orders_t.hpp" #include "c_types/solution_rt.h" #include "drivers/pgr_pickDeliver_driver.h" diff --git a/src/pgr_pickDeliver/pickDeliverEuclidean.c b/src/pgr_pickDeliver/pickDeliverEuclidean.c index 3749c0755..fb69a3110 100644 --- a/src/pgr_pickDeliver/pickDeliverEuclidean.c +++ b/src/pgr_pickDeliver/pickDeliverEuclidean.c @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/time_msg.h" #include "c_common/orders_input.h" #include "c_common/vehicles_input.h" -#include "c_types/pickDeliveryOrders_t.h" +#include "cpp_common/orders_t.hpp" #include "c_types/solution_rt.h" #include "drivers/pgr_pickDeliverEuclidean_driver.h" diff --git a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp b/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp index e2a0eea82..34f0083d1 100644 --- a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp +++ b/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/pickDeliveryOrders_t.h" +#include "cpp_common/orders_t.hpp" #include "c_types/solution_rt.h" #include "c_common/pgr_alloc.hpp" #include "cpp_common/assert.hpp" diff --git a/src/pgr_pickDeliver/pickDeliver_driver.cpp b/src/pgr_pickDeliver/pickDeliver_driver.cpp index 397f85dac..20eaec653 100644 --- a/src/pgr_pickDeliver/pickDeliver_driver.cpp +++ b/src/pgr_pickDeliver/pickDeliver_driver.cpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/pickDeliveryOrders_t.h" +#include "cpp_common/orders_t.hpp" #include "c_types/solution_rt.h" #include "c_common/pgr_alloc.hpp" #include "cpp_common/assert.hpp" diff --git a/src/pickDeliver/pickDeliver.c b/src/pickDeliver/pickDeliver.c index d5b3d36a1..2ee086078 100644 --- a/src/pickDeliver/pickDeliver.c +++ b/src/pickDeliver/pickDeliver.c @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/matrixRows_input.h" #include "c_common/time_multipliers_input.h" #include "c_types/solution_rt.h" -#include "c_types/pickDeliveryOrders_t.h" +#include "cpp_common/orders_t.hpp" #include "drivers/pickDeliver_driver.h" PGDLLEXPORT Datum _vrp_pickdeliver(PG_FUNCTION_ARGS); diff --git a/src/pickDeliver/pickDeliver_driver.cpp b/src/pickDeliver/pickDeliver_driver.cpp index fba52974f..b4dd23b56 100644 --- a/src/pickDeliver/pickDeliver_driver.cpp +++ b/src/pickDeliver/pickDeliver_driver.cpp @@ -36,9 +36,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "problem/pickDeliver.hpp" -#include "c_types/pickDeliveryOrders_t.h" +#include "cpp_common/orders_t.hpp" #include "c_types/solution_rt.h" -#include "c_types/vehicle_t.h" +#include "cpp_common/vehicle_t.hpp" #include "problem/matrix.hpp" #include "cpp_common/assert.hpp" diff --git a/src/problem/fleet.cpp b/src/problem/fleet.cpp index 9325e03f0..f71313f0d 100644 --- a/src/problem/fleet.cpp +++ b/src/problem/fleet.cpp @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/vehicle_t.h" +#include "cpp_common/vehicle_t.hpp" namespace vrprouting { namespace problem { diff --git a/src/problem/matrix.cpp b/src/problem/matrix.cpp index 89ddcc86b..7946b0005 100644 --- a/src/problem/matrix.cpp +++ b/src/problem/matrix.cpp @@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/assert.hpp" -#include "c_types/matrix_cell_t.h" -#include "c_types/time_multipliers_t.h" +#include "cpp_common/matrix_cell_t.hpp" +#include "cpp_common/time_multipliers_t.hpp" namespace vrprouting { diff --git a/src/problem/solution.cpp b/src/problem/solution.cpp index 928e707e4..8479a485d 100644 --- a/src/problem/solution.cpp +++ b/src/problem/solution.cpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include "problem/pickDeliver.hpp" -#include "c_types/short_vehicle.h" +#include "cpp_common/short_vehicle.hpp" typedef struct Solution_rt Solution_rt; diff --git a/src/problem/tw_node.cpp b/src/problem/tw_node.cpp index 4be73f44e..80c1421f2 100644 --- a/src/problem/tw_node.cpp +++ b/src/problem/tw_node.cpp @@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/assert.hpp" #include "problem/matrix.hpp" -#include "c_types/pickDeliveryOrders_t.h" -#include "c_types/vehicle_t.h" +#include "cpp_common/orders_t.hpp" +#include "cpp_common/vehicle_t.hpp" namespace vrprouting { diff --git a/src/vroom/vroom.c b/src/vroom/vroom.c index 4294032a7..214b003ce 100644 --- a/src/vroom/vroom.c +++ b/src/vroom/vroom.c @@ -48,10 +48,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/time_msg.h" #include "c_types/vroom/vroom_rt.h" -#include "c_types/vroom/vroom_job_t.h" -#include "c_types/vroom/vroom_shipment_t.h" -#include "c_types/vroom/vroom_vehicle_t.h" -#include "c_types/vroom/vroom_matrix_t.h" +#include "cpp_common/vroom_job_t.hpp" +#include "cpp_common/vroom_shipment_t.hpp" +#include "cpp_common/vroom_vehicle_t.hpp" +#include "cpp_common/vroom_matrix_t.hpp" #include "c_common/vroom/jobs_input.h" #include "c_common/vroom/breaks_input.h" @@ -60,7 +60,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/vroom/vehicles_input.h" #include "c_common/vroom/matrix_input.h" -#include "drivers//vroom_driver.h" +#include "drivers/vroom_driver.h" PGDLLEXPORT Datum _vrp_vroom(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_vrp_vroom); diff --git a/src/vroom/vroom_driver.cpp b/src/vroom/vroom_driver.cpp index 343b11992..9267c0ee2 100644 --- a/src/vroom/vroom_driver.cpp +++ b/src/vroom/vroom_driver.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "drivers//vroom_driver.h" +#include "drivers/vroom_driver.h" #include #include From 24177ff3afb5d6708566d798c1b130d88e89d271 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 11:04:23 -0600 Subject: [PATCH 11/28] (include/optimizers) *.h -> *.hpp --- include/optimizers/{move.h => move.hpp} | 0 include/optimizers/{simple.h => simple.hpp} | 0 include/optimizers/{tabu.h => tabu.hpp} | 0 include/optimizers/{tabu_list.h => tabu_list.hpp} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename include/optimizers/{move.h => move.hpp} (100%) rename include/optimizers/{simple.h => simple.hpp} (100%) rename include/optimizers/{tabu.h => tabu.hpp} (100%) rename include/optimizers/{tabu_list.h => tabu_list.hpp} (100%) diff --git a/include/optimizers/move.h b/include/optimizers/move.hpp similarity index 100% rename from include/optimizers/move.h rename to include/optimizers/move.hpp diff --git a/include/optimizers/simple.h b/include/optimizers/simple.hpp similarity index 100% rename from include/optimizers/simple.h rename to include/optimizers/simple.hpp diff --git a/include/optimizers/tabu.h b/include/optimizers/tabu.hpp similarity index 100% rename from include/optimizers/tabu.h rename to include/optimizers/tabu.hpp diff --git a/include/optimizers/tabu_list.h b/include/optimizers/tabu_list.hpp similarity index 100% rename from include/optimizers/tabu_list.h rename to include/optimizers/tabu_list.hpp From 2862d519807e7191483090d14d9434ed68d3c334 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 11:11:18 -0600 Subject: [PATCH 12/28] Adjusting code to header renames on include/optimizers --- include/optimizers/move.hpp | 8 ++++---- include/optimizers/simple.hpp | 8 ++++---- include/optimizers/tabu.hpp | 10 +++++----- include/optimizers/tabu_list.hpp | 8 ++++---- src/optimize/optimize_driver.cpp | 2 +- src/optimizers/move.cpp | 2 +- src/optimizers/simple.cpp | 2 +- src/optimizers/tabu.cpp | 4 ++-- src/optimizers/tabu_list.cpp | 2 +- src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp | 2 +- src/pgr_pickDeliver/pickDeliver_driver.cpp | 2 +- src/pickDeliver/pickDeliver_driver.cpp | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/optimizers/move.hpp b/include/optimizers/move.hpp index e2bd63780..78279bbf0 100644 --- a/include/optimizers/move.hpp +++ b/include/optimizers/move.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: matrix.h +FILE: move.hpp Copyright (c) 2021 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_OPTIMIZERS_MOVE_H_ -#define INCLUDE_OPTIMIZERS_MOVE_H_ +#ifndef INCLUDE_OPTIMIZERS_MOVE_HPP_ +#define INCLUDE_OPTIMIZERS_MOVE_HPP_ #pragma once #include @@ -110,5 +110,5 @@ class Move { } // namespace optimizers } // namespace vrprouting -#endif // INCLUDE_OPTIMIZERS_MOVE_H_ +#endif // INCLUDE_OPTIMIZERS_MOVE_HPP_ diff --git a/include/optimizers/simple.hpp b/include/optimizers/simple.hpp index a0da38992..94040064e 100644 --- a/include/optimizers/simple.hpp +++ b/include/optimizers/simple.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: optimize.cpp +FILE: simple.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. /*! @file */ -#ifndef INCLUDE_OPTIMIZERS_SIMPLE_H_ -#define INCLUDE_OPTIMIZERS_SIMPLE_H_ +#ifndef INCLUDE_OPTIMIZERS_SIMPLE_HPP_ +#define INCLUDE_OPTIMIZERS_SIMPLE_HPP_ #pragma once #include "problem/solution.hpp" @@ -87,4 +87,4 @@ class Optimize : public problem::Solution { } // namespace optimizers } // namespace vrprouting -#endif // INCLUDE_OPTIMIZERS_SIMPLE_H_ +#endif // INCLUDE_OPTIMIZERS_SIMPLE_HPP_ diff --git a/include/optimizers/tabu.hpp b/include/optimizers/tabu.hpp index 13799c8c0..67a3dc6f0 100644 --- a/include/optimizers/tabu.hpp +++ b/include/optimizers/tabu.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: optimize.h +FILE: tabu.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,12 +25,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /** @file */ -#ifndef INCLUDE_OPTIMIZERS_TABU_H_ -#define INCLUDE_OPTIMIZERS_TABU_H_ +#ifndef INCLUDE_OPTIMIZERS_TABU_HPP_ +#define INCLUDE_OPTIMIZERS_TABU_HPP_ #pragma once #include "problem/solution.hpp" -#include "optimizers/tabu_list.h" +#include "optimizers/tabu_list.hpp" namespace vrprouting { namespace optimizers { @@ -109,4 +109,4 @@ class Optimize : public problem::Solution { } // namespace optimizers } // namespace vrprouting -#endif // INCLUDE_OPTIMIZERS_TABU_H_ +#endif // INCLUDE_OPTIMIZERS_TABU_HPP_ diff --git a/include/optimizers/tabu_list.hpp b/include/optimizers/tabu_list.hpp index 469e05a4d..38b9b6211 100644 --- a/include/optimizers/tabu_list.hpp +++ b/include/optimizers/tabu_list.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_OPTIMIZERS_TABU_LIST_H_ -#define INCLUDE_OPTIMIZERS_TABU_LIST_H_ +#ifndef INCLUDE_OPTIMIZERS_TABU_LIST_HPP_ +#define INCLUDE_OPTIMIZERS_TABU_LIST_HPP_ #pragma once #include @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "optimizers/move.h" +#include "optimizers/move.hpp" namespace vrprouting { namespace optimizers { @@ -122,5 +122,5 @@ class TabuList { } // namespace optimizers } // namespace vrprouting -#endif // INCLUDE_OPTIMIZERS_TABU_LIST_H_ +#endif // INCLUDE_OPTIMIZERS_TABU_LIST_HPP_ diff --git a/src/optimize/optimize_driver.cpp b/src/optimize/optimize_driver.cpp index 572771a4a..7ac5987aa 100644 --- a/src/optimize/optimize_driver.cpp +++ b/src/optimize/optimize_driver.cpp @@ -46,7 +46,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/assert.hpp" #include "cpp_common/messages.hpp" #include "initialsol/tabu.hpp" -#include "optimizers/tabu.h" +#include "optimizers/tabu.hpp" #include "c_common/pgr_alloc.hpp" #include "cpp_common/interruption.hpp" diff --git a/src/optimizers/move.cpp b/src/optimizers/move.cpp index 726f0f622..1bedc1344 100644 --- a/src/optimizers/move.cpp +++ b/src/optimizers/move.cpp @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "optimizers/move.h" +#include "optimizers/move.hpp" #include #include "problem/vehicle_pickDeliver.hpp" #include "problem/order.hpp" diff --git a/src/optimizers/simple.cpp b/src/optimizers/simple.cpp index feb5021db..994a3e6aa 100644 --- a/src/optimizers/simple.cpp +++ b/src/optimizers/simple.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "optimizers/simple.h" +#include "optimizers/simple.hpp" #include #include diff --git a/src/optimizers/tabu.cpp b/src/optimizers/tabu.cpp index 7aa5459b9..b64f42ce3 100644 --- a/src/optimizers/tabu.cpp +++ b/src/optimizers/tabu.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "optimizers/tabu.h" +#include "optimizers/tabu.hpp" #include #include @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/assert.hpp" #include "cpp_common/messages.hpp" -#include "optimizers/move.h" +#include "optimizers/move.hpp" /** * Anonymus namespace for static functions diff --git a/src/optimizers/tabu_list.cpp b/src/optimizers/tabu_list.cpp index d5b53ca74..b0621e2f4 100644 --- a/src/optimizers/tabu_list.cpp +++ b/src/optimizers/tabu_list.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "optimizers/tabu_list.h" +#include "optimizers/tabu_list.hpp" #include #include diff --git a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp b/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp index 34f0083d1..b29c2a46a 100644 --- a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp +++ b/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "problem/matrix.hpp" #include "initialsol/simple.hpp" -#include "optimizers/simple.h" +#include "optimizers/simple.hpp" #include "problem/pickDeliver.hpp" namespace { diff --git a/src/pgr_pickDeliver/pickDeliver_driver.cpp b/src/pgr_pickDeliver/pickDeliver_driver.cpp index 20eaec653..3c83a377e 100644 --- a/src/pgr_pickDeliver/pickDeliver_driver.cpp +++ b/src/pgr_pickDeliver/pickDeliver_driver.cpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/assert.hpp" #include "problem/solution.hpp" #include "initialsol/simple.hpp" -#include "optimizers/simple.h" +#include "optimizers/simple.hpp" #include "problem/pickDeliver.hpp" #include "initialsol/initials_code.hpp" diff --git a/src/pickDeliver/pickDeliver_driver.cpp b/src/pickDeliver/pickDeliver_driver.cpp index b4dd23b56..2f3aa880d 100644 --- a/src/pickDeliver/pickDeliver_driver.cpp +++ b/src/pickDeliver/pickDeliver_driver.cpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/assert.hpp" #include "initialsol/tabu.hpp" -#include "optimizers/tabu.h" +#include "optimizers/tabu.hpp" #include "c_common/pgr_alloc.hpp" /** From 641efb8adf6694a8a5b7dc3baf691a2f6dc54b6d Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 11:53:03 -0600 Subject: [PATCH 13/28] include/c_common/*.h -> include/cpp_common/*.hpp --- include/{c_common/pgr_alloc.hpp => cpp_common/alloc.hpp} | 0 .../{c_common/get_check_data.h => cpp_common/get_check_data.hpp} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename include/{c_common/pgr_alloc.hpp => cpp_common/alloc.hpp} (100%) rename include/{c_common/get_check_data.h => cpp_common/get_check_data.hpp} (100%) diff --git a/include/c_common/pgr_alloc.hpp b/include/cpp_common/alloc.hpp similarity index 100% rename from include/c_common/pgr_alloc.hpp rename to include/cpp_common/alloc.hpp diff --git a/include/c_common/get_check_data.h b/include/cpp_common/get_check_data.hpp similarity index 100% rename from include/c_common/get_check_data.h rename to include/cpp_common/get_check_data.hpp From 2111ec0fc16544e25681b2ec5bfd8541c4e548ff Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 11:54:32 -0600 Subject: [PATCH 14/28] (include/cpp_common) fixing file guards --- include/cpp_common/alloc.hpp | 8 ++++---- include/cpp_common/assert.hpp | 6 +++--- include/cpp_common/get_check_data.hpp | 8 ++++---- include/cpp_common/info.hpp | 8 ++++---- include/cpp_common/matrix_cell_t.hpp | 8 ++++---- include/cpp_common/messages.hpp | 6 +++--- include/cpp_common/orders_t.hpp | 9 ++++----- include/cpp_common/short_vehicle.hpp | 8 ++++---- include/cpp_common/time_multipliers_t.hpp | 6 +++--- include/cpp_common/vehicle_t.hpp | 8 ++++---- include/cpp_common/vroom_break_t.hpp | 8 ++++---- include/cpp_common/vroom_job_t.hpp | 8 ++++---- include/cpp_common/vroom_matrix_t.hpp | 8 ++++---- include/cpp_common/vroom_shipment_t.hpp | 8 ++++---- include/cpp_common/vroom_time_window_t.hpp | 8 ++++---- include/cpp_common/vroom_vehicle_t.hpp | 8 ++++---- 16 files changed, 61 insertions(+), 62 deletions(-) diff --git a/include/cpp_common/alloc.hpp b/include/cpp_common/alloc.hpp index 18750944c..438618eb7 100644 --- a/include/cpp_common/alloc.hpp +++ b/include/cpp_common/alloc.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_palloc.hpp +File: alloc.hpp Copyright (c) 2015 Celia Virginia Vergara Castillo Mail: vicky_vergara@hotmail.com @@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_C_COMMON_PGR_ALLOC_HPP_ -#define INCLUDE_C_COMMON_PGR_ALLOC_HPP_ +#ifndef INCLUDE_CPP_COMMON_ALLOC_HPP_ +#define INCLUDE_CPP_COMMON_ALLOC_HPP_ #pragma once @@ -84,4 +84,4 @@ pgr_free(T* ptr) { char * pgr_msg(const std::string &msg); -#endif // INCLUDE_C_COMMON_PGR_ALLOC_HPP_ +#endif // INCLUDE_CPP_COMMON_ALLOC_HPP_ diff --git a/include/cpp_common/assert.hpp b/include/cpp_common/assert.hpp index 8d69589a8..462557225 100644 --- a/include/cpp_common/assert.hpp +++ b/include/cpp_common/assert.hpp @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CPP_COMMON_PGR_ASSERT_HPP_ -#define INCLUDE_CPP_COMMON_PGR_ASSERT_HPP_ +#ifndef INCLUDE_CPP_COMMON_ASSERT_HPP_ +#define INCLUDE_CPP_COMMON_ASSERT_HPP_ #pragma once #include @@ -147,4 +147,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/get_check_data.hpp b/include/cpp_common/get_check_data.hpp index 67a92a5ce..d70fb869d 100644 --- a/include/cpp_common/get_check_data.hpp +++ b/include/cpp_common/get_check_data.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: get_check_data.h +FILE: get_check_data.hpp Copyright (c) 2015 Celia Virginia Vergara Castillo vicky_vergara@hotmail.com @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_C_COMMON_GET_CHECK_DATA_H_ -#define INCLUDE_C_COMMON_GET_CHECK_DATA_H_ +#ifndef INCLUDE_CPP_COMMON_GET_CHECK_DATA_HPP_ +#define INCLUDE_CPP_COMMON_GET_CHECK_DATA_HPP_ #pragma once #include "c_common/postgres_connection.h" @@ -169,4 +169,4 @@ PAmount get_PositiveAmount(HeapTuple*, TupleDesc*, Column_info_t, PAmount); Coordinate spi_getCoordinate(HeapTuple*, TupleDesc*, Column_info_t, Coordinate); -#endif // INCLUDE_C_COMMON_GET_CHECK_DATA_H_ +#endif // INCLUDE_CPP_COMMON_GET_CHECK_DATA_HPP_ diff --git a/include/cpp_common/info.hpp b/include/cpp_common/info.hpp index d71edc5c6..37275bf60 100644 --- a/include/cpp_common/info.hpp +++ b/include/cpp_common/info.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_types.h +File: info.hpp Copyright (c) 2015 Celia Virginia Vergara Castillo Mail: vicky_vergara@hotmail.com @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_COLUMN_INFO_T_H_ -#define INCLUDE_C_TYPES_COLUMN_INFO_T_H_ +#ifndef INCLUDE_CPP_COMMON_INFO_HPP_ +#define INCLUDE_CPP_COMMON_INFO_HPP_ #pragma once /* for int64_t */ @@ -59,4 +59,4 @@ struct { } Column_info_t; -#endif // INCLUDE_C_TYPES_COLUMN_INFO_T_H_ +#endif // INCLUDE_CPP_COMMON_INFO_HPP_ diff --git a/include/cpp_common/matrix_cell_t.hpp b/include/cpp_common/matrix_cell_t.hpp index 4b48ee95d..fe925bd2d 100644 --- a/include/cpp_common/matrix_cell_t.hpp +++ b/include/cpp_common/matrix_cell_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: matrix_cell_t.h +File: matrix_cell_t.hpp Copyright (c) 2017 Celia Virginia Vergara Castillo Mail: vicky_vergara@hotmail.com @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_MATRIX_CELL_T_H_ -#define INCLUDE_C_TYPES_MATRIX_CELL_T_H_ +#ifndef INCLUDE_CPP_COMMON_MATRIX_CELL_T_HPP_ +#define INCLUDE_CPP_COMMON_MATRIX_CELL_T_HPP_ #pragma once #include "c_types/typedefs.h" @@ -44,4 +44,4 @@ struct Matrix_cell_t { TInterval cost; /** Travel Interval from departure to arrival */ }; -#endif // INCLUDE_C_TYPES_MATRIX_CELL_T_H_ +#endif // INCLUDE_CPP_COMMON_MATRIX_CELL_T_HPP_ diff --git a/include/cpp_common/messages.hpp b/include/cpp_common/messages.hpp index ae2ab87d2..3e9a363e0 100644 --- a/include/cpp_common/messages.hpp +++ b/include/cpp_common/messages.hpp @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. File from pgRouting */ -#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 @@ -109,4 +109,4 @@ class Pgr_messages { } // namespace vrprouting -#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 45647b7f5..06dcc56fd 100644 --- a/include/cpp_common/orders_t.hpp +++ b/include/cpp_common/orders_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pickDeliveryOrders_t.h +File: orders_t.hpp Copyright (c) 2015 Celia Virginia Vergara Castillo Mail: vicky_vergara@hotmail.com @@ -23,9 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_PICKDELIVERYORDERS_T_H_ -#define INCLUDE_C_TYPES_PICKDELIVERYORDERS_T_H_ -#pragma once +#ifndef INCLUDE_CPP_COMMON_ORDERS_T_HPP_ +#define INCLUDE_CPP_COMMON_ORDERS_T_HPP_ #include "c_types/typedefs.h" @@ -74,4 +73,4 @@ struct PickDeliveryOrders_t{ TInterval deliver_service_t; /** Deliver service duration */ }; -#endif // INCLUDE_C_TYPES_PICKDELIVERYORDERS_T_H_ +#endif // INCLUDE_CPP_COMMON_ORDERS_T_HPP_ diff --git a/include/cpp_common/short_vehicle.hpp b/include/cpp_common/short_vehicle.hpp index 9ccb26ed5..4720e9f3e 100644 --- a/include/cpp_common/short_vehicle.hpp +++ b/include/cpp_common/short_vehicle.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: Short_vehicle.h +File: Short_vehicle.hpp Copyright (c) 2015 Celia Virginia Vergara Castillo Mail: vicky_vergara@hotmail.com @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /** @file */ -#ifndef INCLUDE_C_TYPES_SHORT_VEHICLE_H_ -#define INCLUDE_C_TYPES_SHORT_VEHICLE_H_ +#ifndef INCLUDE_CPP_COMMON_SHORT_VEHICLE_HPP_ +#define INCLUDE_CPP_COMMON_SHORT_VEHICLE_HPP_ #pragma once #include @@ -44,4 +44,4 @@ struct Short_vehicle{ }; -#endif // INCLUDE_C_TYPES_SHORT_VEHICLE_H_ +#endif // INCLUDE_CPP_COMMON_SHORT_VEHICLE_HPP_ diff --git a/include/cpp_common/time_multipliers_t.hpp b/include/cpp_common/time_multipliers_t.hpp index db460bad8..28525d7fe 100644 --- a/include/cpp_common/time_multipliers_t.hpp +++ b/include/cpp_common/time_multipliers_t.hpp @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /** @file */ -#ifndef INCLUDE_C_TYPES_TIME_MULTIPLIERS_T_H_ -#define INCLUDE_C_TYPES_TIME_MULTIPLIERS_T_H_ +#ifndef INCLUDE_CPP_COMMON_TIME_MULTIPLIERS_T_HPP_ +#define INCLUDE_CPP_COMMON_TIME_MULTIPLIERS_T_HPP_ #pragma once @@ -50,4 +50,4 @@ struct Time_multipliers_t { Multiplier multiplier; }; -#endif // INCLUDE_C_TYPES_TIME_MULTIPLIERS_T_H_ +#endif // INCLUDE_CPP_COMMON_TIME_MULTIPLIERS_T_HPP_ diff --git a/include/cpp_common/vehicle_t.hpp b/include/cpp_common/vehicle_t.hpp index 90e1da10a..060f5f46b 100644 --- a/include/cpp_common/vehicle_t.hpp +++ b/include/cpp_common/vehicle_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: vehicle_t.h +File: vehicle_t.hpp Copyright (c) 2015 Celia Virginia Vergara Castillo Mail: vicky_vergara@hotmail.com @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /** @file */ -#ifndef INCLUDE_C_TYPES_VEHICLE_T_H_ -#define INCLUDE_C_TYPES_VEHICLE_T_H_ +#ifndef INCLUDE_CPP_COMMON_VEHICLE_T_HPP_ +#define INCLUDE_CPP_COMMON_VEHICLE_T_HPP_ #pragma once #include "c_types/typedefs.h" @@ -71,4 +71,4 @@ struct Vehicle_t { }; -#endif // INCLUDE_C_TYPES_VEHICLE_T_H_ +#endif // INCLUDE_CPP_COMMON_VEHICLE_T_HPP_ diff --git a/include/cpp_common/vroom_break_t.hpp b/include/cpp_common/vroom_break_t.hpp index 1a1ad4df0..0a1de1aa8 100644 --- a/include/cpp_common/vroom_break_t.hpp +++ b/include/cpp_common/vroom_break_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: vroom_break_t.h +File: vroom_break_t.hpp Copyright (c) 2021 pgRouting developers Mail: project@pgrouting.org @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_VROOM_VROOM_BREAK_T_H_ -#define INCLUDE_C_TYPES_VROOM_VROOM_BREAK_T_H_ +#ifndef INCLUDE_CPP_COMMON_VROOM_BREAK_T_HPP_ +#define INCLUDE_CPP_COMMON_VROOM_BREAK_T_HPP_ #pragma once #include "c_types/typedefs.h" @@ -51,4 +51,4 @@ struct Vroom_break_t { }; -#endif // INCLUDE_C_TYPES_VROOM_VROOM_BREAK_T_H_ +#endif // INCLUDE_CPP_COMMON_VROOM_BREAK_T_HPP_ diff --git a/include/cpp_common/vroom_job_t.hpp b/include/cpp_common/vroom_job_t.hpp index 2ec42817c..dc0f4400a 100644 --- a/include/cpp_common/vroom_job_t.hpp +++ b/include/cpp_common/vroom_job_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: vroom_job_t.h +File: vroom_job_t.hpp Copyright (c) 2021 pgRouting developers Mail: project@pgrouting.org @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_VROOM_VROOM_JOB_T_H_ -#define INCLUDE_C_TYPES_VROOM_VROOM_JOB_T_H_ +#ifndef INCLUDE_CPP_COMMON_VROOM_JOB_T_HPP_ +#define INCLUDE_CPP_COMMON_VROOM_JOB_T_HPP_ #pragma once #include "c_types/typedefs.h" @@ -72,4 +72,4 @@ struct Vroom_job_t { char *data; /** Metadata information of job */ }; -#endif // INCLUDE_C_TYPES_VROOM_VROOM_JOB_T_H_ +#endif // INCLUDE_CPP_COMMON_VROOM_JOB_T_HPP_ diff --git a/include/cpp_common/vroom_matrix_t.hpp b/include/cpp_common/vroom_matrix_t.hpp index 8bff753bf..12d511ed6 100644 --- a/include/cpp_common/vroom_matrix_t.hpp +++ b/include/cpp_common/vroom_matrix_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: vroom_matrix_t.h +File: vroom_matrix_t.hpp Copyright (c) 2021 pgRouting developers Mail: project@pgrouting.org @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_VROOM_VROOM_MATRIX_T_H_ -#define INCLUDE_C_TYPES_VROOM_VROOM_MATRIX_T_H_ +#ifndef INCLUDE_CPP_COMMON_VROOM_MATRIX_T_HPP_ +#define INCLUDE_CPP_COMMON_VROOM_MATRIX_T_HPP_ #pragma once #include "c_types/typedefs.h" @@ -51,4 +51,4 @@ struct Vroom_matrix_t { TravelCost cost; /** Cost to travel from start to end */ }; -#endif // INCLUDE_C_TYPES_VROOM_VROOM_MATRIX_T_H_ +#endif // INCLUDE_CPP_COMMON_VROOM_MATRIX_T_HPP_ diff --git a/include/cpp_common/vroom_shipment_t.hpp b/include/cpp_common/vroom_shipment_t.hpp index 9719cf955..e6f1b745e 100644 --- a/include/cpp_common/vroom_shipment_t.hpp +++ b/include/cpp_common/vroom_shipment_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: vroom_shipment_t.h +File: vroom_shipment_t.hpp Copyright (c) 2021 pgRouting developers Mail: project@pgrouting.org @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_VROOM_VROOM_SHIPMENT_T_H_ -#define INCLUDE_C_TYPES_VROOM_VROOM_SHIPMENT_T_H_ +#ifndef INCLUDE_CPP_COMMON_VROOM_SHIPMENT_T_HPP_ +#define INCLUDE_CPP_COMMON_VROOM_SHIPMENT_T_HPP_ #pragma once #include "c_types/typedefs.h" @@ -78,4 +78,4 @@ struct Vroom_shipment_t { char *d_data; /** Metadata information of delivery shipment */ }; -#endif // INCLUDE_C_TYPES_VROOM_VROOM_SHIPMENT_T_H_ +#endif // INCLUDE_CPP_COMMON_VROOM_SHIPMENT_T_HPP_ diff --git a/include/cpp_common/vroom_time_window_t.hpp b/include/cpp_common/vroom_time_window_t.hpp index 862872a3c..e9321414f 100644 --- a/include/cpp_common/vroom_time_window_t.hpp +++ b/include/cpp_common/vroom_time_window_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: vroom_time_window_t.h +File: vroom_time_window_t.hpp Copyright (c) 2021 pgRouting developers Mail: project@pgrouting.org @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_VROOM_VROOM_TIME_WINDOW_T_H_ -#define INCLUDE_C_TYPES_VROOM_VROOM_TIME_WINDOW_T_H_ +#ifndef INCLUDE_CPP_COMMON_VROOM_TIME_WINDOW_T_HPP_ +#define INCLUDE_CPP_COMMON_VROOM_TIME_WINDOW_T_HPP_ #pragma once #include "c_types/typedefs.h" @@ -50,4 +50,4 @@ struct Vroom_time_window_t { Duration tw_close; }; -#endif // INCLUDE_C_TYPES_VROOM_VROOM_TIME_WINDOW_T_H_ +#endif // INCLUDE_CPP_COMMON_VROOM_TIME_WINDOW_T_HPP_ diff --git a/include/cpp_common/vroom_vehicle_t.hpp b/include/cpp_common/vroom_vehicle_t.hpp index 85b41800a..c23ca4d90 100644 --- a/include/cpp_common/vroom_vehicle_t.hpp +++ b/include/cpp_common/vroom_vehicle_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: vroom_vehicle_t.h +File: vroom_vehicle_t.hpp Copyright (c) 2021 pgRouting developers Mail: project@pgrouting.org @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_VROOM_VROOM_VEHICLE_T_H_ -#define INCLUDE_C_TYPES_VROOM_VROOM_VEHICLE_T_H_ +#ifndef INCLUDE_CPP_COMMON_VROOM_VEHICLE_T_HPP_ +#define INCLUDE_CPP_COMMON_VROOM_VEHICLE_T_HPP_ #pragma once #include "c_types/typedefs.h" @@ -73,4 +73,4 @@ struct Vroom_vehicle_t { }; -#endif // INCLUDE_C_TYPES_VROOM_VROOM_VEHICLE_T_H_ +#endif // INCLUDE_CPP_COMMON_VROOM_VEHICLE_T_HPP_ From 284e2461b0eb139959a1060ff7699df754189ebb Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 11:59:22 -0600 Subject: [PATCH 15/28] Adjusting code for files moved to include/cpp_common --- include/c_common/vroom/breaks_input.h | 2 +- include/c_common/vroom/jobs_input.h | 2 +- include/c_common/vroom/matrix_input.h | 2 +- include/c_common/vroom/shipments_input.h | 2 +- include/c_common/vroom/time_windows_input.h | 2 +- include/c_common/vroom/vehicles_input.h | 2 +- src/common/get_check_data.c | 2 +- src/common/matrixRows_input.c | 2 +- src/common/orders_input.c | 2 +- src/common/pgr_alloc.cpp | 2 +- src/common/time_multipliers_input.c | 2 +- src/common/vehicles_input.c | 2 +- src/compatibleVehicles/compatibleVehicles_driver.cpp | 2 +- src/optimize/optimize_driver.cpp | 2 +- src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp | 2 +- src/pgr_pickDeliver/pickDeliver_driver.cpp | 2 +- src/pickDeliver/pickDeliver.c | 2 +- src/pickDeliver/pickDeliver_driver.cpp | 2 +- src/vroom/vroom_driver.cpp | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/c_common/vroom/breaks_input.h b/include/c_common/vroom/breaks_input.h index 74cfc9e68..2f6af1b37 100644 --- a/include/c_common/vroom/breaks_input.h +++ b/include/c_common/vroom/breaks_input.h @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "c_common/get_check_data.h" +#include "cpp_common/get_check_data.hpp" #include "cpp_common/info.hpp" #include "cpp_common/vroom_break_t.hpp" diff --git a/include/c_common/vroom/jobs_input.h b/include/c_common/vroom/jobs_input.h index cf0431e85..e9bf1067d 100644 --- a/include/c_common/vroom/jobs_input.h +++ b/include/c_common/vroom/jobs_input.h @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "c_common/get_check_data.h" +#include "cpp_common/get_check_data.hpp" #include "cpp_common/info.hpp" #include "cpp_common/vroom_job_t.hpp" diff --git a/include/c_common/vroom/matrix_input.h b/include/c_common/vroom/matrix_input.h index c5755fb15..a2b17cbcd 100644 --- a/include/c_common/vroom/matrix_input.h +++ b/include/c_common/vroom/matrix_input.h @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "c_common/get_check_data.h" +#include "cpp_common/get_check_data.hpp" #include "cpp_common/info.hpp" #include "cpp_common/vroom_matrix_t.hpp" diff --git a/include/c_common/vroom/shipments_input.h b/include/c_common/vroom/shipments_input.h index c9ddde7ac..1e6859c6d 100644 --- a/include/c_common/vroom/shipments_input.h +++ b/include/c_common/vroom/shipments_input.h @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "c_common/get_check_data.h" +#include "cpp_common/get_check_data.hpp" #include "cpp_common/info.hpp" #include "cpp_common/vroom_shipment_t.hpp" diff --git a/include/c_common/vroom/time_windows_input.h b/include/c_common/vroom/time_windows_input.h index 05c7faff0..7703ce67d 100644 --- a/include/c_common/vroom/time_windows_input.h +++ b/include/c_common/vroom/time_windows_input.h @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_common/get_check_data.h" +#include "cpp_common/get_check_data.hpp" #include "cpp_common/info.hpp" #include "cpp_common/vroom_time_window_t.hpp" diff --git a/include/c_common/vroom/vehicles_input.h b/include/c_common/vroom/vehicles_input.h index d3eb3db09..fe9781b2f 100644 --- a/include/c_common/vroom/vehicles_input.h +++ b/include/c_common/vroom/vehicles_input.h @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "c_common/get_check_data.h" +#include "cpp_common/get_check_data.hpp" #include "cpp_common/info.hpp" #include "cpp_common/vroom_vehicle_t.hpp" diff --git a/src/common/get_check_data.c b/src/common/get_check_data.c index 79fb278b8..3665839c1 100644 --- a/src/common/get_check_data.c +++ b/src/common/get_check_data.c @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include // NOLINT [build/include_order] #include // NOLINT [build/include_order] -#include "c_common/get_check_data.h" +#include "cpp_common/get_check_data.hpp" #include "c_common/arrays_input.h" #include "catalog/pg_type.h" diff --git a/src/common/matrixRows_input.c b/src/common/matrixRows_input.c index 766827b94..afcbf2325 100644 --- a/src/common/matrixRows_input.c +++ b/src/common/matrixRows_input.c @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/info.hpp" #include "cpp_common/matrix_cell_t.hpp" -#include "c_common/get_check_data.h" +#include "cpp_common/get_check_data.hpp" #ifdef PROFILE #include "c_common/time_msg.h" diff --git a/src/common/orders_input.c b/src/common/orders_input.c index e25caa91b..586e0efea 100644 --- a/src/common/orders_input.c +++ b/src/common/orders_input.c @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/info.hpp" #include "c_common/debug_macro.h" -#include "c_common/get_check_data.h" +#include "cpp_common/get_check_data.hpp" #ifdef PROFILE #include "c_common/time_msg.h" #endif diff --git a/src/common/pgr_alloc.cpp b/src/common/pgr_alloc.cpp index 151420127..81d121c0b 100644 --- a/src/common/pgr_alloc.cpp +++ b/src/common/pgr_alloc.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "c_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include #include diff --git a/src/common/time_multipliers_input.c b/src/common/time_multipliers_input.c index 345aaeefb..05cbad2f0 100644 --- a/src/common/time_multipliers_input.c +++ b/src/common/time_multipliers_input.c @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/info.hpp" #include "cpp_common/time_multipliers_t.hpp" -#include "c_common/get_check_data.h" +#include "cpp_common/get_check_data.hpp" #ifdef PROFILE #include "c_common/time_msg.h" diff --git a/src/common/vehicles_input.c b/src/common/vehicles_input.c index 0b5e4866f..f29814ddd 100644 --- a/src/common/vehicles_input.c +++ b/src/common/vehicles_input.c @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/info.hpp" #include "cpp_common/vehicle_t.hpp" -#include "c_common/get_check_data.h" +#include "cpp_common/get_check_data.hpp" #ifdef PROFILE #include "c_common/time_msg.h" diff --git a/src/compatibleVehicles/compatibleVehicles_driver.cpp b/src/compatibleVehicles/compatibleVehicles_driver.cpp index 6f5fa74df..c9f776eaa 100644 --- a/src/compatibleVehicles/compatibleVehicles_driver.cpp +++ b/src/compatibleVehicles/compatibleVehicles_driver.cpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/vehicle_t.hpp" #include "cpp_common/assert.hpp" -#include "c_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" /** * diff --git a/src/optimize/optimize_driver.cpp b/src/optimize/optimize_driver.cpp index 7ac5987aa..1d11b3f29 100644 --- a/src/optimize/optimize_driver.cpp +++ b/src/optimize/optimize_driver.cpp @@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/messages.hpp" #include "initialsol/tabu.hpp" #include "optimizers/tabu.hpp" -#include "c_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/interruption.hpp" namespace { diff --git a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp b/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp index b29c2a46a..57bceae1b 100644 --- a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp +++ b/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/orders_t.hpp" #include "c_types/solution_rt.h" -#include "c_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/assert.hpp" #include "problem/matrix.hpp" diff --git a/src/pgr_pickDeliver/pickDeliver_driver.cpp b/src/pgr_pickDeliver/pickDeliver_driver.cpp index 3c83a377e..1b5932b4c 100644 --- a/src/pgr_pickDeliver/pickDeliver_driver.cpp +++ b/src/pgr_pickDeliver/pickDeliver_driver.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/orders_t.hpp" #include "c_types/solution_rt.h" -#include "c_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/assert.hpp" #include "problem/solution.hpp" #include "initialsol/simple.hpp" diff --git a/src/pickDeliver/pickDeliver.c b/src/pickDeliver/pickDeliver.c index 2ee086078..97cd95107 100644 --- a/src/pickDeliver/pickDeliver.c +++ b/src/pickDeliver/pickDeliver.c @@ -33,7 +33,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 "c_common/orders_input.h" -#include "c_common/get_check_data.h" +#include "cpp_common/get_check_data.hpp" #include "c_common/vehicles_input.h" #include "c_common/matrixRows_input.h" #include "c_common/time_multipliers_input.h" diff --git a/src/pickDeliver/pickDeliver_driver.cpp b/src/pickDeliver/pickDeliver_driver.cpp index 2f3aa880d..09c612cb6 100644 --- a/src/pickDeliver/pickDeliver_driver.cpp +++ b/src/pickDeliver/pickDeliver_driver.cpp @@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/assert.hpp" #include "initialsol/tabu.hpp" #include "optimizers/tabu.hpp" -#include "c_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" /** * diff --git a/src/vroom/vroom_driver.cpp b/src/vroom/vroom_driver.cpp index 9267c0ee2..85938dbeb 100644 --- a/src/vroom/vroom_driver.cpp +++ b/src/vroom/vroom_driver.cpp @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/assert.hpp" #include "cpp_common/vrp_vroom_problem.hpp" From b348f612b5480cdec395563e540f1b0094e034e7 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 13:43:53 -0600 Subject: [PATCH 16/28] (src/cpp_common) removing pgr prefix to file --- src/cpp_common/{pgr_assert.cpp => assert.cpp} | 0 src/cpp_common/{pgr_messages.cpp => messages.cpp} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/cpp_common/{pgr_assert.cpp => assert.cpp} (100%) rename src/cpp_common/{pgr_messages.cpp => messages.cpp} (100%) diff --git a/src/cpp_common/pgr_assert.cpp b/src/cpp_common/assert.cpp similarity index 100% rename from src/cpp_common/pgr_assert.cpp rename to src/cpp_common/assert.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 From e521231818589735a57456c87657ce2312899447 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 13:44:23 -0600 Subject: [PATCH 17/28] (src/cpp_common) Adjusting the build --- src/cpp_common/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpp_common/CMakeLists.txt b/src/cpp_common/CMakeLists.txt index 02b198e38..3af9d0e59 100644 --- a/src/cpp_common/CMakeLists.txt +++ b/src/cpp_common/CMakeLists.txt @@ -1,6 +1,6 @@ ADD_LIBRARY(cpp_common OBJECT base_matrix.cpp - pgr_messages.cpp + messages.cpp identifier.cpp - pgr_assert.cpp + assert.cpp ) From 7b6d3d974dea3ab131bfde3547633dffa5124a6f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 13:46:45 -0600 Subject: [PATCH 18/28] ../common/pgr_alloc.cpp -> alloc.cpp --- src/{common/pgr_alloc.cpp => cpp_common/alloc.cpp} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{common/pgr_alloc.cpp => cpp_common/alloc.cpp} (100%) diff --git a/src/common/pgr_alloc.cpp b/src/cpp_common/alloc.cpp similarity index 100% rename from src/common/pgr_alloc.cpp rename to src/cpp_common/alloc.cpp From eb3dc8a7b0f98ab6910eaf6c824cd7d8bdf4b14d Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Jul 2024 13:47:14 -0600 Subject: [PATCH 19/28] (src/cpp_common & src/common) Adjusting the build --- src/common/CMakeLists.txt | 1 - src/cpp_common/CMakeLists.txt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 268e4c29c..d63f84595 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -10,7 +10,6 @@ ADD_LIBRARY(common OBJECT time_msg.c e_report.c - pgr_alloc.cpp vroom/time_windows_input.c vroom/breaks_input.c diff --git a/src/cpp_common/CMakeLists.txt b/src/cpp_common/CMakeLists.txt index 3af9d0e59..4c0c456c6 100644 --- a/src/cpp_common/CMakeLists.txt +++ b/src/cpp_common/CMakeLists.txt @@ -3,4 +3,5 @@ ADD_LIBRARY(cpp_common OBJECT messages.cpp identifier.cpp assert.cpp + alloc.cpp ) From e1f86bce9d1250117fb58bb651a2c601932c0e95 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 29 Jul 2024 12:58:55 -0600 Subject: [PATCH 20/28] include/cpp_common/vrp_vroom_problem.hpp -> include/vroom/vroom.hpp --- include/{cpp_common/vrp_vroom_problem.hpp => vroom/vroom.hpp} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename include/{cpp_common/vrp_vroom_problem.hpp => vroom/vroom.hpp} (100%) diff --git a/include/cpp_common/vrp_vroom_problem.hpp b/include/vroom/vroom.hpp similarity index 100% rename from include/cpp_common/vrp_vroom_problem.hpp rename to include/vroom/vroom.hpp From c2f7e88cd6241b9beadb107267caefaa383259d3 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 29 Jul 2024 12:59:45 -0600 Subject: [PATCH 21/28] Adjusting code to include file rename --- include/vroom/vroom.hpp | 6 +++--- src/vroom/vroom_driver.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vroom/vroom.hpp b/include/vroom/vroom.hpp index 6dbf10beb..cedfdb3f9 100644 --- a/include/vroom/vroom.hpp +++ b/include/vroom/vroom.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CPP_COMMON_VRP_VROOM_PROBLEM_HPP_ -#define INCLUDE_CPP_COMMON_VRP_VROOM_PROBLEM_HPP_ +#ifndef INCLUDE_VROOM_VROOM_HPP_ +#define INCLUDE_VROOM_VROOM_HPP_ #pragma once #include @@ -649,4 +649,4 @@ class Vrp_vroom_problem : public vrprouting::Pgr_messages { } // namespace vrprouting -#endif // INCLUDE_CPP_COMMON_VRP_VROOM_PROBLEM_HPP_ +#endif // INCLUDE_VROOM_VROOM_HPP_ diff --git a/src/vroom/vroom_driver.cpp b/src/vroom/vroom_driver.cpp index 85938dbeb..61481662c 100644 --- a/src/vroom/vroom_driver.cpp +++ b/src/vroom/vroom_driver.cpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/alloc.hpp" #include "cpp_common/assert.hpp" -#include "cpp_common/vrp_vroom_problem.hpp" +#include "vroom/vroom.hpp" /** @file vroom_driver.cpp * @brief Handles actual calling of function in the `vrp_vroom.hpp` file. From 7fc2123bcbad7583b7ee7e229aec3d1e6ab30073 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 29 Jul 2024 13:01:05 -0600 Subject: [PATCH 22/28] src/common/get_check_data.c -> src/cpp_common/get_check_data.c --- src/{common => cpp_common}/get_check_data.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{common => cpp_common}/get_check_data.c (100%) diff --git a/src/common/get_check_data.c b/src/cpp_common/get_check_data.c similarity index 100% rename from src/common/get_check_data.c rename to src/cpp_common/get_check_data.c From 0ada70ce2efe1a83c74e101d6ffbdf0f6b9d9ffc Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 29 Jul 2024 13:01:29 -0600 Subject: [PATCH 23/28] Adjusting build to file rename --- src/common/CMakeLists.txt | 1 - src/cpp_common/CMakeLists.txt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index d63f84595..d5ebb8cba 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,6 +1,5 @@ ADD_LIBRARY(common OBJECT postgres_connection.c - get_check_data.c matrixRows_input.c arrays_input.c diff --git a/src/cpp_common/CMakeLists.txt b/src/cpp_common/CMakeLists.txt index 4c0c456c6..658ee6037 100644 --- a/src/cpp_common/CMakeLists.txt +++ b/src/cpp_common/CMakeLists.txt @@ -4,4 +4,5 @@ ADD_LIBRARY(cpp_common OBJECT identifier.cpp assert.cpp alloc.cpp + get_check_data.c ) From 7d8a4a1fa854e7e2df5cc92f6bffb898e9ebf681 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 29 Jul 2024 13:17:54 -0600 Subject: [PATCH 24/28] nclude/c_types/vroom/vroom_rt.h -> include/c_types/vroom_rt.h and adjustments --- include/c_types/{vroom => }/vroom_rt.h | 6 +++--- include/vroom/vroom.hpp | 2 +- src/vroom/vroom.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename include/c_types/{vroom => }/vroom_rt.h (95%) diff --git a/include/c_types/vroom/vroom_rt.h b/include/c_types/vroom_rt.h similarity index 95% rename from include/c_types/vroom/vroom_rt.h rename to include/c_types/vroom_rt.h index 058b3cf17..ccd762142 100644 --- a/include/c_types/vroom/vroom_rt.h +++ b/include/c_types/vroom_rt.h @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_VROOM_VROOM_RT_H_ -#define INCLUDE_C_TYPES_VROOM_VROOM_RT_H_ +#ifndef INCLUDE_C_TYPES_VROOM_RT_H_ +#define INCLUDE_C_TYPES_VROOM_RT_H_ #pragma once #include "c_types/typedefs.h" @@ -76,4 +76,4 @@ struct Vroom_rt { size_t load_size; /** Vehicle's load array size */ }; -#endif // INCLUDE_C_TYPES_VROOM_VROOM_RT_H_ +#endif // INCLUDE_C_TYPES_VROOM_RT_H_ diff --git a/include/vroom/vroom.hpp b/include/vroom/vroom.hpp index cedfdb3f9..632b365e2 100644 --- a/include/vroom/vroom.hpp +++ b/include/vroom/vroom.hpp @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/matrix_cell_t.hpp" #include "cpp_common/vroom_break_t.hpp" #include "cpp_common/vroom_job_t.hpp" -#include "c_types/vroom/vroom_rt.h" +#include "c_types/vroom_rt.h" #include "cpp_common/vroom_shipment_t.hpp" #include "cpp_common/vroom_time_window_t.hpp" #include "cpp_common/vroom_vehicle_t.hpp" diff --git a/src/vroom/vroom.c b/src/vroom/vroom.c index 214b003ce..6bf69d300 100644 --- a/src/vroom/vroom.c +++ b/src/vroom/vroom.c @@ -47,7 +47,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 "c_types/vroom/vroom_rt.h" +#include "c_types/vroom_rt.h" #include "cpp_common/vroom_job_t.hpp" #include "cpp_common/vroom_shipment_t.hpp" #include "cpp_common/vroom_vehicle_t.hpp" From f0b1411b98bc363245c0f43416199b85df087a9c Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 29 Jul 2024 13:25:28 -0600 Subject: [PATCH 25/28] Fixing file names --- include/optimizers/tabu_list.hpp | 2 +- include/vroom/vroom.hpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/optimizers/tabu_list.hpp b/include/optimizers/tabu_list.hpp index 38b9b6211..225991288 100644 --- a/include/optimizers/tabu_list.hpp +++ b/include/optimizers/tabu_list.hpp @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: tabu_list.h +FILE: tabu_list.hpp Copyright (c) 2021 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vroom/vroom.hpp b/include/vroom/vroom.hpp index 632b365e2..15e9033f4 100644 --- a/include/vroom/vroom.hpp +++ b/include/vroom/vroom.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: vrp_vroom_problem.hpp +File: vroom.hpp Copyright (c) 2021 pgRouting developers Mail: project@pgrouting.org From 3c08924fb2392dbef28b15847c6b5c7e9253e392 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 29 Jul 2024 16:44:16 -0600 Subject: [PATCH 26/28] (src/pgr_pickDeliver) matching driver name --- src/pgr_pickDeliver/CMakeLists.txt | 4 ++-- ...clidean_driver.cpp => pgr_pickDeliverEuclidean_driver.cpp} | 0 .../{pickDeliver_driver.cpp => pgr_pickDeliver_driver.cpp} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/pgr_pickDeliver/{pickDeliverEuclidean_driver.cpp => pgr_pickDeliverEuclidean_driver.cpp} (100%) rename src/pgr_pickDeliver/{pickDeliver_driver.cpp => pgr_pickDeliver_driver.cpp} (100%) diff --git a/src/pgr_pickDeliver/CMakeLists.txt b/src/pgr_pickDeliver/CMakeLists.txt index 0f857fdd0..3ceb96a4a 100644 --- a/src/pgr_pickDeliver/CMakeLists.txt +++ b/src/pgr_pickDeliver/CMakeLists.txt @@ -1,6 +1,6 @@ ADD_LIBRARY(pgr_pickDeliver OBJECT - pickDeliverEuclidean_driver.cpp - pickDeliver_driver.cpp + pgr_pickDeliverEuclidean_driver.cpp + pgr_pickDeliver_driver.cpp pickDeliverEuclidean.c pickDeliver.c ) diff --git a/src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp b/src/pgr_pickDeliver/pgr_pickDeliverEuclidean_driver.cpp similarity index 100% rename from src/pgr_pickDeliver/pickDeliverEuclidean_driver.cpp rename to src/pgr_pickDeliver/pgr_pickDeliverEuclidean_driver.cpp diff --git a/src/pgr_pickDeliver/pickDeliver_driver.cpp b/src/pgr_pickDeliver/pgr_pickDeliver_driver.cpp similarity index 100% rename from src/pgr_pickDeliver/pickDeliver_driver.cpp rename to src/pgr_pickDeliver/pgr_pickDeliver_driver.cpp From c3152a41937a5975ecd5ddfa5f11c76ef0103d05 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 29 Jul 2024 17:52:09 -0600 Subject: [PATCH 27/28] Updating release notes and NEWS --- NEWS.md | 9 +++++++++ doc/general/release_notes.rst | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/NEWS.md b/NEWS.md index 17cfbac96..efe00ec9a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,6 +6,15 @@ ### vrpRouting 0.4.2 Release Notes +To see all issues & pull requests closed by this release see the +[Git closed milestone for 0.4.2](https://github.com/pgRouting/vrprouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%200.4.2%22) +on Github. + +**Code reorganization** + +* Renamed files to be compiled as C++ with .hpp & .cpp extensions + + **Documentation queries** * Renamed to extension `.pg` diff --git a/doc/general/release_notes.rst b/doc/general/release_notes.rst index d38a9c898..750aa053e 100644 --- a/doc/general/release_notes.rst +++ b/doc/general/release_notes.rst @@ -41,6 +41,15 @@ vrpRouting 0.4 vrpRouting 0.4.2 Release Notes ------------------------------------------------------------------------------- +To see all issues & pull requests closed by this release see the +`Git closed milestone for 0.4.2 `_ +on Github. + +.. rubric:: Code reorganization + +* Renamed files to be compiled as C++ with .hpp & .cpp extensions + + .. rubric:: Documentation queries * Renamed to extension `.pg` From fa80ff3bf3d00d4683de7e11f558b13913f846db Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 23:53:28 +0000 Subject: [PATCH 28/28] Update locale: commit for hash c3152a4 --- locale/en/LC_MESSAGES/release_notes.po | 143 +++++++++++++---------- locale/pot/release_notes.pot | 156 +++++++++++++------------ 2 files changed, 164 insertions(+), 135 deletions(-) diff --git a/locale/en/LC_MESSAGES/release_notes.po b/locale/en/LC_MESSAGES/release_notes.po index e496c449e..375d88ce3 100644 --- a/locale/en/LC_MESSAGES/release_notes.po +++ b/locale/en/LC_MESSAGES/release_notes.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: vrpRouting v0.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-24 18:41+0000\n" +"POT-Creation-Date: 2024-07-29 23:53+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -64,23 +64,40 @@ msgstr "" msgid "vrpRouting 0.4.2 Release Notes" msgstr "" -#: ../../build/doc/release_notes.rst:45 +#: ../../build/doc/release_notes.rst:44 +#, python-format +msgid "" +"To see all issues & pull requests closed by this release see the `Git " +"closed milestone for 0.4.2 " +"`_" +" on Github." +msgstr "" + +#: ../../build/doc/release_notes.rst:49 +msgid "Code reorganization" +msgstr "" + +#: ../../build/doc/release_notes.rst:50 +msgid "Renamed files to be compiled as C++ with .hpp & .cpp extensions" +msgstr "" + +#: ../../build/doc/release_notes.rst:54 msgid "Documentation queries" msgstr "" -#: ../../build/doc/release_notes.rst:46 +#: ../../build/doc/release_notes.rst:55 msgid "Renamed to extension `.pg`" msgstr "" -#: ../../build/doc/release_notes.rst:47 +#: ../../build/doc/release_notes.rst:56 msgid "Removed `doc-` and `doc-vrp_` suffixes on file names" msgstr "" -#: ../../build/doc/release_notes.rst:50 +#: ../../build/doc/release_notes.rst:59 msgid "vrpRouting 0.4.1 Release Notes" msgstr "" -#: ../../build/doc/release_notes.rst:52 +#: ../../build/doc/release_notes.rst:61 #, python-format msgid "" "To see all issues & pull requests closed by this release see the `Git " @@ -89,23 +106,23 @@ msgid "" " on Github." msgstr "" -#: ../../build/doc/release_notes.rst:58 +#: ../../build/doc/release_notes.rst:67 msgid "Modification on experimental functions" msgstr "" -#: ../../build/doc/release_notes.rst:59 +#: ../../build/doc/release_notes.rst:68 msgid "OR Tools" msgstr "" -#: ../../build/doc/release_notes.rst:61 +#: ../../build/doc/release_notes.rst:70 msgid "vrp_bin_packing" msgstr "" -#: ../../build/doc/release_notes.rst:62 +#: ../../build/doc/release_notes.rst:71 msgid "vrp_knapsack" msgstr "" -#: ../../build/doc/release_notes.rst:63 +#: ../../build/doc/release_notes.rst:72 msgid "vrp_multiple_knapsack" msgstr "" @@ -113,7 +130,7 @@ msgstr "" msgid "Support for or-tools v9.10.4067" msgstr "" -#: ../../build/doc/release_notes.rst:69 +#: ../../build/doc/release_notes.rst:78 msgid "vrp_oneDepot" msgstr "" @@ -125,15 +142,15 @@ msgstr "" msgid "Result columns changed" msgstr "" -#: ../../build/doc/release_notes.rst:76 +#: ../../build/doc/release_notes.rst:85 msgid "Removal of Boost on the build" msgstr "" -#: ../../build/doc/release_notes.rst:77 ../../build/doc/release_notes.rst:175 +#: ../../build/doc/release_notes.rst:86 ../../build/doc/release_notes.rst:184 msgid "vrp_full_version" msgstr "" -#: ../../build/doc/release_notes.rst:78 ../../build/doc/release_notes.rst:174 +#: ../../build/doc/release_notes.rst:87 ../../build/doc/release_notes.rst:183 msgid "vrp_version" msgstr "" @@ -141,11 +158,11 @@ msgstr "" msgid "Boost removed from the result columns" msgstr "" -#: ../../build/doc/release_notes.rst:85 +#: ../../build/doc/release_notes.rst:94 msgid "vrpRouting 0.4.0 Release Notes" msgstr "" -#: ../../build/doc/release_notes.rst:87 +#: ../../build/doc/release_notes.rst:96 #, python-format msgid "" "To see all issues & pull requests closed by this release see the `Git " @@ -154,39 +171,39 @@ msgid "" " on Github." msgstr "" -#: ../../build/doc/release_notes.rst:92 +#: ../../build/doc/release_notes.rst:101 msgid "" "Added support for VROOM 1.12.0 (`#34 " "`_)" msgstr "" -#: ../../build/doc/release_notes.rst:93 +#: ../../build/doc/release_notes.rst:102 msgid "No visible changes on user side with respect to signatures." msgstr "" -#: ../../build/doc/release_notes.rst:94 +#: ../../build/doc/release_notes.rst:103 msgid "Adjusted to VROOM v1.12.0 due to internal breaking changes:" msgstr "" -#: ../../build/doc/release_notes.rst:96 +#: ../../build/doc/release_notes.rst:105 msgid "Made changes according to new vroom::Input signature." msgstr "" -#: ../../build/doc/release_notes.rst:97 +#: ../../build/doc/release_notes.rst:106 msgid "" "CI changes to compile without routing support, with Position Independent " "Code." msgstr "" -#: ../../build/doc/release_notes.rst:98 +#: ../../build/doc/release_notes.rst:107 msgid "Removed support for VROOM 1.11.0" msgstr "" -#: ../../build/doc/release_notes.rst:101 +#: ../../build/doc/release_notes.rst:110 msgid "vrpRouting 0.3" msgstr "" -#: ../../build/doc/release_notes.rst:103 +#: ../../build/doc/release_notes.rst:112 #, python-format msgid "" "To see all issues & pull requests closed by this release see the `Git " @@ -195,87 +212,87 @@ msgid "" " on Github." msgstr "" -#: ../../build/doc/release_notes.rst:108 +#: ../../build/doc/release_notes.rst:117 msgid "Modification of experimental functions" msgstr "" -#: ../../build/doc/release_notes.rst:109 ../../build/doc/release_notes.rst:147 +#: ../../build/doc/release_notes.rst:118 ../../build/doc/release_notes.rst:156 msgid "VROOM" msgstr "" -#: ../../build/doc/release_notes.rst:111 ../../build/doc/release_notes.rst:149 +#: ../../build/doc/release_notes.rst:120 ../../build/doc/release_notes.rst:158 msgid "vrp_vroom" msgstr "" -#: ../../build/doc/release_notes.rst:112 ../../build/doc/release_notes.rst:150 +#: ../../build/doc/release_notes.rst:121 ../../build/doc/release_notes.rst:159 msgid "vrp_vroomJobs" msgstr "" -#: ../../build/doc/release_notes.rst:113 ../../build/doc/release_notes.rst:151 +#: ../../build/doc/release_notes.rst:122 ../../build/doc/release_notes.rst:160 msgid "vrp_vroomShipments" msgstr "" -#: ../../build/doc/release_notes.rst:114 ../../build/doc/release_notes.rst:152 +#: ../../build/doc/release_notes.rst:123 ../../build/doc/release_notes.rst:161 msgid "vrp_vroomPlain" msgstr "" -#: ../../build/doc/release_notes.rst:115 ../../build/doc/release_notes.rst:153 +#: ../../build/doc/release_notes.rst:124 ../../build/doc/release_notes.rst:162 msgid "vrp_vroomJobsPlain" msgstr "" -#: ../../build/doc/release_notes.rst:116 ../../build/doc/release_notes.rst:154 +#: ../../build/doc/release_notes.rst:125 ../../build/doc/release_notes.rst:163 msgid "vrp_vroomShipmentsPlain" msgstr "" -#: ../../build/doc/release_notes.rst:119 +#: ../../build/doc/release_notes.rst:128 msgid "" "Added support for VROOM 1.11.0 (`#24 " "`_)" msgstr "" -#: ../../build/doc/release_notes.rst:120 +#: ../../build/doc/release_notes.rst:129 msgid "Added setup time in jobs and shipments to refine service time modeling." msgstr "" -#: ../../build/doc/release_notes.rst:121 +#: ../../build/doc/release_notes.rst:130 msgid "Added support for custom cost matrices, along with the duration matrix." msgstr "" -#: ../../build/doc/release_notes.rst:123 +#: ../../build/doc/release_notes.rst:132 msgid "Using start_id, end_id, duration, cost as matrix table columns." msgstr "" -#: ../../build/doc/release_notes.rst:124 +#: ../../build/doc/release_notes.rst:133 msgid "" "Added timeout and exploration_level parameters to vroom-category " "functions." msgstr "" -#: ../../build/doc/release_notes.rst:125 +#: ../../build/doc/release_notes.rst:134 msgid "Added max_tasks column in vehicles." msgstr "" -#: ../../build/doc/release_notes.rst:126 +#: ../../build/doc/release_notes.rst:135 msgid "Added tests for empty skills arrays." msgstr "" -#: ../../build/doc/release_notes.rst:127 +#: ../../build/doc/release_notes.rst:136 msgid "Added custom scaling logic for speed_factor." msgstr "" -#: ../../build/doc/release_notes.rst:128 +#: ../../build/doc/release_notes.rst:137 msgid "Modified parameter names to make the naming consistent." msgstr "" -#: ../../build/doc/release_notes.rst:131 +#: ../../build/doc/release_notes.rst:140 msgid "Fixes" msgstr "" -#: ../../build/doc/release_notes.rst:132 +#: ../../build/doc/release_notes.rst:141 msgid "Honor client cancel requests for vroom-category functions." msgstr "" -#: ../../build/doc/release_notes.rst:133 +#: ../../build/doc/release_notes.rst:142 msgid "" "Added more information in the inner query and result columns of VROOM " "category functions (`#26 " @@ -283,79 +300,79 @@ msgid "" "`_):" msgstr "" -#: ../../build/doc/release_notes.rst:136 +#: ../../build/doc/release_notes.rst:145 msgid "Summary row in the output, for each vehicle and for the complete problem." msgstr "" -#: ../../build/doc/release_notes.rst:137 +#: ../../build/doc/release_notes.rst:146 msgid "Uassigned rows in the output with vehicle_id = -1." msgstr "" -#: ../../build/doc/release_notes.rst:138 +#: ../../build/doc/release_notes.rst:147 msgid "" "Modified travel_time result column to return travel time between current " "and last step." msgstr "" -#: ../../build/doc/release_notes.rst:139 +#: ../../build/doc/release_notes.rst:148 msgid "" "Added data jsonb field in jobs, shipments, vehicles, breaks as well as in" " the result columns." msgstr "" -#: ../../build/doc/release_notes.rst:140 +#: ../../build/doc/release_notes.rst:149 msgid "Added departure field and location_id field in the result columns." msgstr "" -#: ../../build/doc/release_notes.rst:143 +#: ../../build/doc/release_notes.rst:152 msgid "vrpRouting 0.2" msgstr "" -#: ../../build/doc/release_notes.rst:146 +#: ../../build/doc/release_notes.rst:155 msgid "New experimental functions" msgstr "" -#: ../../build/doc/release_notes.rst:156 +#: ../../build/doc/release_notes.rst:165 msgid "VRP" msgstr "" -#: ../../build/doc/release_notes.rst:158 +#: ../../build/doc/release_notes.rst:167 msgid "vrp_compatibleVehicles" msgstr "" -#: ../../build/doc/release_notes.rst:159 +#: ../../build/doc/release_notes.rst:168 msgid "vrp_optimize" msgstr "" -#: ../../build/doc/release_notes.rst:160 +#: ../../build/doc/release_notes.rst:169 msgid "vrp_pickDeliverAdd" msgstr "" -#: ../../build/doc/release_notes.rst:161 +#: ../../build/doc/release_notes.rst:170 msgid "vrp_pickDeliver" msgstr "" -#: ../../build/doc/release_notes.rst:162 +#: ../../build/doc/release_notes.rst:171 msgid "vrp_simulation" msgstr "" -#: ../../build/doc/release_notes.rst:163 +#: ../../build/doc/release_notes.rst:172 msgid "vrp_viewRoute" msgstr "" -#: ../../build/doc/release_notes.rst:166 +#: ../../build/doc/release_notes.rst:175 msgid "vrpRouting 0.1" msgstr "" -#: ../../build/doc/release_notes.rst:169 +#: ../../build/doc/release_notes.rst:178 msgid "Extraction tasks" msgstr "" -#: ../../build/doc/release_notes.rst:170 +#: ../../build/doc/release_notes.rst:179 msgid "Porting pgRouting's VRP functionality" msgstr "" -#: ../../build/doc/release_notes.rst:173 +#: ../../build/doc/release_notes.rst:182 msgid "New official functions" msgstr "" diff --git a/locale/pot/release_notes.pot b/locale/pot/release_notes.pot index 8eeae3f33..2066c94af 100644 --- a/locale/pot/release_notes.pot +++ b/locale/pot/release_notes.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: vrpRouting v0.4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-24 18:41+0000\n" +"POT-Creation-Date: 2024-07-29 23:53+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -56,43 +56,55 @@ msgstr "" msgid "vrpRouting 0.4.2 Release Notes" msgstr "" -#: ../../build/doc/release_notes.rst:45 +#: ../../build/doc/release_notes.rst:44 +msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 0.4.2 `_ on Github." +msgstr "" + +#: ../../build/doc/release_notes.rst:49 +msgid "Code reorganization" +msgstr "" + +#: ../../build/doc/release_notes.rst:50 +msgid "Renamed files to be compiled as C++ with .hpp & .cpp extensions" +msgstr "" + +#: ../../build/doc/release_notes.rst:54 msgid "Documentation queries" msgstr "" -#: ../../build/doc/release_notes.rst:46 +#: ../../build/doc/release_notes.rst:55 msgid "Renamed to extension `.pg`" msgstr "" -#: ../../build/doc/release_notes.rst:47 +#: ../../build/doc/release_notes.rst:56 msgid "Removed `doc-` and `doc-vrp_` suffixes on file names" msgstr "" -#: ../../build/doc/release_notes.rst:50 +#: ../../build/doc/release_notes.rst:59 msgid "vrpRouting 0.4.1 Release Notes" msgstr "" -#: ../../build/doc/release_notes.rst:52 +#: ../../build/doc/release_notes.rst:61 msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 0.4.1 `_ on Github." msgstr "" -#: ../../build/doc/release_notes.rst:58 +#: ../../build/doc/release_notes.rst:67 msgid "Modification on experimental functions" msgstr "" -#: ../../build/doc/release_notes.rst:59 +#: ../../build/doc/release_notes.rst:68 msgid "OR Tools" msgstr "" -#: ../../build/doc/release_notes.rst:61 +#: ../../build/doc/release_notes.rst:70 msgid "vrp_bin_packing" msgstr "" -#: ../../build/doc/release_notes.rst:62 +#: ../../build/doc/release_notes.rst:71 msgid "vrp_knapsack" msgstr "" -#: ../../build/doc/release_notes.rst:63 +#: ../../build/doc/release_notes.rst:72 msgid "vrp_multiple_knapsack" msgstr "" @@ -100,7 +112,7 @@ msgstr "" msgid "Support for or-tools v9.10.4067" msgstr "" -#: ../../build/doc/release_notes.rst:69 +#: ../../build/doc/release_notes.rst:78 msgid "vrp_oneDepot" msgstr "" @@ -112,17 +124,17 @@ msgstr "" msgid "Result columns changed" msgstr "" -#: ../../build/doc/release_notes.rst:76 +#: ../../build/doc/release_notes.rst:85 msgid "Removal of Boost on the build" msgstr "" -#: ../../build/doc/release_notes.rst:77 -#: ../../build/doc/release_notes.rst:175 +#: ../../build/doc/release_notes.rst:86 +#: ../../build/doc/release_notes.rst:184 msgid "vrp_full_version" msgstr "" -#: ../../build/doc/release_notes.rst:78 -#: ../../build/doc/release_notes.rst:174 +#: ../../build/doc/release_notes.rst:87 +#: ../../build/doc/release_notes.rst:183 msgid "vrp_version" msgstr "" @@ -130,201 +142,201 @@ msgstr "" msgid "Boost removed from the result columns" msgstr "" -#: ../../build/doc/release_notes.rst:85 +#: ../../build/doc/release_notes.rst:94 msgid "vrpRouting 0.4.0 Release Notes" msgstr "" -#: ../../build/doc/release_notes.rst:87 +#: ../../build/doc/release_notes.rst:96 msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 0.4.0 `_ on Github." msgstr "" -#: ../../build/doc/release_notes.rst:92 +#: ../../build/doc/release_notes.rst:101 msgid "Added support for VROOM 1.12.0 (`#34 `_)" msgstr "" -#: ../../build/doc/release_notes.rst:93 +#: ../../build/doc/release_notes.rst:102 msgid "No visible changes on user side with respect to signatures." msgstr "" -#: ../../build/doc/release_notes.rst:94 +#: ../../build/doc/release_notes.rst:103 msgid "Adjusted to VROOM v1.12.0 due to internal breaking changes:" msgstr "" -#: ../../build/doc/release_notes.rst:96 +#: ../../build/doc/release_notes.rst:105 msgid "Made changes according to new vroom::Input signature." msgstr "" -#: ../../build/doc/release_notes.rst:97 +#: ../../build/doc/release_notes.rst:106 msgid "CI changes to compile without routing support, with Position Independent Code." msgstr "" -#: ../../build/doc/release_notes.rst:98 +#: ../../build/doc/release_notes.rst:107 msgid "Removed support for VROOM 1.11.0" msgstr "" -#: ../../build/doc/release_notes.rst:101 +#: ../../build/doc/release_notes.rst:110 msgid "vrpRouting 0.3" msgstr "" -#: ../../build/doc/release_notes.rst:103 +#: ../../build/doc/release_notes.rst:112 msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 0.3.0 `_ on Github." msgstr "" -#: ../../build/doc/release_notes.rst:108 +#: ../../build/doc/release_notes.rst:117 msgid "Modification of experimental functions" msgstr "" -#: ../../build/doc/release_notes.rst:109 -#: ../../build/doc/release_notes.rst:147 +#: ../../build/doc/release_notes.rst:118 +#: ../../build/doc/release_notes.rst:156 msgid "VROOM" msgstr "" -#: ../../build/doc/release_notes.rst:111 -#: ../../build/doc/release_notes.rst:149 +#: ../../build/doc/release_notes.rst:120 +#: ../../build/doc/release_notes.rst:158 msgid "vrp_vroom" msgstr "" -#: ../../build/doc/release_notes.rst:112 -#: ../../build/doc/release_notes.rst:150 +#: ../../build/doc/release_notes.rst:121 +#: ../../build/doc/release_notes.rst:159 msgid "vrp_vroomJobs" msgstr "" -#: ../../build/doc/release_notes.rst:113 -#: ../../build/doc/release_notes.rst:151 +#: ../../build/doc/release_notes.rst:122 +#: ../../build/doc/release_notes.rst:160 msgid "vrp_vroomShipments" msgstr "" -#: ../../build/doc/release_notes.rst:114 -#: ../../build/doc/release_notes.rst:152 +#: ../../build/doc/release_notes.rst:123 +#: ../../build/doc/release_notes.rst:161 msgid "vrp_vroomPlain" msgstr "" -#: ../../build/doc/release_notes.rst:115 -#: ../../build/doc/release_notes.rst:153 +#: ../../build/doc/release_notes.rst:124 +#: ../../build/doc/release_notes.rst:162 msgid "vrp_vroomJobsPlain" msgstr "" -#: ../../build/doc/release_notes.rst:116 -#: ../../build/doc/release_notes.rst:154 +#: ../../build/doc/release_notes.rst:125 +#: ../../build/doc/release_notes.rst:163 msgid "vrp_vroomShipmentsPlain" msgstr "" -#: ../../build/doc/release_notes.rst:119 +#: ../../build/doc/release_notes.rst:128 msgid "Added support for VROOM 1.11.0 (`#24 `_)" msgstr "" -#: ../../build/doc/release_notes.rst:120 +#: ../../build/doc/release_notes.rst:129 msgid "Added setup time in jobs and shipments to refine service time modeling." msgstr "" -#: ../../build/doc/release_notes.rst:121 +#: ../../build/doc/release_notes.rst:130 msgid "Added support for custom cost matrices, along with the duration matrix." msgstr "" -#: ../../build/doc/release_notes.rst:123 +#: ../../build/doc/release_notes.rst:132 msgid "Using start_id, end_id, duration, cost as matrix table columns." msgstr "" -#: ../../build/doc/release_notes.rst:124 +#: ../../build/doc/release_notes.rst:133 msgid "Added timeout and exploration_level parameters to vroom-category functions." msgstr "" -#: ../../build/doc/release_notes.rst:125 +#: ../../build/doc/release_notes.rst:134 msgid "Added max_tasks column in vehicles." msgstr "" -#: ../../build/doc/release_notes.rst:126 +#: ../../build/doc/release_notes.rst:135 msgid "Added tests for empty skills arrays." msgstr "" -#: ../../build/doc/release_notes.rst:127 +#: ../../build/doc/release_notes.rst:136 msgid "Added custom scaling logic for speed_factor." msgstr "" -#: ../../build/doc/release_notes.rst:128 +#: ../../build/doc/release_notes.rst:137 msgid "Modified parameter names to make the naming consistent." msgstr "" -#: ../../build/doc/release_notes.rst:131 +#: ../../build/doc/release_notes.rst:140 msgid "Fixes" msgstr "" -#: ../../build/doc/release_notes.rst:132 +#: ../../build/doc/release_notes.rst:141 msgid "Honor client cancel requests for vroom-category functions." msgstr "" -#: ../../build/doc/release_notes.rst:133 +#: ../../build/doc/release_notes.rst:142 msgid "Added more information in the inner query and result columns of VROOM category functions (`#26 `_, `#27 `_):" msgstr "" -#: ../../build/doc/release_notes.rst:136 +#: ../../build/doc/release_notes.rst:145 msgid "Summary row in the output, for each vehicle and for the complete problem." msgstr "" -#: ../../build/doc/release_notes.rst:137 +#: ../../build/doc/release_notes.rst:146 msgid "Uassigned rows in the output with vehicle_id = -1." msgstr "" -#: ../../build/doc/release_notes.rst:138 +#: ../../build/doc/release_notes.rst:147 msgid "Modified travel_time result column to return travel time between current and last step." msgstr "" -#: ../../build/doc/release_notes.rst:139 +#: ../../build/doc/release_notes.rst:148 msgid "Added data jsonb field in jobs, shipments, vehicles, breaks as well as in the result columns." msgstr "" -#: ../../build/doc/release_notes.rst:140 +#: ../../build/doc/release_notes.rst:149 msgid "Added departure field and location_id field in the result columns." msgstr "" -#: ../../build/doc/release_notes.rst:143 +#: ../../build/doc/release_notes.rst:152 msgid "vrpRouting 0.2" msgstr "" -#: ../../build/doc/release_notes.rst:146 +#: ../../build/doc/release_notes.rst:155 msgid "New experimental functions" msgstr "" -#: ../../build/doc/release_notes.rst:156 +#: ../../build/doc/release_notes.rst:165 msgid "VRP" msgstr "" -#: ../../build/doc/release_notes.rst:158 +#: ../../build/doc/release_notes.rst:167 msgid "vrp_compatibleVehicles" msgstr "" -#: ../../build/doc/release_notes.rst:159 +#: ../../build/doc/release_notes.rst:168 msgid "vrp_optimize" msgstr "" -#: ../../build/doc/release_notes.rst:160 +#: ../../build/doc/release_notes.rst:169 msgid "vrp_pickDeliverAdd" msgstr "" -#: ../../build/doc/release_notes.rst:161 +#: ../../build/doc/release_notes.rst:170 msgid "vrp_pickDeliver" msgstr "" -#: ../../build/doc/release_notes.rst:162 +#: ../../build/doc/release_notes.rst:171 msgid "vrp_simulation" msgstr "" -#: ../../build/doc/release_notes.rst:163 +#: ../../build/doc/release_notes.rst:172 msgid "vrp_viewRoute" msgstr "" -#: ../../build/doc/release_notes.rst:166 +#: ../../build/doc/release_notes.rst:175 msgid "vrpRouting 0.1" msgstr "" -#: ../../build/doc/release_notes.rst:169 +#: ../../build/doc/release_notes.rst:178 msgid "Extraction tasks" msgstr "" -#: ../../build/doc/release_notes.rst:170 +#: ../../build/doc/release_notes.rst:179 msgid "Porting pgRouting's VRP functionality" msgstr "" -#: ../../build/doc/release_notes.rst:173 +#: ../../build/doc/release_notes.rst:182 msgid "New official functions" msgstr ""