Skip to content

Commit 1a43627

Browse files
cvvergaracvvergara
committed
(include) Adjusting includes to filename changes
1 parent 16cd445 commit 1a43627

65 files changed

Lines changed: 276 additions & 280 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎include/allpairs/allpairs.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*PGR-GNU*****************************************************************
2-
File: pgr_allpairs.hpp
2+
File: allpairs.hpp
33
44
Copyright (c) 2015 pgRouting developers
55
Mail: project@pgrouting.org
@@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2727

2828
// http://www.cs.rpi.edu/~musser/archive/2005/gsd/restricted/FloydWarshall/FloydWarshall.pdf
2929

30-
#ifndef INCLUDE_ALLPAIRS_PGR_ALLPAIRS_HPP_
31-
#define INCLUDE_ALLPAIRS_PGR_ALLPAIRS_HPP_
30+
#ifndef INCLUDE_ALLPAIRS_ALLPAIRS_HPP_
31+
#define INCLUDE_ALLPAIRS_ALLPAIRS_HPP_
3232
#pragma once
3333

3434
#include <deque>
@@ -44,11 +44,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
4444

4545
#include "c_types/iid_t_rt.h"
4646
#include "cpp_common/basePath_SSEC.hpp"
47-
#include "cpp_common/pgr_base_graph.hpp"
47+
#include "cpp_common/base_graph.hpp"
4848
#include "cpp_common/interruption.hpp"
4949

5050
// TODO(vicky) don't keep it here
51-
#include "cpp_common/pgr_alloc.hpp"
51+
#include "cpp_common/alloc.hpp"
5252

5353
namespace pgrouting {
5454
template < class G > class Pgr_allpairs;
@@ -263,4 +263,4 @@ class Pgr_allpairs {
263263

264264
} // namespace pgrouting
265265

266-
#endif // INCLUDE_ALLPAIRS_PGR_ALLPAIRS_HPP_
266+
#endif // INCLUDE_ALLPAIRS_ALLPAIRS_HPP_

‎include/alphaShape/alphaShape.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*PGR-GNU*****************************************************************
2-
File: pgr_alphaShape.hpp
2+
File: alphaShape.hpp
33
44
Copyright (c) 2018 pgRouting developers
55
Mail: project@pgrouting.org
@@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2626
********************************************************************PGR-GNU*/
2727
/*! @file */
2828

29-
#ifndef INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_
30-
#define INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_
29+
#ifndef INCLUDE_ALPHASHAPE_ALPHASHAPE_HPP_
30+
#define INCLUDE_ALPHASHAPE_ALPHASHAPE_HPP_
3131
#pragma once
3232

3333
#ifndef __cplusplus
@@ -40,9 +40,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
4040
#include <iosfwd>
4141

4242
#include "cpp_common/edge_xy_t.hpp"
43-
#include "cpp_common/pgr_messages.hpp"
43+
#include "cpp_common/messages.hpp"
4444

45-
#include "cpp_common/pgr_base_graph.hpp"
45+
#include "cpp_common/base_graph.hpp"
4646
#include "cpp_common/bline.hpp"
4747

4848

@@ -99,4 +99,4 @@ class Pgr_alphaShape : public Pgr_messages {
9999
} // namespace alphashape
100100
} // namespace pgrouting
101101

102-
#endif // INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_
102+
#endif // INCLUDE_ALPHASHAPE_ALPHASHAPE_HPP_

‎include/astar/astar.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2626
2727
********************************************************************PGR-GNU*/
2828

29-
#ifndef INCLUDE_ASTAR_PGR_ASTAR_HPP_
30-
#define INCLUDE_ASTAR_PGR_ASTAR_HPP_
29+
#ifndef INCLUDE_ASTAR_ASTAR_HPP_
30+
#define INCLUDE_ASTAR_ASTAR_HPP_
3131
#pragma once
3232

3333
#include <deque>
@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
4040

