More code improvements

include/c_common/vroom/breaks_input.h

@@ -30,16 +30,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_C_COMMON_VROOM_BREAKS_INPUT_H_
 #pragma once
 
+#include <stdbool.h>
 #include <stddef.h>
 
-#include "cpp_common/get_check_data.hpp"
-#include "cpp_common/info.hpp"
-#include "cpp_common/vroom_break_t.hpp"
-
-#ifdef PROFILE
-#include "c_common/debug_macro.h"
-#include "c_common/time_msg.h"
-#endif
+typedef struct Vroom_break_t Vroom_break_t;
 
 /** @brief Reads the VROOM breaks */
 void

include/c_common/vroom/jobs_input.h

@@ -30,16 +30,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_C_COMMON_VROOM_JOBS_INPUT_H_
 #pragma once
 
+#include <stdbool.h>
 #include <stddef.h>
 
-#include "cpp_common/get_check_data.hpp"
-#include "cpp_common/info.hpp"
-#include "cpp_common/vroom_job_t.hpp"
-
-#ifdef PROFILE
-#include "c_common/debug_macro.h"
-#include "c_common/time_msg.h"
-#endif
+typedef struct Vroom_job_t Vroom_job_t;
 
 /** @brief Reads the VROOM jobs */
 void

include/c_common/vroom/matrix_input.h

@@ -30,16 +30,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_C_COMMON_VROOM_MATRIX_INPUT_H_
 #pragma once
 
+#include <stdbool.h>
 #include <stddef.h>
 
-#include "cpp_common/get_check_data.hpp"
-#include "cpp_common/info.hpp"
-#include "cpp_common/vroom_matrix_t.hpp"
-
-#ifdef PROFILE
-#include "c_common/debug_macro.h"
-#include "c_common/time_msg.h"
-#endif
+typedef struct Vroom_matrix_t Vroom_matrix_t;
 
 /** @brief Reads the VROOM matrix */
 void

include/c_common/vroom/shipments_input.h

@@ -30,16 +30,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_C_COMMON_VROOM_SHIPMENTS_INPUT_H_
 #pragma once
 
+#include <stdbool.h>
 #include <stddef.h>
 
-#include "cpp_common/get_check_data.hpp"
-#include "cpp_common/info.hpp"
-#include "cpp_common/vroom_shipment_t.hpp"
-
-#ifdef PROFILE
-#include "c_common/debug_macro.h"
-#include "c_common/time_msg.h"
-#endif
+typedef struct Vroom_shipment_t Vroom_shipment_t;
 
 /** @brief Reads the VROOM shipments */
 void

include/c_common/vroom/time_windows_input.h

@@ -33,14 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "cpp_common/get_check_data.hpp"
-#include "cpp_common/info.hpp"
-#include "cpp_common/vroom_time_window_t.hpp"
-
-#ifdef PROFILE
-#include "c_common/debug_macro.h"
-#include "c_common/time_msg.h"
-#endif
+typedef struct Vroom_time_window_t Vroom_time_window_t;
 
 /** @brief Reads the VROOM time windows */
 void

include/c_common/vroom/vehicles_input.h

@@ -30,16 +30,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_C_COMMON_VROOM_VEHICLES_INPUT_H_
 #pragma once
 
+#include <stdbool.h>
 #include <stddef.h>
 
-#include "cpp_common/get_check_data.hpp"
-#include "cpp_common/info.hpp"
-#include "cpp_common/vroom_vehicle_t.hpp"
-
-#ifdef PROFILE
-#include "c_common/debug_macro.h"
-#include "c_common/time_msg.h"
-#endif
+typedef struct Vroom_vehicle_t Vroom_vehicle_t;
 
 /** @brief Reads the VROOM vehicles */
 void

include/c_types/short_vehicle_rt.h

@@ -1,5 +1,5 @@
 /*PGR-GNU*****************************************************************
-File: Short_vehiclei_rt.h
+File: Short_vehicle_rt.h
 
 Copyright (c) 2015 Celia Virginia Vergara Castillo
 Mail: vicky_vergara@hotmail.com

include/c_types/typedefs.h

@@ -47,19 +47,6 @@ using Priority = uint32_t;
 using Distance = uint32_t;
 using Skill = uint32_t;
 using StepType = int32_t;
-using Orders_t = struct Orders_t;
-using Vehicle_t = struct Vehicle_t;
-using Matrix_cell_t = struct Matrix_cell_t;
-using Time_multipliers_t = struct Time_multipliers_t;
-using Solution_rt = struct Solution_rt;
-using Short_vehicle_rt = struct Short_vehicle_rt;
-using Vroom_job_t = struct Vroom_job_t;
-using Vroom_shipment_t = struct Vroom_shipment_t;
-using Vroom_vehicle_t = struct Vroom_vehicle_t;
-using Vroom_matrix_t = struct Vroom_matrix_t;
-using Vroom_break_t = struct Vroom_break_t;
-using Vroom_time_window_t = struct Vroom_time_window_t;
-using Vroom_rt = struct Vroom_rt;
 /*
  * Index on a container
  */
