Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3273df0
(include/initialsol) *.h -> *.hpp
cvvergara Jul 24, 2024
6e5c671
Adjusting code to header renames on include/initialsol
cvvergara Jul 28, 2024
41a3776
(include/drivers) subdir/*.h -> *.h
cvvergara Jul 24, 2024
bc228f7
Adjusting code to header renames on include/drivers
cvvergara Jul 28, 2024
4d79f7b
(include/cpp_common) *.h -> *.hpp
cvvergara Jul 28, 2024
bf4aea4
Adjusting code to header renames on include/cpp_common
cvvergara Jul 28, 2024
b2e3308
(include/problem) *.h -> *.hpp
cvvergara Jul 24, 2024
a842cdb
Adjusting code to header renames on include/problem
cvvergara Jul 28, 2024
27b5040
Moving include/c_types/*.h include/cpp_common/*.hpp
cvvergara Jul 28, 2024
11aa145
Adjusting code to header moved to include/cpp_common
cvvergara Jul 28, 2024
24177ff
(include/optimizers) *.h -> *.hpp
cvvergara Jul 28, 2024
2862d51
Adjusting code to header renames on include/optimizers
cvvergara Jul 28, 2024
641efb8
include/c_common/*.h -> include/cpp_common/*.hpp
cvvergara Jul 28, 2024
2111ec0
(include/cpp_common) fixing file guards
cvvergara Jul 28, 2024
284e246
Adjusting code for files moved to include/cpp_common
cvvergara Jul 28, 2024
b348f61
(src/cpp_common) removing pgr prefix to file
cvvergara Jul 28, 2024
e521231
(src/cpp_common) Adjusting the build
cvvergara Jul 28, 2024
7b6d3d9
../common/pgr_alloc.cpp -> alloc.cpp
cvvergara Jul 28, 2024
eb3dc8a
(src/cpp_common & src/common) Adjusting the build
cvvergara Jul 28, 2024
e1f86bc
include/cpp_common/vrp_vroom_problem.hpp -> include/vroom/vroom.hpp
cvvergara Jul 29, 2024
c2f7e88
Adjusting code to include file rename
cvvergara Jul 29, 2024
7fc2123
src/common/get_check_data.c -> src/cpp_common/get_check_data.c
cvvergara Jul 29, 2024
0ada70c
Adjusting build to file rename
cvvergara Jul 29, 2024
7d8a4a1
nclude/c_types/vroom/vroom_rt.h -> include/c_types/vroom_rt.h and adj…
cvvergara Jul 29, 2024
f0b1411
Fixing file names
cvvergara Jul 29, 2024
3c08924
(src/pgr_pickDeliver) matching driver name
cvvergara Jul 29, 2024
c3152a4
Updating release notes and NEWS
cvvergara Jul 29, 2024
fa80ff3
Update locale: commit for hash c3152a4
github-actions[bot] Jul 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
9 changes: 9 additions & 0 deletions doc/general/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/pgRouting/vrprouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%200.4.2%22>`_
on Github.

.. rubric:: Code reorganization

* Renamed files to be compiled as C++ with .hpp & .cpp extensions


.. rubric:: Documentation queries

* Renamed to extension `.pg`
Expand Down
6 changes: 3 additions & 3 deletions include/c_common/vroom/breaks_input.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include <stddef.h>

#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/get_check_data.hpp"
#include "cpp_common/info.hpp"
#include "cpp_common/vroom_break_t.hpp"

#ifdef PROFILE
#include "c_common/debug_macro.h"
Expand Down
6 changes: 3 additions & 3 deletions include/c_common/vroom/jobs_input.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include <stddef.h>

#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/get_check_data.hpp"
#include "cpp_common/info.hpp"
#include "cpp_common/vroom_job_t.hpp"

#ifdef PROFILE
#include "c_common/debug_macro.h"
Expand Down
6 changes: 3 additions & 3 deletions include/c_common/vroom/matrix_input.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include <stddef.h>

#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/get_check_data.hpp"
#include "cpp_common/info.hpp"
#include "cpp_common/vroom_matrix_t.hpp"

#ifdef PROFILE
#include "c_common/debug_macro.h"
Expand Down
6 changes: 3 additions & 3 deletions include/c_common/vroom/shipments_input.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include <stddef.h>

#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/get_check_data.hpp"
#include "cpp_common/info.hpp"
#include "cpp_common/vroom_shipment_t.hpp"

#ifdef PROFILE
#include "c_common/debug_macro.h"
Expand Down
6 changes: 3 additions & 3 deletions include/c_common/vroom/time_windows_input.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <stdbool.h>
#include <stddef.h>

#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/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"
Expand Down
6 changes: 3 additions & 3 deletions include/c_common/vroom/vehicles_input.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include <stddef.h>

#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/get_check_data.hpp"
#include "cpp_common/info.hpp"
#include "cpp_common/vroom_vehicle_t.hpp"

#ifdef PROFILE
#include "c_common/debug_macro.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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_
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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


Expand Down Expand Up @@ -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_
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*PGR-GNU*****************************************************************

FILE: pgr_assert
FILE: assert.hpp

Copyright 2015~ Vicky Vergara <vicky_vergara@hotmail.com>
Copyright 2014 Stephen Woodbridge <woodbri@imaptools.com>
Expand All @@ -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_ASSERT_HPP_
#define INCLUDE_CPP_COMMON_ASSERT_HPP_
#pragma once

#include <string>
Expand Down Expand Up @@ -68,7 +68,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* Example:
* @code
#include <iostream>
#include "pgr_assert.h"
#include "assert.h"

int main() {

Expand Down Expand Up @@ -147,4 +147,4 @@ class AssertFailedException : public std::exception {
virtual ~AssertFailedException() throw() {}
};

#endif // INCLUDE_CPP_COMMON_PGR_ASSERT_H_
#endif // INCLUDE_CPP_COMMON_ASSERT_HPP_
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*PGR-GNU*****************************************************************

FILE: matrix.h
FILE: base_matrix.hpp

Copyright (c) 2015 pgRouting developers
Mail: project@pgrouting.org
Expand All @@ -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 <iosfwd>
Expand Down Expand Up @@ -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_
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -22,12 +22,12 @@ 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"
#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). */
Expand Down Expand Up @@ -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_
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*PGR-GNU*****************************************************************
*