4141
#include "visitors/astar_visitors.hpp"
4242
#include "cpp_common/basePath_SSEC.hpp"
43-
#include "cpp_common/pgr_base_graph.hpp"
43+
#include "cpp_common/base_graph.hpp"
4444
#include "cpp_common/interruption.hpp"
4545
#include "c_types/ii_t_rt.h"
4646

@@ -206,4 +206,4 @@ std::deque<Path> astar(
206206
} // namespace algorithms
207207
} // namespace pgrouting
208208

209-
#endif // INCLUDE_ASTAR_PGR_ASTAR_HPP_
209+
#endif // INCLUDE_ASTAR_ASTAR_HPP_

‎include/bdAstar/bdAstar.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2626
2727
********************************************************************PGR-GNU*/
2828

29-
#ifndef INCLUDE_BDASTAR_PGR_BDASTAR_HPP_
30-
#define INCLUDE_BDASTAR_PGR_BDASTAR_HPP_
29+
#ifndef INCLUDE_BDASTAR_BDASTAR_HPP_
30+
#define INCLUDE_BDASTAR_BDASTAR_HPP_
3131
#pragma once
3232

3333

3434
#include <map>
3535
#include <set>
3636
#include <deque>
3737

38-
#include "cpp_common/pgr_bidirectional.hpp"
38+
#include "cpp_common/bidirectional.hpp"
3939
#include "cpp_common/basePath_SSEC.hpp"
4040

4141
namespace pgrouting {
@@ -223,4 +223,4 @@ std::deque<Path> bdastar(
223223
} // namespace algorithms
224224
} // namespace pgrouting
225225

226-
#endif // INCLUDE_BDASTAR_PGR_BDASTAR_HPP_
226+
#endif // INCLUDE_BDASTAR_BDASTAR_HPP_

‎include/bdDijkstra/bdDijkstra.hpp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*PGR-GNU*****************************************************************
2-
File: pgr_bdDijkstra.hpp
2+
File: bdDijkstra.hpp
33
44
Copyright (c) 2015 pgRouting developers
55
Mail: project@pgrouting.org
@@ -25,13 +25,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2525
2626
********************************************************************PGR-GNU*/
2727

28-
#ifndef INCLUDE_BDDIJKSTRA_PGR_BDDIJKSTRA_HPP_
29-
#define INCLUDE_BDDIJKSTRA_PGR_BDDIJKSTRA_HPP_
28+
#ifndef INCLUDE_BDDIJKSTRA_BDDIJKSTRA_HPP_
29+
#define INCLUDE_BDDIJKSTRA_BDDIJKSTRA_HPP_
3030
#pragma once
3131

32-
33-
#include "cpp_common/pgr_bidirectional.hpp"
34-
3532
#include <string>
3633
#include <queue>
3734
#include <utility>
@@ -40,6 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
4037
#include <functional>
4138

4239

40+
#include "cpp_common/bidirectional.hpp"
4341
#include "cpp_common/basePath_SSEC.hpp"
4442

4543

@@ -145,4 +143,4 @@ class Pgr_bdDijkstra : public Pgr_bidirectional<G> {
145143
} // namespace bidirectional
146144
} // namespace pgrouting
147145

148-
#endif // INCLUDE_BDDIJKSTRA_PGR_BDDIJKSTRA_HPP_
146+
#endif // INCLUDE_BDDIJKSTRA_BDDIJKSTRA_HPP_

‎include/bellman_ford/bellman_ford.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*PGR-GNU*****************************************************************
2-
File: pgr_bellman_ford.hpp
2+
File: bellman_ford.hpp
33
44
Copyright (c) 2015 pgRouting developers
55
Mail: project@pgrouting.org
@@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2525
2626
********************************************************************PGR-GNU*/
2727

28-
#ifndef INCLUDE_BELLMAN_FORD_PGR_BELLMAN_FORD_HPP_
29-
#define INCLUDE_BELLMAN_FORD_PGR_BELLMAN_FORD_HPP_
28+
#ifndef INCLUDE_BELLMAN_FORD_BELLMAN_FORD_HPP_
29+
#define INCLUDE_BELLMAN_FORD_BELLMAN_FORD_HPP_
3030
#pragma once
3131

