Skip to content

Fix Issue 2614 move h to hpp #2615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

## pgRouting 3.7


.. current

### pgRouting 3.7.0 Release Notes

To see all issues & pull requests closed by this release see the [Git closed
Expand Down Expand Up @@ -36,6 +39,9 @@ milestone for 3.7.0
cleanup
* [#2607](https://github.com/pgRouting/pgrouting/pull/2607) Read postgresql
data on C++
* [#2614](https://github.com/pgRouting/pgrouting/pull/2614) Clang tidy does
not work


**Others**

Expand Down
4 changes: 1 addition & 3 deletions doc/src/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,8 @@ Available Functions but not official pgRouting functions
:doc:`release_notes`
===============================================================================

Current release
-------------------------------------------------------------------------------
.. include:: release_notes.rst
:start-after: 0%22>`_
:start-after: current
:end-before: pgRouting 3.6

All releases
Expand Down
9 changes: 9 additions & 0 deletions doc/src/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ pgRouting 3
pgRouting 3.7
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

.. contents:: Contents
:local:
:depth: 1

.. current

pgRouting 3.7.0 Release Notes
-------------------------------------------------------------------------------

Expand Down Expand Up @@ -62,6 +68,9 @@ milestone for 3.7.0
cleanup
* `#2607 <https://github.com/pgRouting/pgrouting/pull/2607>`__ Read postgresql
data on C++
* `#2614 <https://github.com/pgRouting/pgrouting/pull/2614>`__ Clang tidy does
not work


.. rubric:: Others

Expand Down
2 changes: 1 addition & 1 deletion include/allpairs/pgr_allpairs.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*PGR-GNU*****************************************************************
File: pgr_allpairs.hpp
File: pgr_allpairs.hpp

Copyright (c) 2015 pgRouting developers
Mail: [email protected]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*PGR-GNU*****************************************************************
file: pgr_alphaShape.h
File: pgr_alphaShape.hpp

Copyright (c) 2018 pgRouting developers
Mail: [email protected]
Expand All @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
********************************************************************PGR-GNU*/
/*! @file */

#ifndef INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_H_
#define INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_H_
#ifndef INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_
#define INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_
#pragma once

#ifndef __cplusplus
Expand All @@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <set>
#include <iosfwd>

#include "c_types/edge_xy_t.h"
#include "cpp_common/pgr_messages.h"
#include "cpp_common/edge_xy_t.hpp"
#include "cpp_common/pgr_messages.hpp"

#include "cpp_common/pgr_base_graph.hpp"
#include "cpp_common/bline.hpp"
Expand Down Expand Up @@ -99,4 +99,4 @@ class Pgr_alphaShape : public Pgr_messages {
} // namespace alphashape
} // namespace pgrouting

#endif // INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_H_
#endif // INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_
1 change: 0 additions & 1 deletion include/astar/astar.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/*PGR-GNU*****************************************************************

File: astar.hpp

Copyright (c) 2015 pgRouting developers
Expand Down
2 changes: 1 addition & 1 deletion include/bdAstar/bdAstar.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*PGR-GNU*****************************************************************
File: pgr_bdAstar.hpp
File: bdAstar.hpp

Copyright (c) 2015 pgRouting developers
Mail: [email protected]
Expand Down
1 change: 0 additions & 1 deletion include/bdDijkstra/pgr_bdDijkstra.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/*PGR-GNU*****************************************************************

File: pgr_bdDijkstra.hpp

Copyright (c) 2015 pgRouting developers
Expand Down
2 changes: 1 addition & 1 deletion include/bellman_ford/pgr_bellman_ford.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <boost/config.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/bellman_ford_shortest_paths.hpp>
#include "cpp_common/pgr_messages.h"
#include "cpp_common/pgr_messages.hpp"
#include "cpp_common/basePath_SSEC.hpp"
#include "cpp_common/pgr_base_graph.hpp"
#include "cpp_common/interruption.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include "cpp_common/basePath_SSEC.hpp"
#include "cpp_common/pgr_base_graph.hpp"
#include "cpp_common/pgr_assert.h"
#include "cpp_common/pgr_assert.hpp"

#include "c_types/ii_t_rt.h"

Expand Down
1 change: 0 additions & 1 deletion include/c_common/debug_macro.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/*PGR-GNU*****************************************************************

File: debug_macro.h

Copyright (c) 2015 pgRouting developers
Expand Down
3 changes: 1 addition & 2 deletions include/c_common/time_msg.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/*PGR-GNU*****************************************************************

FILE: time_msg.h
File: time_msg.h

Copyright (c) 2015 pgRouting developers
Mail: [email protected]
Expand Down
4 changes: 2 additions & 2 deletions include/c_common/trsp_pgget.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ extern "C" {
#include "cpp_common/undefPostgresDefine.hpp"

#ifdef __cplusplus
using Edge_t = struct Edge_t;
using Edge_t = struct Edge_rt;
#else
typedef struct Edge_t Edge_t;
typedef struct Edge_rt Edge_t;
#endif


Expand Down
48 changes: 48 additions & 0 deletions include/c_types/edge_rt.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*PGR-GNU*****************************************************************
File: edge_rt.h

Copyright (c) 2017 pgRouting developers
Mail: [email protected]

Copyright (c) 2017 Celia Virginia Vergara Castillo
Mail: [email protected]

------

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

********************************************************************PGR-GNU*/
/*! @file */

#ifndef INCLUDE_C_TYPES_EDGE_RT_H_
#define INCLUDE_C_TYPES_EDGE_RT_H_
#pragma once

/* for int64_t */
#ifdef __cplusplus
# include <cstdint>
#else
# include <stdint.h>
#endif

struct Edge_rt{
int64_t id;
int64_t source;
int64_t target;
double cost;
double reverse_cost;
};

#endif // INCLUDE_C_TYPES_EDGE_RT_H_
2 changes: 1 addition & 1 deletion include/c_types/routes_t.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*PGR-GNU*****************************************************************
File: pgr_types.h
File: routes_t.h

Copyright (c) 2015 pgRouting developers
Mail: [email protected]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*PGR-GNU*****************************************************************
File: general_vehicle_orders_t.h
File: schedule_rt.h

Copyright (c) 2017 pgRouting developers
Mail: [email protected]
Expand All @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
********************************************************************PGR-GNU*/
/*! @file */

#ifndef INCLUDE_C_TYPES_PICKDELIVER_SCHEDULE_RT_H_
#define INCLUDE_C_TYPES_PICKDELIVER_SCHEDULE_RT_H_
#ifndef INCLUDE_C_TYPES_SCHEDULE_RT_H_
#define INCLUDE_C_TYPES_SCHEDULE_RT_H_
#pragma once

/* for int64_t */
Expand Down Expand Up @@ -66,4 +66,4 @@ struct Schedule_rt {

/*************************************************************************/

#endif // INCLUDE_C_TYPES_PICKDELIVER_SCHEDULE_RT_H_
#endif // INCLUDE_C_TYPES_SCHEDULE_RT_H_
2 changes: 1 addition & 1 deletion include/c_types/stoerWagner_t.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*PGR-GNU*****************************************************************
File: pgr_stoerWagner_t.h
File: stoerWagner_t.h

Copyright (c) 2015 Aditya Pratap Singh
Mail: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion include/c_types/transitiveClosure_rt.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*PGR-GNU*****************************************************************
File: contracted_rt.h
File: transitiveClosure_rt.h

Copyright (c) 2017 pgRouting developers
Mail: [email protected]
Expand Down
5 changes: 3 additions & 2 deletions include/chinese/pgr_chinesePostman.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*PGR-GNU*****************************************************************
File: pgr_chinesePostman.hpp

Copyright (c) 2015 pgRouting developers
Mail: [email protected]
Expand Down Expand Up @@ -37,9 +38,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include "max_flow/pgr_minCostMaxFlow.hpp"
#include "c_types/path_rt.h"
#include "c_types/edge_t.h"
#include "cpp_common/edge_t.hpp"
#include "c_types/flow_t.h"
#include "cpp_common/pgr_assert.h"
#include "cpp_common/pgr_assert.hpp"
#include "cpp_common/identifiers.hpp"


Expand Down
3 changes: 2 additions & 1 deletion include/circuits/hawickcircuits.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*PGR-GNU*****************************************************************
File: hawickcircuits.hpp

Copyright (c) 2022 pgRouting developers
Mail: [email protected]
Expand Down Expand Up @@ -39,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "cpp_common/basePath_SSEC.hpp"
#include "cpp_common/pgr_base_graph.hpp"
#include "cpp_common/interruption.hpp"
#include "cpp_common/pgr_assert.h"
#include "cpp_common/pgr_assert.hpp"
#include "c_types/circuits_rt.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion include/coloring/pgr_bipartite_driver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <boost/graph/bipartite.hpp>

#include "cpp_common/pgr_base_graph.hpp"
#include "cpp_common/pgr_messages.h"
#include "cpp_common/pgr_messages.hpp"
#include "cpp_common/interruption.hpp"
typedef struct II_t_rt II_t_rt;

Expand Down
6 changes: 3 additions & 3 deletions include/coloring/pgr_edgeColoring.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <boost/config.hpp>
#include <boost/graph/adjacency_list.hpp>

#include "c_types/edge_t.h"
#include "cpp_common/edge_t.hpp"
#include "c_types/ii_t_rt.h"
#include "cpp_common/pgr_assert.h"
#include "cpp_common/pgr_messages.h"
#include "cpp_common/pgr_assert.hpp"
#include "cpp_common/pgr_messages.hpp"

namespace pgrouting {
namespace functions {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*PGR-GNU*****************************************************************
File: componentsResult.hpp

Copyright (c) 2015 pgRouting developers
Mail: [email protected]
Expand All @@ -24,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

********************************************************************PGR-GNU*/

#ifndef INCLUDE_COMPONENTS_COMPONENTSRESULT_H_
#define INCLUDE_COMPONENTS_COMPONENTSRESULT_H_
#ifndef INCLUDE_COMPONENTS_COMPONENTSRESULT_HPP_
#define INCLUDE_COMPONENTS_COMPONENTSRESULT_HPP_
#pragma once

#include <vector>
Expand All @@ -47,4 +48,4 @@ componentsResult(
} // namespace algorithms
} // namespace pgrouting

#endif // INCLUDE_COMPONENTS_COMPONENTSRESULT_H_
#endif // INCLUDE_COMPONENTS_COMPONENTSRESULT_HPP_
3 changes: 2 additions & 1 deletion include/components/pgr_components.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*PGR-GNU*****************************************************************
File: pgr_components.hpp

Copyright (c) 2015 pgRouting developers
Mail: [email protected]
Expand Down Expand Up @@ -41,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include "cpp_common/pgr_base_graph.hpp"
#include "cpp_common/identifiers.hpp"
#include "components/componentsResult.h"
#include "components/componentsResult.hpp"

namespace pgrouting {
namespace algorithms {
Expand Down
2 changes: 1 addition & 1 deletion include/components/pgr_makeConnected.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <boost/ref.hpp>

#include "c_types/ii_t_rt.h"
#include "cpp_common/pgr_messages.h"
#include "cpp_common/pgr_messages.hpp"
#include "cpp_common/pgr_base_graph.hpp"
#include "cpp_common/interruption.hpp"
//******************************************
Expand Down
6 changes: 3 additions & 3 deletions include/contraction/ch_graphs.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*PGR-GNU*****************************************************************
File: pgr_CH_graphs.hpp
File: ch_graphs.hpp

Generated with Template by:
Copyright (c) 2015 pgRouting developers
Expand Down Expand Up @@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include "contraction/pgr_contractionGraph.hpp"
#include "cpp_common/pgr_base_graph.hpp"
#include "cpp_common/ch_vertex.h"
#include "cpp_common/ch_edge.h"
#include "cpp_common/ch_vertex.hpp"
#include "cpp_common/ch_edge.hpp"


namespace pgrouting {
Expand Down
2 changes: 1 addition & 1 deletion include/contraction/pgr_contract.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include <deque>
#include <vector>
#include "cpp_common/pgr_assert.h"
#include "cpp_common/pgr_assert.hpp"

#include "contraction/pgr_contractionGraph.hpp"
#include "contraction/ch_graphs.hpp"
Expand Down
4 changes: 2 additions & 2 deletions include/contraction/pgr_contractionGraph.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <boost/graph/iteration_macros.hpp>

#include "cpp_common/pgr_base_graph.hpp"
#include "cpp_common/ch_vertex.h"
#include "cpp_common/ch_edge.h"
#include "cpp_common/ch_vertex.hpp"
#include "cpp_common/ch_edge.hpp"


namespace pgrouting {
Expand Down
Loading