@@ -84,19 +71,6 @@ typedef uint32_t Priority;
 typedef uint32_t Distance;
 typedef uint32_t Skill;
 typedef int32_t StepType;
-typedef struct Orders_t Orders_t;
-typedef struct Vehicle_t Vehicle_t;
-typedef struct Matrix_cell_t Matrix_cell_t;
-typedef struct Time_multipliers_t Time_multipliers_t;
-typedef struct Solution_rt Solution_rt;
-typedef struct Short_vehicle_rt Short_vehicle_rt;
-typedef struct Vroom_job_t Vroom_job_t;
-typedef struct Vroom_shipment_t Vroom_shipment_t;
-typedef struct Vroom_vehicle_t Vroom_vehicle_t;
-typedef struct Vroom_matrix_t Vroom_matrix_t;
-typedef struct Vroom_break_t Vroom_break_t;
-typedef struct Vroom_time_window_t Vroom_time_window_t;
-typedef struct Vroom_rt Vroom_rt;
 #endif
 
 /*************************************************************************/

include/cpp_common/vroom_matrix.hpp

@@ -41,7 +41,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "cpp_common/identifiers.hpp"
 
 
-typedef struct Matrix_cell_t Matrix_cell_t;
+using Vroom_matrix_t = struct Vroom_matrix_t;
+using Matrix_cell_t = struct Matrix_cell_t;
 
 namespace vrprouting {
 namespace vroom {

include/drivers/optimize_driver.h

@@ -32,7 +32,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_DRIVERS_OPTIMIZE_DRIVER_H_
 #pragma once
 
-#include "c_types/typedefs.h"
+#ifdef __cplusplus
+#include <cstddef>
+#include <cstdint>
+using Orders_t = struct Orders_t;
+using Vehicle_t = struct Vehicle_t;
+using Matrix_cell_t = struct Matrix_cell_t;
+using Time_multipliers_t = struct Time_multipliers_t;
+using Short_vehicle_rt = struct Short_vehicle_rt;
+#else
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+typedef struct Orders_t Orders_t;
+typedef struct Vehicle_t Vehicle_t;
+typedef struct Matrix_cell_t Matrix_cell_t;
+typedef struct Time_multipliers_t Time_multipliers_t;
+typedef struct Short_vehicle_rt Short_vehicle_rt;
+#endif
 
 #ifdef __cplusplus
 extern "C" {

include/drivers/pgr_pickDeliverEuclidean_driver.h

@@ -30,16 +30,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_DRIVERS_PGR_PICKDELIVEREUCLIDEAN_DRIVER_H_
 #pragma once
 
-/* for size-t */
 #ifdef __cplusplus
-#   include <cstddef>
+#include <cstddef>
+#include <cstdint>
+using Orders_t = struct Orders_t;
+using Vehicle_t = struct Vehicle_t;
+using Solution_rt = struct Solution_rt;
 #else
-#   include <stddef.h>
-#endif
-
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
 typedef struct Orders_t Orders_t;
-typedef struct Solution_rt Solution_rt;
 typedef struct Vehicle_t Vehicle_t;
+typedef struct Solution_rt Solution_rt;
+#endif
+
 
 #ifdef __cplusplus
 extern "C" {

include/drivers/pgr_pickDeliver_driver.h

@@ -32,18 +32,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_DRIVERS_PGR_PICKDELIVER_DRIVER_H_
 #pragma once
 
-/* for size-t */
 #ifdef __cplusplus
-#   include <cstddef>
+#include <cstddef>
+#include <cstdint>
+using Orders_t = struct Orders_t;
+using Vehicle_t = struct Vehicle_t;
+using Matrix_cell_t = struct Matrix_cell_t;
+using Solution_rt = struct Solution_rt;
 #else
-#   include <stddef.h>
-#endif
-
-#include "cpp_common/vehicle_t.hpp"
-#include "cpp_common/matrix_cell_t.hpp"
-
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
 typedef struct Orders_t Orders_t;
+typedef struct Vehicle_t Vehicle_t;
+typedef struct Matrix_cell_t Matrix_cell_t;
 typedef struct Solution_rt Solution_rt;
+#endif
 
 #ifdef __cplusplus
 extern "C" {

include/drivers/pickDeliver_driver.h

@@ -32,7 +32,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_DRIVERS_PICKDELIVER_DRIVER_H_
 #pragma once
 
-#include "c_types/typedefs.h"
+#ifdef __cplusplus
+#include <cstddef>
+#include <cstdint>
+using Orders_t = struct Orders_t;
+using Vehicle_t = struct Vehicle_t;
+using Matrix_cell_t = struct Matrix_cell_t;
+using Time_multipliers_t = struct Time_multipliers_t;
+using Solution_rt = struct Solution_rt;
+#else
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+typedef struct Orders_t Orders_t;
+typedef struct Vehicle_t Vehicle_t;
+typedef struct Matrix_cell_t Matrix_cell_t;
+typedef struct Time_multipliers_t Time_multipliers_t;
+typedef struct Solution_rt Solution_rt;
+#endif
 
 #ifdef __cplusplus
 extern "C" {

include/drivers/vroom_driver.h

@@ -30,7 +30,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_DRIVERS_VROOM_DRIVER_H_
 #pragma once
 
-#include "c_types/typedefs.h"
+#ifdef __cplusplus
+#include <cstddef>
+#include <cstdint>
+using Vroom_job_t = struct Vroom_job_t;
+using Vroom_time_window_t = struct Vroom_time_window_t;
+using Vroom_shipment_t = struct Vroom_shipment_t;
+using Vroom_vehicle_t = struct Vroom_vehicle_t;
+using Vroom_break_t = struct Vroom_break_t;
+using Vroom_matrix_t = struct Vroom_matrix_t;
+using Vroom_rt = struct Vroom_rt;
+#else
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+typedef struct Vroom_job_t Vroom_job_t;
+typedef struct Vroom_time_window_t Vroom_time_window_t;
+typedef struct Vroom_shipment_t Vroom_shipment_t;
+typedef struct Vroom_vehicle_t Vroom_vehicle_t;
+typedef struct Vroom_break_t Vroom_break_t;
+typedef struct Vroom_matrix_t Vroom_matrix_t;
+typedef struct Vroom_rt Vroom_rt;
+#endif
 
 #ifdef __cplusplus
 extern "C" {

include/problem/pickDeliver.hpp

@@ -57,14 +57,14 @@ class PickDeliver {
     PickDeliver(
         Orders_t* p_orders, size_t p_orders_size,
         Vehicle_t* p_vehicles, size_t p_vehicles_size,
-        const Matrix &p_cost_matrix);
+        const Matrix &);
 
     /** @brief Override stops constructor */
     PickDeliver(
         Orders_t* p_orders, size_t p_orders_size,
         Vehicle_t* p_vehicles, size_t p_vehicles_size,
-        std::vector<Short_vehicle> new_stops,
-        const Matrix &p_cost_matrix);
+        std::vector<Short_vehicle>,
+        const Matrix &);
 
     virtual ~PickDeliver() = default;
 

include/problem/tw_node.hpp

@@ -34,6 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "cpp_common/identifier.hpp"
 #include "problem/node_types.hpp"
 
+using Orders_t = struct Orders_t;
+using Vehicle_t = struct Vehicle_t;
 
 namespace vrprouting {
 namespace problem {

include/vroom/vroom.hpp

@@ -43,6 +43,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "cpp_common/vroom_matrix.hpp"
 #include "cpp_common/messages.hpp"
 
+using Vroom_break_t = struct Vroom_break_t;
+using Vroom_job_t = struct Vroom_job_t;
+using Vroom_shipment_t = struct Vroom_shipment_t;
+using Vroom_time_window_t = struct Vroom_time_window_t;
+using Vroom_vehicle_t = struct Vroom_vehicle_t;
 using Vroom_rt = struct Vroom_rt;
 
 namespace vrprouting {
@@ -75,7 +80,7 @@ class Vroom : public vrprouting::Messages {
     void add_matrix(const vrprouting::vroom::Matrix&);
 
     /** @brief solves the vroom problem */
-    std::vector<Vroom_rt> solve(int32_t, int32_t, int32_t);
+    std::vector<Vroom_rt> solve(int32_t, int32_t, int64_t);
 
  private:
     std::vector<::vroom::TimeWindow> get_vroom_time_windows(const std::vector<Vroom_time_window_t>&) const;

src/common/e_report.c

@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  * ~~~~{.c}
  * std::ostringstream log;
  * log << "the message";
- * *log_msg = to_pg_msg(log.str().c_str());
+ * *log_msg = to_pg_msg(log.str());
  * ~~~~
  *
  * Then on the C side

src/common/vroom/breaks_input.c

@@ -28,6 +28,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "c_common/vroom/breaks_input.h"
 
+#include "cpp_common/vroom_break_t.hpp"
+#include "cpp_common/info.hpp"
+
+#include "c_common/debug_macro.h"
+#include "cpp_common/get_check_data.hpp"
+
 static
 void fetch_breaks(
     HeapTuple *tuple,

src/common/vroom/jobs_input.c

@@ -28,6 +28,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "c_common/vroom/jobs_input.h"
 
+#include "cpp_common/vroom_job_t.hpp"
+#include "cpp_common/info.hpp"
+
+#include "c_common/debug_macro.h"
+#include "cpp_common/get_check_data.hpp"
+
 static
 void fetch_jobs(
     HeapTuple *tuple,