3232
#include <deque>
@@ -41,9 +41,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
4141
#include <boost/config.hpp>
4242
#include <boost/graph/adjacency_list.hpp>
4343
#include <boost/graph/bellman_ford_shortest_paths.hpp>
44-
#include "cpp_common/pgr_messages.hpp"
44+
#include "cpp_common/messages.hpp"
4545
#include "cpp_common/basePath_SSEC.hpp"
46-
#include "cpp_common/pgr_base_graph.hpp"
46+
#include "cpp_common/base_graph.hpp"
4747
#include "cpp_common/interruption.hpp"
4848
#include "c_types/ii_t_rt.h"
4949

@@ -334,4 +334,4 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages {
334334

335335
} // namespace pgrouting
336336

337-
#endif // INCLUDE_BELLMAN_FORD_PGR_BELLMAN_FORD_HPP_
337+
#endif // INCLUDE_BELLMAN_FORD_BELLMAN_FORD_HPP_

‎include/bellman_ford/edwardMoore.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*PGR-GNU*****************************************************************
2-
File: pgr_edwardMoore.hpp
2+
File: edwardMoore.hpp
33
44
Copyright (c) 2019 pgRouting developers
55
Mail: project@pgrouting.org
@@ -20,8 +20,8 @@ along with this program; if not, write to the Free Software
2020
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2121
********************************************************************PGR-GNU*/
2222

23-
#ifndef INCLUDE_BELLMAN_FORD_PGR_EDWARDMOORE_HPP_
24-
#define INCLUDE_BELLMAN_FORD_PGR_EDWARDMOORE_HPP_
23+
#ifndef INCLUDE_BELLMAN_FORD_EDWARDMOORE_HPP_
24+
#define INCLUDE_BELLMAN_FORD_EDWARDMOORE_HPP_
2525
#pragma once
2626

2727
#include <limits>
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
3232
#include <map>
3333

3434
#include "cpp_common/basePath_SSEC.hpp"
35-
#include "cpp_common/pgr_base_graph.hpp"
35+
#include "cpp_common/base_graph.hpp"
3636
#include "cpp_common/interruption.hpp"
3737

3838
#include "c_types/ii_t_rt.h"
@@ -262,4 +262,4 @@ class Pgr_edwardMoore {
262262
} // namespace functions
263263
} // namespace pgrouting
264264

265-
#endif // INCLUDE_BELLMAN_FORD_PGR_EDWARDMOORE_HPP_
265+
#endif // INCLUDE_BELLMAN_FORD_EDWARDMOORE_HPP_

‎include/breadthFirstSearch/binaryBreadthFirstSearch.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*PGR-GNU*****************************************************************
2-
File: pgr_binaryBreadthFirstSearch.hpp
2+
File: binaryBreadthFirstSearch.hpp
33
44
Copyright (c) 2019 pgRouting developers
55
Mail: project@pgrouting.org
@@ -21,8 +21,8 @@ along with this program; if not, write to the Free Software
2121
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2222
********************************************************************PGR-GNU*/
2323

24-
#ifndef INCLUDE_BREADTHFIRSTSEARCH_PGR_BINARYBREADTHFIRSTSEARCH_HPP_
25-
#define INCLUDE_BREADTHFIRSTSEARCH_PGR_BINARYBREADTHFIRSTSEARCH_HPP_
24+
#ifndef INCLUDE_BREADTHFIRSTSEARCH_BINARYBREADTHFIRSTSEARCH_HPP_
25+
#define INCLUDE_BREADTHFIRSTSEARCH_BINARYBREADTHFIRSTSEARCH_HPP_
2626
#pragma once
2727

2828
#include <deque>
@@ -34,8 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
3434
#include <map>
3535

3636
#include "cpp_common/basePath_SSEC.hpp"
37-
#include "cpp_common/pgr_base_graph.hpp"
38-
#include "cpp_common/pgr_assert.hpp"
37+
#include "cpp_common/base_graph.hpp"
38+
#include "cpp_common/assert.hpp"
3939

4040
#include "c_types/ii_t_rt.h"
4141