FILE: identifier.hpp

Copyright (c) 2017 Celia Virginia Vergara Castillo
vicky_vergara@hotmail.com
Expand All @@ -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)
Expand Down Expand Up @@ -89,4 +90,4 @@ class Identifier {

} // namespace vrprouting

#endif // INCLUDE_CPP_COMMON_IDENTIFIER_H_
#endif // INCLUDE_CPP_COMMON_IDENTIFIER_HPP_
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 */
Expand Down Expand Up @@ -59,4 +59,4 @@ struct {
} Column_info_t;


#endif // INCLUDE_C_TYPES_COLUMN_INFO_T_H_
#endif // INCLUDE_CPP_COMMON_INFO_HPP_
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/*PGR-GNU*****************************************************************

FILE: interruption.hpp

Copyright (c) 2015 pgRouting developers
Mail: project@pgrouting.org

Expand All @@ -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__
Expand Down Expand Up @@ -83,4 +85,4 @@ extern void pgwin32_dispatch_queued_signals(void);
#endif
}

#endif // INCLUDE_CPP_COMMON_INTERRUPTION_H_
#endif // INCLUDE_CPP_COMMON_INTERRUPTION_HPP_
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand All @@ -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_
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*PGR-GNU*****************************************************************

FILE: pgr_messages.h
FILE: messages.hpp

Copyright (c) 2015 pgRouting developers
Mail: project@pgrouting.org
Expand All @@ -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_MESSAGES_HPP_
#define INCLUDE_CPP_COMMON_MESSAGES_HPP_
#pragma once


Expand Down Expand Up @@ -109,4 +109,4 @@ class Pgr_messages {

} // namespace vrprouting

#endif // INCLUDE_CPP_COMMON_PGR_MESSAGES_H_
#endif // INCLUDE_CPP_COMMON_MESSAGES_HPP_
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"

Expand Down Expand Up @@ -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_
Loading