@@ -243,4 +243,4 @@ class Pgr_binaryBreadthFirstSearch {
243243
} // namespace functions
244244
} // namespace pgrouting
245245

246-
#endif // INCLUDE_BREADTHFIRSTSEARCH_PGR_BINARYBREADTHFIRSTSEARCH_HPP_
246+
#endif // INCLUDE_BREADTHFIRSTSEARCH_BINARYBREADTHFIRSTSEARCH_HPP_

‎include/breadthFirstSearch/breadthFirstSearch.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*PGR-GNU*****************************************************************
2-
File: pgr_breadthFirstSearch.hpp
2+
File: breadthFirstSearch.hpp
33
44
Copyright (c) 2019 pgRouting developers
55
Mail: project@pgrouting.org
@@ -21,8 +21,8 @@ along with this program; if not, write to the Free Software
2121
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2222
********************************************************************PGR-GNU*/
2323

24-
#ifndef INCLUDE_BREADTHFIRSTSEARCH_PGR_BREADTHFIRSTSEARCH_HPP_
25-
#define INCLUDE_BREADTHFIRSTSEARCH_PGR_BREADTHFIRSTSEARCH_HPP_
24+
#ifndef INCLUDE_BREADTHFIRSTSEARCH_BREADTHFIRSTSEARCH_HPP_
25+
#define INCLUDE_BREADTHFIRSTSEARCH_BREADTHFIRSTSEARCH_HPP_
2626
#pragma once
2727

2828
#include <vector>
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
3131
#include <visitors/edges_order_bfs_visitor.hpp>
3232
#include <boost/graph/breadth_first_search.hpp>
3333

34-
#include "cpp_common/pgr_base_graph.hpp"
34+
#include "cpp_common/base_graph.hpp"
3535
#include "cpp_common/interruption.hpp"
3636
#include "c_types/mst_rt.h"
3737

@@ -111,4 +111,4 @@ class Pgr_breadthFirstSearch {
111111
} // namespace functions
112112
} // namespace pgrouting
113113

114-
#endif // INCLUDE_BREADTHFIRSTSEARCH_PGR_BREADTHFIRSTSEARCH_HPP_
114+
#endif // INCLUDE_BREADTHFIRSTSEARCH_BREADTHFIRSTSEARCH_HPP_

‎include/chinese/chinesePostman.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*PGR-GNU*****************************************************************
2-
File: pgr_chinesePostman.hpp
2+
File: chinesePostman.hpp
33
44
Copyright (c) 2015 pgRouting developers
55
Mail: project@pgrouting.org
@@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2525
2626
********************************************************************PGR-GNU*/
2727

28-
#ifndef INCLUDE_CHINESE_PGR_CHINESEPOSTMAN_HPP_
29-
#define INCLUDE_CHINESE_PGR_CHINESEPOSTMAN_HPP_
28+
#ifndef INCLUDE_CHINESE_CHINESEPOSTMAN_HPP_
29+
#define INCLUDE_CHINESE_CHINESEPOSTMAN_HPP_
3030
#pragma once
3131

3232
#include <map>
@@ -36,11 +36,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
3636
#include <limits>
3737
#include <stack>
3838

39-
#include "max_flow/pgr_minCostMaxFlow.hpp"
39+
#include "max_flow/minCostMaxFlow.hpp"
4040
#include "c_types/path_rt.h"
4141
#include "cpp_common/edge_t.hpp"
4242
#include "c_types/flow_t.h"
43-
#include "cpp_common/pgr_assert.hpp"
43+
#include "cpp_common/assert.hpp"
4444
#include "cpp_common/identifiers.hpp"
4545

4646

@@ -332,4 +332,4 @@ PgrDirectedChPPGraph::BuildResultGraph() {
332332
} // namespace graph
333333
} // namespace pgrouting
334334

335-
#endif // INCLUDE_CHINESE_PGR_CHINESEPOSTMAN_HPP_
335+
#endif // INCLUDE_CHINESE_CHINESEPOSTMAN_HPP_

0 commit comments

Comments
 (0)