From bfc6c9b89dcbdd42b87720a66d75f242f97edb54 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Sat, 2 Jan 2016 13:55:06 +0100 Subject: [PATCH 1/7] Move files in src/ include/ --- algorithms/bfs_components.hpp | 174 ------------ data_structures/lru_cache.hpp | 97 ------- data_structures/static_kdtree.hpp | 260 ------------------ data_structures/upper_bound.hpp | 77 ------ .../contractor}/contractor.hpp | 0 .../contractor}/contractor_options.hpp | 0 .../contractor}/crc32_processor.hpp | 0 .../contractor}/processing_chain.hpp | 0 .../contractor}/query_edge.hpp | 0 .../datastore}/shared_memory_factory.hpp | 0 .../engine/datafacade}/datafacade_base.hpp | 0 .../datafacade}/internal_datafacade.hpp | 0 .../engine/datafacade}/shared_barriers.hpp | 0 .../engine/datafacade}/shared_datafacade.hpp | 0 .../engine/datafacade}/shared_datatype.hpp | 0 .../descriptors}/description_factory.hpp | 0 .../engine/descriptors}/descriptor_base.hpp | 0 .../engine/descriptors}/gpx_descriptor.hpp | 0 .../engine/descriptors}/json_descriptor.hpp | 0 .../engine}/douglas_peucker.hpp | 0 .../engine}/geospatial_query.hpp | 0 .../engine}/internal_route_result.hpp | 0 .../engine/map_matching}/bayes_classifier.hpp | 0 .../map_matching}/hidden_markov_model.hpp | 0 .../engine}/object_encoder.hpp | 0 {library => include/engine}/osrm_impl.hpp | 0 .../engine}/phantom_node.hpp | 0 .../engine/plugins}/distance_table.hpp | 0 .../engine/plugins}/hello_world.hpp | 0 {plugins => include/engine/plugins}/match.hpp | 0 .../engine/plugins}/nearest.hpp | 0 .../engine/plugins}/plugin_base.hpp | 0 .../engine/plugins}/timestamp.hpp | 0 {plugins => include/engine/plugins}/trip.hpp | 0 .../engine/plugins}/viaroute.hpp | 0 .../engine}/polyline_compressor.hpp | 0 .../engine}/polyline_formatter.hpp | 0 .../engine}/route_name_extraction.hpp | 0 .../routing_algorithms}/alternative_path.hpp | 0 .../direct_shortest_path.hpp | 0 .../routing_algorithms}/many_to_many.hpp | 0 .../routing_algorithms}/map_matching.hpp | 0 .../routing_algorithms}/routing_base.hpp | 0 .../routing_algorithms}/shortest_path.hpp | 0 .../engine}/search_engine.hpp | 0 .../engine}/search_engine_data.hpp | 0 .../engine}/segment_information.hpp | 0 .../engine/trip}/trip_brute_force.hpp | 0 .../engine/trip}/trip_farthest_insertion.hpp | 0 .../engine/trip}/trip_nearest_neighbour.hpp | 0 .../engine/trip}/trip_tabu_search.hpp | 0 .../extractor}/compressed_edge_container.hpp | 0 .../extractor}/edge_based_graph_factory.hpp | 0 .../extractor}/edge_based_node.hpp | 0 .../extractor}/external_memory_node.hpp | 0 .../extractor}/extraction_containers.hpp | 0 .../extraction_helper_functions.hpp | 0 .../extractor}/extraction_node.hpp | 0 .../extractor}/extraction_way.hpp | 0 .../extractor}/extractor.hpp | 0 .../extractor}/extractor_callbacks.hpp | 0 .../extractor}/extractor_options.hpp | 0 .../first_and_last_segment_of_way.hpp | 0 .../extractor}/graph_compressor.hpp | 0 .../extractor}/import_edge.hpp | 0 .../extractor}/internal_extractor_edge.hpp | 0 .../extractor}/node_id.hpp | 0 .../extractor}/original_edge_data.hpp | 0 .../extractor}/query_node.hpp | 0 .../extractor}/raster_source.hpp | 0 .../extractor}/restriction.hpp | 0 .../extractor}/restriction_map.hpp | 0 .../extractor}/restriction_parser.hpp | 0 .../extractor}/scripting_environment.hpp | 0 .../extractor}/speed_profile.hpp | 0 .../extractor}/tarjan_scc.hpp | 0 .../extractor}/travel_mode.hpp | 0 .../extractor}/turn_instructions.hpp | 0 {server => include/server}/api_grammar.hpp | 0 {server => include/server}/connection.hpp | 0 .../server}/http/compression_type.hpp | 0 {server => include/server}/http/header.hpp | 0 {server => include/server}/http/reply.hpp | 0 {server => include/server}/http/request.hpp | 0 .../server}/request_handler.hpp | 0 {server => include/server}/request_parser.hpp | 0 {server => include/server}/server.hpp | 0 {util => include/util}/bearing.hpp | 0 .../util}/binary_heap.hpp | 0 {util => include/util}/cast.hpp | 0 {util => include/util}/compute_angle.hpp | 0 {util => include/util}/container.hpp | 0 .../util}/coordinate_calculation.hpp | 0 {util => include/util}/datastore_options.hpp | 0 .../util}/deallocating_vector.hpp | 0 {util => include/util}/debug_geometry.hpp | 0 {util => include/util}/dist_table_wrapper.hpp | 0 .../util}/dynamic_graph.hpp | 0 {util => include/util}/fingerprint.hpp | 0 .../util}/fingerprint_impl.hpp.in | 0 .../util}/fixed_point_number.hpp | 0 {util => include/util}/floating_point.hpp | 0 {util => include/util}/graph_loader.hpp | 0 {util => include/util}/graph_utils.hpp | 0 .../util}/hilbert_value.hpp | 0 {util => include/util}/ini_file.hpp | 0 {util => include/util}/integer_range.hpp | 0 .../util}/iso_8601_duration_parser.hpp | 0 {util => include/util}/json_logger.hpp | 0 {util => include/util}/json_renderer.hpp | 0 {util => include/util}/json_util.hpp | 0 {util => include/util}/lua_util.hpp | 0 {util => include/util}/make_unique.hpp | 0 .../util}/matching_debug_info.hpp | 0 .../util}/matrix_graph_wrapper.hpp | 0 {util => include/util}/mercator.hpp | 0 .../util}/node_based_graph.hpp | 0 {util => include/util}/osrm_exception.hpp | 0 {data_structures => include/util}/percent.hpp | 0 {util => include/util}/range_algorithms.hpp | 0 .../util}/range_table.hpp | 0 .../util}/rectangle.hpp | 0 {util => include/util}/routed_options.hpp | 0 .../util}/shared_memory_vector_wrapper.hpp | 0 {util => include/util}/simple_logger.hpp | 0 .../util}/static_graph.hpp | 0 .../util}/static_rtree.hpp | 0 {util => include/util}/std_hash.hpp | 0 {util => include/util}/string_util.hpp | 0 {util => include/util}/timing_util.hpp | 0 {data_structures => include/util}/tribool.hpp | 0 {util => include/util}/trigonometry_table.hpp | 0 typedefs.h => include/util/typedefs.hpp | 0 {util => include/util}/version.hpp.in | 0 {util => include/util}/xml_renderer.hpp | 0 .../util}/xor_fast_hash.hpp | 0 .../util}/xor_fast_hash_storage.hpp | 0 .../benchmarks}/static_rtree.cpp | 0 .../contractor}/contractor_options.cpp | 0 .../contractor}/processing_chain.cpp | 0 .../descriptors}/description_factory.cpp | 0 .../engine}/douglas_peucker.cpp | 0 {library => src/engine}/osrm_impl.cpp | 0 .../engine}/phantom_node.cpp | 0 .../engine}/polyline_compressor.cpp | 0 .../engine}/polyline_formatter.cpp | 0 .../engine}/route_parameters.cpp | 0 .../engine}/search_engine_data.cpp | 0 .../extractor}/compressed_edge_container.cpp | 0 .../extractor}/edge_based_graph_factory.cpp | 0 .../extractor}/external_memory_node.cpp | 0 .../extractor}/extraction_containers.cpp | 0 {extractor => src/extractor}/extractor.cpp | 0 .../extractor}/extractor_callbacks.cpp | 0 .../extractor}/extractor_options.cpp | 0 .../extractor}/graph_compressor.cpp | 0 .../extractor}/import_edge.cpp | 0 .../extractor}/raster_source.cpp | 0 .../extractor}/restriction_map.cpp | 0 .../extractor}/restriction_parser.cpp | 0 .../extractor}/scripting_environment.cpp | 0 {server => src/server}/connection.cpp | 0 {server => src/server}/http/reply.cpp | 0 {server => src/server}/request_handler.cpp | 0 {server => src/server}/request_parser.cpp | 0 {tools => src/tools}/.gitignore | 0 {tools => src/tools}/check-hsgr.cpp | 0 {tools => src/tools}/components.cpp | 0 prepare.cpp => src/tools/contract.cpp | 0 datastore.cpp => src/tools/datastore.cpp | 0 extract.cpp => src/tools/extract.cpp | 0 {tools => src/tools}/io-benchmark.cpp | 0 routed.cpp => src/tools/routed.cpp | 0 {tools => src/tools}/simpleclient.cpp | 0 {tools => src/tools}/springclean.cpp | 0 {tools => src/tools}/unlock_all_mutexes.cpp | 0 {util => src/util}/compute_angle.cpp | 0 {data_structures => src/util}/coordinate.cpp | 0 .../util}/coordinate_calculation.cpp | 0 {util => src/util}/fingerprint.cpp | 0 .../util}/hilbert_value.cpp | 0 {util => src/util}/mercator.cpp | 0 {util => src/util}/osrm_exception.cpp | 0 {util => src/util}/simple_logger.cpp | 0 184 files changed, 608 deletions(-) delete mode 100644 algorithms/bfs_components.hpp delete mode 100644 data_structures/lru_cache.hpp delete mode 100644 data_structures/static_kdtree.hpp delete mode 100644 data_structures/upper_bound.hpp rename {contractor => include/contractor}/contractor.hpp (100%) rename {contractor => include/contractor}/contractor_options.hpp (100%) rename {algorithms => include/contractor}/crc32_processor.hpp (100%) rename {contractor => include/contractor}/processing_chain.hpp (100%) rename {data_structures => include/contractor}/query_edge.hpp (100%) rename {data_structures => include/datastore}/shared_memory_factory.hpp (100%) rename {server/data_structures => include/engine/datafacade}/datafacade_base.hpp (100%) rename {server/data_structures => include/engine/datafacade}/internal_datafacade.hpp (100%) rename {server/data_structures => include/engine/datafacade}/shared_barriers.hpp (100%) rename {server/data_structures => include/engine/datafacade}/shared_datafacade.hpp (100%) rename {server/data_structures => include/engine/datafacade}/shared_datatype.hpp (100%) rename {descriptors => include/engine/descriptors}/description_factory.hpp (100%) rename {descriptors => include/engine/descriptors}/descriptor_base.hpp (100%) rename {descriptors => include/engine/descriptors}/gpx_descriptor.hpp (100%) rename {descriptors => include/engine/descriptors}/json_descriptor.hpp (100%) rename {algorithms => include/engine}/douglas_peucker.hpp (100%) rename {algorithms => include/engine}/geospatial_query.hpp (100%) rename {data_structures => include/engine}/internal_route_result.hpp (100%) rename {algorithms => include/engine/map_matching}/bayes_classifier.hpp (100%) rename {data_structures => include/engine/map_matching}/hidden_markov_model.hpp (100%) rename {algorithms => include/engine}/object_encoder.hpp (100%) rename {library => include/engine}/osrm_impl.hpp (100%) rename {data_structures => include/engine}/phantom_node.hpp (100%) rename {plugins => include/engine/plugins}/distance_table.hpp (100%) rename {plugins => include/engine/plugins}/hello_world.hpp (100%) rename {plugins => include/engine/plugins}/match.hpp (100%) rename {plugins => include/engine/plugins}/nearest.hpp (100%) rename {plugins => include/engine/plugins}/plugin_base.hpp (100%) rename {plugins => include/engine/plugins}/timestamp.hpp (100%) rename {plugins => include/engine/plugins}/trip.hpp (100%) rename {plugins => include/engine/plugins}/viaroute.hpp (100%) rename {algorithms => include/engine}/polyline_compressor.hpp (100%) rename {algorithms => include/engine}/polyline_formatter.hpp (100%) rename {algorithms => include/engine}/route_name_extraction.hpp (100%) rename {routing_algorithms => include/engine/routing_algorithms}/alternative_path.hpp (100%) rename {routing_algorithms => include/engine/routing_algorithms}/direct_shortest_path.hpp (100%) rename {routing_algorithms => include/engine/routing_algorithms}/many_to_many.hpp (100%) rename {routing_algorithms => include/engine/routing_algorithms}/map_matching.hpp (100%) rename {routing_algorithms => include/engine/routing_algorithms}/routing_base.hpp (100%) rename {routing_algorithms => include/engine/routing_algorithms}/shortest_path.hpp (100%) rename {data_structures => include/engine}/search_engine.hpp (100%) rename {data_structures => include/engine}/search_engine_data.hpp (100%) rename {data_structures => include/engine}/segment_information.hpp (100%) rename {algorithms => include/engine/trip}/trip_brute_force.hpp (100%) rename {algorithms => include/engine/trip}/trip_farthest_insertion.hpp (100%) rename {algorithms => include/engine/trip}/trip_nearest_neighbour.hpp (100%) rename {algorithms => include/engine/trip}/trip_tabu_search.hpp (100%) rename {data_structures => include/extractor}/compressed_edge_container.hpp (100%) rename {extractor => include/extractor}/edge_based_graph_factory.hpp (100%) rename {data_structures => include/extractor}/edge_based_node.hpp (100%) rename {data_structures => include/extractor}/external_memory_node.hpp (100%) rename {extractor => include/extractor}/extraction_containers.hpp (100%) rename {extractor => include/extractor}/extraction_helper_functions.hpp (100%) rename {extractor => include/extractor}/extraction_node.hpp (100%) rename {extractor => include/extractor}/extraction_way.hpp (100%) rename {extractor => include/extractor}/extractor.hpp (100%) rename {extractor => include/extractor}/extractor_callbacks.hpp (100%) rename {extractor => include/extractor}/extractor_options.hpp (100%) rename {extractor => include/extractor}/first_and_last_segment_of_way.hpp (100%) rename {algorithms => include/extractor}/graph_compressor.hpp (100%) rename {data_structures => include/extractor}/import_edge.hpp (100%) rename {extractor => include/extractor}/internal_extractor_edge.hpp (100%) rename {data_structures => include/extractor}/node_id.hpp (100%) rename {data_structures => include/extractor}/original_edge_data.hpp (100%) rename {data_structures => include/extractor}/query_node.hpp (100%) rename {data_structures => include/extractor}/raster_source.hpp (100%) rename {data_structures => include/extractor}/restriction.hpp (100%) rename {data_structures => include/extractor}/restriction_map.hpp (100%) rename {extractor => include/extractor}/restriction_parser.hpp (100%) rename {extractor => include/extractor}/scripting_environment.hpp (100%) rename {extractor => include/extractor}/speed_profile.hpp (100%) rename {algorithms => include/extractor}/tarjan_scc.hpp (100%) rename {data_structures => include/extractor}/travel_mode.hpp (100%) rename {data_structures => include/extractor}/turn_instructions.hpp (100%) rename {server => include/server}/api_grammar.hpp (100%) rename {server => include/server}/connection.hpp (100%) rename {server => include/server}/http/compression_type.hpp (100%) rename {server => include/server}/http/header.hpp (100%) rename {server => include/server}/http/reply.hpp (100%) rename {server => include/server}/http/request.hpp (100%) rename {server => include/server}/request_handler.hpp (100%) rename {server => include/server}/request_parser.hpp (100%) rename {server => include/server}/server.hpp (100%) rename {util => include/util}/bearing.hpp (100%) rename {data_structures => include/util}/binary_heap.hpp (100%) rename {util => include/util}/cast.hpp (100%) rename {util => include/util}/compute_angle.hpp (100%) rename {util => include/util}/container.hpp (100%) rename {algorithms => include/util}/coordinate_calculation.hpp (100%) rename {util => include/util}/datastore_options.hpp (100%) rename {data_structures => include/util}/deallocating_vector.hpp (100%) rename {util => include/util}/debug_geometry.hpp (100%) rename {util => include/util}/dist_table_wrapper.hpp (100%) rename {data_structures => include/util}/dynamic_graph.hpp (100%) rename {util => include/util}/fingerprint.hpp (100%) rename {util => include/util}/fingerprint_impl.hpp.in (100%) rename {data_structures => include/util}/fixed_point_number.hpp (100%) rename {util => include/util}/floating_point.hpp (100%) rename {util => include/util}/graph_loader.hpp (100%) rename {util => include/util}/graph_utils.hpp (100%) rename {data_structures => include/util}/hilbert_value.hpp (100%) rename {util => include/util}/ini_file.hpp (100%) rename {util => include/util}/integer_range.hpp (100%) rename {util => include/util}/iso_8601_duration_parser.hpp (100%) rename {util => include/util}/json_logger.hpp (100%) rename {util => include/util}/json_renderer.hpp (100%) rename {util => include/util}/json_util.hpp (100%) rename {util => include/util}/lua_util.hpp (100%) rename {util => include/util}/make_unique.hpp (100%) rename {util => include/util}/matching_debug_info.hpp (100%) rename {data_structures => include/util}/matrix_graph_wrapper.hpp (100%) rename {util => include/util}/mercator.hpp (100%) rename {data_structures => include/util}/node_based_graph.hpp (100%) rename {util => include/util}/osrm_exception.hpp (100%) rename {data_structures => include/util}/percent.hpp (100%) rename {util => include/util}/range_algorithms.hpp (100%) rename {data_structures => include/util}/range_table.hpp (100%) rename {data_structures => include/util}/rectangle.hpp (100%) rename {util => include/util}/routed_options.hpp (100%) rename {data_structures => include/util}/shared_memory_vector_wrapper.hpp (100%) rename {util => include/util}/simple_logger.hpp (100%) rename {data_structures => include/util}/static_graph.hpp (100%) rename {data_structures => include/util}/static_rtree.hpp (100%) rename {util => include/util}/std_hash.hpp (100%) rename {util => include/util}/string_util.hpp (100%) rename {util => include/util}/timing_util.hpp (100%) rename {data_structures => include/util}/tribool.hpp (100%) rename {util => include/util}/trigonometry_table.hpp (100%) rename typedefs.h => include/util/typedefs.hpp (100%) rename {util => include/util}/version.hpp.in (100%) rename {util => include/util}/xml_renderer.hpp (100%) rename {data_structures => include/util}/xor_fast_hash.hpp (100%) rename {data_structures => include/util}/xor_fast_hash_storage.hpp (100%) rename {benchmarks => src/benchmarks}/static_rtree.cpp (100%) rename {contractor => src/contractor}/contractor_options.cpp (100%) rename {contractor => src/contractor}/processing_chain.cpp (100%) rename {descriptors => src/engine/descriptors}/description_factory.cpp (100%) rename {algorithms => src/engine}/douglas_peucker.cpp (100%) rename {library => src/engine}/osrm_impl.cpp (100%) rename {data_structures => src/engine}/phantom_node.cpp (100%) rename {algorithms => src/engine}/polyline_compressor.cpp (100%) rename {algorithms => src/engine}/polyline_formatter.cpp (100%) rename {data_structures => src/engine}/route_parameters.cpp (100%) rename {data_structures => src/engine}/search_engine_data.cpp (100%) rename {data_structures => src/extractor}/compressed_edge_container.cpp (100%) rename {extractor => src/extractor}/edge_based_graph_factory.cpp (100%) rename {data_structures => src/extractor}/external_memory_node.cpp (100%) rename {extractor => src/extractor}/extraction_containers.cpp (100%) rename {extractor => src/extractor}/extractor.cpp (100%) rename {extractor => src/extractor}/extractor_callbacks.cpp (100%) rename {extractor => src/extractor}/extractor_options.cpp (100%) rename {algorithms => src/extractor}/graph_compressor.cpp (100%) rename {data_structures => src/extractor}/import_edge.cpp (100%) rename {data_structures => src/extractor}/raster_source.cpp (100%) rename {data_structures => src/extractor}/restriction_map.cpp (100%) rename {extractor => src/extractor}/restriction_parser.cpp (100%) rename {extractor => src/extractor}/scripting_environment.cpp (100%) rename {server => src/server}/connection.cpp (100%) rename {server => src/server}/http/reply.cpp (100%) rename {server => src/server}/request_handler.cpp (100%) rename {server => src/server}/request_parser.cpp (100%) rename {tools => src/tools}/.gitignore (100%) rename {tools => src/tools}/check-hsgr.cpp (100%) rename {tools => src/tools}/components.cpp (100%) rename prepare.cpp => src/tools/contract.cpp (100%) rename datastore.cpp => src/tools/datastore.cpp (100%) rename extract.cpp => src/tools/extract.cpp (100%) rename {tools => src/tools}/io-benchmark.cpp (100%) rename routed.cpp => src/tools/routed.cpp (100%) rename {tools => src/tools}/simpleclient.cpp (100%) rename {tools => src/tools}/springclean.cpp (100%) rename {tools => src/tools}/unlock_all_mutexes.cpp (100%) rename {util => src/util}/compute_angle.cpp (100%) rename {data_structures => src/util}/coordinate.cpp (100%) rename {algorithms => src/util}/coordinate_calculation.cpp (100%) rename {util => src/util}/fingerprint.cpp (100%) rename {data_structures => src/util}/hilbert_value.cpp (100%) rename {util => src/util}/mercator.cpp (100%) rename {util => src/util}/osrm_exception.cpp (100%) rename {util => src/util}/simple_logger.cpp (100%) diff --git a/algorithms/bfs_components.hpp b/algorithms/bfs_components.hpp deleted file mode 100644 index b3f5364015b..00000000000 --- a/algorithms/bfs_components.hpp +++ /dev/null @@ -1,174 +0,0 @@ -/* - -Copyright (c) 2015, Project OSRM contributors -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ - -#ifndef BFS_COMPONENTS_HPP_ -#define BFS_COMPONENTS_HPP_ - -#include "../typedefs.h" -#include "../data_structures/restriction_map.hpp" - -#include -#include - -// Explores the components of the given graph while respecting turn restrictions -// and barriers. -template class BFSComponentExplorer -{ - public: - BFSComponentExplorer(const GraphT &dynamic_graph, - const RestrictionMap &restrictions, - const std::unordered_set &barrier_nodes) - : m_graph(dynamic_graph), m_restriction_map(restrictions), m_barrier_nodes(barrier_nodes) - { - BOOST_ASSERT(m_graph.GetNumberOfNodes() > 0); - } - - /*! - * Returns the size of the component that the node belongs to. - */ - unsigned int GetComponentSize(const NodeID node) const - { - BOOST_ASSERT(node < m_component_index_list.size()); - - return m_component_index_size[m_component_index_list[node]]; - } - - unsigned int GetNumberOfComponents() { return m_component_index_size.size(); } - - /*! - * Computes the component sizes. - */ - void run() - { - std::queue> bfs_queue; - unsigned current_component = 0; - - BOOST_ASSERT(m_component_index_list.empty()); - BOOST_ASSERT(m_component_index_size.empty()); - - unsigned num_nodes = m_graph.GetNumberOfNodes(); - - m_component_index_list.resize(num_nodes, std::numeric_limits::max()); - - BOOST_ASSERT(num_nodes > 0); - - // put unexplorered node with parent pointer into queue - for (NodeID node = 0; node < num_nodes; ++node) - { - if (std::numeric_limits::max() == m_component_index_list[node]) - { - unsigned size = ExploreComponent(bfs_queue, node, current_component); - - // push size into vector - m_component_index_size.emplace_back(size); - ++current_component; - } - } - } - - private: - /*! - * Explores the current component that starts at node using BFS. - */ - unsigned ExploreComponent(std::queue> &bfs_queue, - NodeID node, - unsigned current_component) - { - /* - Graphical representation of variables: - - u v w - *---------->*---------->* - e2 - */ - - bfs_queue.emplace(node, node); - // mark node as read - m_component_index_list[node] = current_component; - - unsigned current_component_size = 1; - - while (!bfs_queue.empty()) - { - // fetch element from BFS queue - std::pair current_queue_item = bfs_queue.front(); - bfs_queue.pop(); - - const NodeID v = current_queue_item.first; // current node - const NodeID u = current_queue_item.second; // parent - // increment size counter of current component - ++current_component_size; - if (m_barrier_nodes.find(v) != m_barrier_nodes.end()) - { - continue; - } - const NodeID to_node_of_only_restriction = - m_restriction_map.CheckForEmanatingIsOnlyTurn(u, v); - - for (auto e2 : m_graph.GetAdjacentEdgeRange(v)) - { - const NodeID w = m_graph.GetTarget(e2); - - if (to_node_of_only_restriction != std::numeric_limits::max() && - w != to_node_of_only_restriction) - { - // At an only_-restriction but not at the right turn - continue; - } - - if (u != w) - { - // only add an edge if turn is not a U-turn except - // when it is at the end of a dead-end street. - if (!m_restriction_map.CheckIfTurnIsRestricted(u, v, w)) - { - // only add an edge if turn is not prohibited - if (std::numeric_limits::max() == m_component_index_list[w]) - { - // insert next (node, parent) only if w has - // not yet been explored - // mark node as read - m_component_index_list[w] = current_component; - bfs_queue.emplace(w, v); - } - } - } - } - } - - return current_component_size; - } - - std::vector m_component_index_list; - std::vector m_component_index_size; - - const GraphT &m_graph; - const RestrictionMap &m_restriction_map; - const std::unordered_set &m_barrier_nodes; -}; - -#endif // BFS_COMPONENTS_HPP_ diff --git a/data_structures/lru_cache.hpp b/data_structures/lru_cache.hpp deleted file mode 100644 index 155ab1ef493..00000000000 --- a/data_structures/lru_cache.hpp +++ /dev/null @@ -1,97 +0,0 @@ -/* - -Copyright (c) 2014, Project OSRM contributors -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ - -#ifndef LRUCACHE_HPP -#define LRUCACHE_HPP - -#include -#include - -template class LRUCache -{ - private: - struct CacheEntry - { - CacheEntry(KeyT k, ValueT v) : key(k), value(v) {} - KeyT key; - ValueT value; - }; - unsigned capacity; - std::list itemsInCache; - std::unordered_map::iterator> positionMap; - - public: - explicit LRUCache(unsigned c) : capacity(c) {} - - bool Holds(KeyT key) - { - if (positionMap.find(key) != positionMap.end()) - { - return true; - } - return false; - } - - void Insert(const KeyT key, ValueT &value) - { - itemsInCache.push_front(CacheEntry(key, value)); - positionMap.insert(std::make_pair(key, itemsInCache.begin())); - if (itemsInCache.size() > capacity) - { - positionMap.erase(itemsInCache.back().key); - itemsInCache.pop_back(); - } - } - - void Insert(const KeyT key, ValueT value) - { - itemsInCache.push_front(CacheEntry(key, value)); - positionMap.insert(std::make_pair(key, itemsInCache.begin())); - if (itemsInCache.size() > capacity) - { - positionMap.erase(itemsInCache.back().key); - itemsInCache.pop_back(); - } - } - - bool Fetch(const KeyT key, ValueT &result) - { - if (Holds(key)) - { - CacheEntry e = *(positionMap.find(key)->second); - result = e.value; - - // move to front - itemsInCache.splice(itemsInCache.begin(), itemsInCache, positionMap.find(key)->second); - positionMap.find(key)->second = itemsInCache.begin(); - return true; - } - return false; - } - unsigned Size() const { return itemsInCache.size(); } -}; -#endif // LRUCACHE_HPP diff --git a/data_structures/static_kdtree.hpp b/data_structures/static_kdtree.hpp deleted file mode 100644 index 1e65dc84499..00000000000 --- a/data_structures/static_kdtree.hpp +++ /dev/null @@ -1,260 +0,0 @@ -/* - -Copyright (c) 2013, Project OSRM contributors -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ - -// KD Tree coded by Christian Vetter, Monav Project - -#ifndef STATICKDTREE_HPP -#define STATICKDTREE_HPP - -#include -#include -#include -#include -#include - -namespace KDTree -{ - -#define KDTREE_BASESIZE (8) - -template class BoundingBox -{ - public: - BoundingBox() - { - for (unsigned dim = 0; dim < k; ++dim) - { - min[dim] = std::numeric_limits::min(); - max[dim] = std::numeric_limits::max(); - } - } - - T min[k]; - T max[k]; -}; - -struct NoData -{ -}; - -template class EuclidianMetric -{ - public: - double operator()(const T left[k], const T right[k]) - { - double result = 0; - for (unsigned i = 0; i < k; ++i) - { - double temp = (double)left[i] - (double)right[i]; - result += temp * temp; - } - return result; - } - - double operator()(const BoundingBox &box, const T point[k]) - { - T nearest[k]; - for (unsigned dim = 0; dim < k; ++dim) - { - if (point[dim] < box.min[dim]) - nearest[dim] = box.min[dim]; - else if (point[dim] > box.max[dim]) - nearest[dim] = box.max[dim]; - else - nearest[dim] = point[dim]; - } - return operator()(point, nearest); - } -}; - -template > -class StaticKDTree -{ - public: - struct InputPoint - { - T coordinates[k]; - Data data; - bool operator==(const InputPoint &right) - { - for (int i = 0; i < k; i++) - { - if (coordinates[i] != right.coordinates[i]) - return false; - } - return true; - } - }; - - explicit StaticKDTree(std::vector *points) - { - BOOST_ASSERT(k > 0); - BOOST_ASSERT(points->size() > 0); - size = points->size(); - kdtree = new InputPoint[size]; - for (Iterator i = 0; i != size; ++i) - { - kdtree[i] = points->at(i); - for (unsigned dim = 0; dim < k; ++dim) - { - if (kdtree[i].coordinates[dim] < boundingBox.min[dim]) - boundingBox.min[dim] = kdtree[i].coordinates[dim]; - if (kdtree[i].coordinates[dim] > boundingBox.max[dim]) - boundingBox.max[dim] = kdtree[i].coordinates[dim]; - } - } - std::stack s; - s.push(Tree(0, size, 0)); - while (!s.empty()) - { - Tree tree = s.top(); - s.pop(); - - if (tree.right - tree.left < KDTREE_BASESIZE) - continue; - - Iterator middle = tree.left + (tree.right - tree.left) / 2; - std::nth_element(kdtree + tree.left, kdtree + middle, kdtree + tree.right, - Less(tree.dimension)); - s.push(Tree(tree.left, middle, (tree.dimension + 1) % k)); - s.push(Tree(middle + 1, tree.right, (tree.dimension + 1) % k)); - } - } - - ~StaticKDTree() { delete[] kdtree; } - - bool NearestNeighbor(InputPoint *result, const InputPoint &point) - { - Metric distance; - bool found = false; - double nearestDistance = std::numeric_limits::max(); - std::stack s; - s.push(NNTree(0, size, 0, boundingBox)); - while (!s.empty()) - { - NNTree tree = s.top(); - s.pop(); - - if (distance(tree.box, point.coordinates) >= nearestDistance) - continue; - - if (tree.right - tree.left < KDTREE_BASESIZE) - { - for (unsigned i = tree.left; i < tree.right; i++) - { - double newDistance = distance(kdtree[i].coordinates, point.coordinates); - if (newDistance < nearestDistance) - { - nearestDistance = newDistance; - *result = kdtree[i]; - found = true; - } - } - continue; - } - - Iterator middle = tree.left + (tree.right - tree.left) / 2; - - double newDistance = distance(kdtree[middle].coordinates, point.coordinates); - if (newDistance < nearestDistance) - { - nearestDistance = newDistance; - *result = kdtree[middle]; - found = true; - } - - Less comperator(tree.dimension); - if (!comperator(point, kdtree[middle])) - { - NNTree first(middle + 1, tree.right, (tree.dimension + 1) % k, tree.box); - NNTree second(tree.left, middle, (tree.dimension + 1) % k, tree.box); - first.box.min[tree.dimension] = kdtree[middle].coordinates[tree.dimension]; - second.box.max[tree.dimension] = kdtree[middle].coordinates[tree.dimension]; - s.push(second); - s.push(first); - } - else - { - NNTree first(middle + 1, tree.right, (tree.dimension + 1) % k, tree.box); - NNTree second(tree.left, middle, (tree.dimension + 1) % k, tree.box); - first.box.min[tree.dimension] = kdtree[middle].coordinates[tree.dimension]; - second.box.max[tree.dimension] = kdtree[middle].coordinates[tree.dimension]; - s.push(first); - s.push(second); - } - } - return found; - } - - private: - using Iterator = unsigned; - struct Tree - { - Iterator left; - Iterator right; - unsigned dimension; - Tree() {} - Tree(Iterator l, Iterator r, unsigned d) : left(l), right(r), dimension(d) {} - }; - struct NNTree - { - Iterator left; - Iterator right; - unsigned dimension; - BoundingBox box; - NNTree() {} - NNTree(Iterator l, Iterator r, unsigned d, const BoundingBox &b) - : left(l), right(r), dimension(d), box(b) - { - } - }; - class Less - { - public: - explicit Less(unsigned d) - { - dimension = d; - BOOST_ASSERT(dimension < k); - } - - bool operator()(const InputPoint &left, const InputPoint &right) - { - BOOST_ASSERT(dimension < k); - return left.coordinates[dimension] < right.coordinates[dimension]; - } - - private: - unsigned dimension; - }; - - BoundingBox boundingBox; - InputPoint *kdtree; - Iterator size; -}; -} - -#endif // STATICKDTREE_HPP diff --git a/data_structures/upper_bound.hpp b/data_structures/upper_bound.hpp deleted file mode 100644 index 80695f2c516..00000000000 --- a/data_structures/upper_bound.hpp +++ /dev/null @@ -1,77 +0,0 @@ -/* - -Copyright (c) 2015, Project OSRM contributors -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ - -#ifndef LOWER_BOUND_HPP -#define LOWER_BOUND_HPP - -#include -#include -#include -#include - -// max pq holds k elements -// insert if key is smaller than max -// if size > k then remove element -// get() always yields a bound to the k smallest element in the stream - -template class upper_bound -{ - private: - using parameter_type = - typename std::conditional::value, key_type, key_type &>::type; - - public: - upper_bound() = delete; - upper_bound(std::size_t size) : size(size) {} - - key_type get() const - { - if (queue.size() < size) - { - return std::numeric_limits::max(); - } - return queue.top(); - } - - void insert(const parameter_type key) - { - if (key < get()) - { - queue.emplace(key); - while (queue.size() > size) - { - queue.pop(); - } - } - } - - private: - std::priority_queue, std::less> queue; - const std::size_t size; -}; - -#endif // LOWER_BOUND_HPP diff --git a/contractor/contractor.hpp b/include/contractor/contractor.hpp similarity index 100% rename from contractor/contractor.hpp rename to include/contractor/contractor.hpp diff --git a/contractor/contractor_options.hpp b/include/contractor/contractor_options.hpp similarity index 100% rename from contractor/contractor_options.hpp rename to include/contractor/contractor_options.hpp diff --git a/algorithms/crc32_processor.hpp b/include/contractor/crc32_processor.hpp similarity index 100% rename from algorithms/crc32_processor.hpp rename to include/contractor/crc32_processor.hpp diff --git a/contractor/processing_chain.hpp b/include/contractor/processing_chain.hpp similarity index 100% rename from contractor/processing_chain.hpp rename to include/contractor/processing_chain.hpp diff --git a/data_structures/query_edge.hpp b/include/contractor/query_edge.hpp similarity index 100% rename from data_structures/query_edge.hpp rename to include/contractor/query_edge.hpp diff --git a/data_structures/shared_memory_factory.hpp b/include/datastore/shared_memory_factory.hpp similarity index 100% rename from data_structures/shared_memory_factory.hpp rename to include/datastore/shared_memory_factory.hpp diff --git a/server/data_structures/datafacade_base.hpp b/include/engine/datafacade/datafacade_base.hpp similarity index 100% rename from server/data_structures/datafacade_base.hpp rename to include/engine/datafacade/datafacade_base.hpp diff --git a/server/data_structures/internal_datafacade.hpp b/include/engine/datafacade/internal_datafacade.hpp similarity index 100% rename from server/data_structures/internal_datafacade.hpp rename to include/engine/datafacade/internal_datafacade.hpp diff --git a/server/data_structures/shared_barriers.hpp b/include/engine/datafacade/shared_barriers.hpp similarity index 100% rename from server/data_structures/shared_barriers.hpp rename to include/engine/datafacade/shared_barriers.hpp diff --git a/server/data_structures/shared_datafacade.hpp b/include/engine/datafacade/shared_datafacade.hpp similarity index 100% rename from server/data_structures/shared_datafacade.hpp rename to include/engine/datafacade/shared_datafacade.hpp diff --git a/server/data_structures/shared_datatype.hpp b/include/engine/datafacade/shared_datatype.hpp similarity index 100% rename from server/data_structures/shared_datatype.hpp rename to include/engine/datafacade/shared_datatype.hpp diff --git a/descriptors/description_factory.hpp b/include/engine/descriptors/description_factory.hpp similarity index 100% rename from descriptors/description_factory.hpp rename to include/engine/descriptors/description_factory.hpp diff --git a/descriptors/descriptor_base.hpp b/include/engine/descriptors/descriptor_base.hpp similarity index 100% rename from descriptors/descriptor_base.hpp rename to include/engine/descriptors/descriptor_base.hpp diff --git a/descriptors/gpx_descriptor.hpp b/include/engine/descriptors/gpx_descriptor.hpp similarity index 100% rename from descriptors/gpx_descriptor.hpp rename to include/engine/descriptors/gpx_descriptor.hpp diff --git a/descriptors/json_descriptor.hpp b/include/engine/descriptors/json_descriptor.hpp similarity index 100% rename from descriptors/json_descriptor.hpp rename to include/engine/descriptors/json_descriptor.hpp diff --git a/algorithms/douglas_peucker.hpp b/include/engine/douglas_peucker.hpp similarity index 100% rename from algorithms/douglas_peucker.hpp rename to include/engine/douglas_peucker.hpp diff --git a/algorithms/geospatial_query.hpp b/include/engine/geospatial_query.hpp similarity index 100% rename from algorithms/geospatial_query.hpp rename to include/engine/geospatial_query.hpp diff --git a/data_structures/internal_route_result.hpp b/include/engine/internal_route_result.hpp similarity index 100% rename from data_structures/internal_route_result.hpp rename to include/engine/internal_route_result.hpp diff --git a/algorithms/bayes_classifier.hpp b/include/engine/map_matching/bayes_classifier.hpp similarity index 100% rename from algorithms/bayes_classifier.hpp rename to include/engine/map_matching/bayes_classifier.hpp diff --git a/data_structures/hidden_markov_model.hpp b/include/engine/map_matching/hidden_markov_model.hpp similarity index 100% rename from data_structures/hidden_markov_model.hpp rename to include/engine/map_matching/hidden_markov_model.hpp diff --git a/algorithms/object_encoder.hpp b/include/engine/object_encoder.hpp similarity index 100% rename from algorithms/object_encoder.hpp rename to include/engine/object_encoder.hpp diff --git a/library/osrm_impl.hpp b/include/engine/osrm_impl.hpp similarity index 100% rename from library/osrm_impl.hpp rename to include/engine/osrm_impl.hpp diff --git a/data_structures/phantom_node.hpp b/include/engine/phantom_node.hpp similarity index 100% rename from data_structures/phantom_node.hpp rename to include/engine/phantom_node.hpp diff --git a/plugins/distance_table.hpp b/include/engine/plugins/distance_table.hpp similarity index 100% rename from plugins/distance_table.hpp rename to include/engine/plugins/distance_table.hpp diff --git a/plugins/hello_world.hpp b/include/engine/plugins/hello_world.hpp similarity index 100% rename from plugins/hello_world.hpp rename to include/engine/plugins/hello_world.hpp diff --git a/plugins/match.hpp b/include/engine/plugins/match.hpp similarity index 100% rename from plugins/match.hpp rename to include/engine/plugins/match.hpp diff --git a/plugins/nearest.hpp b/include/engine/plugins/nearest.hpp similarity index 100% rename from plugins/nearest.hpp rename to include/engine/plugins/nearest.hpp diff --git a/plugins/plugin_base.hpp b/include/engine/plugins/plugin_base.hpp similarity index 100% rename from plugins/plugin_base.hpp rename to include/engine/plugins/plugin_base.hpp diff --git a/plugins/timestamp.hpp b/include/engine/plugins/timestamp.hpp similarity index 100% rename from plugins/timestamp.hpp rename to include/engine/plugins/timestamp.hpp diff --git a/plugins/trip.hpp b/include/engine/plugins/trip.hpp similarity index 100% rename from plugins/trip.hpp rename to include/engine/plugins/trip.hpp diff --git a/plugins/viaroute.hpp b/include/engine/plugins/viaroute.hpp similarity index 100% rename from plugins/viaroute.hpp rename to include/engine/plugins/viaroute.hpp diff --git a/algorithms/polyline_compressor.hpp b/include/engine/polyline_compressor.hpp similarity index 100% rename from algorithms/polyline_compressor.hpp rename to include/engine/polyline_compressor.hpp diff --git a/algorithms/polyline_formatter.hpp b/include/engine/polyline_formatter.hpp similarity index 100% rename from algorithms/polyline_formatter.hpp rename to include/engine/polyline_formatter.hpp diff --git a/algorithms/route_name_extraction.hpp b/include/engine/route_name_extraction.hpp similarity index 100% rename from algorithms/route_name_extraction.hpp rename to include/engine/route_name_extraction.hpp diff --git a/routing_algorithms/alternative_path.hpp b/include/engine/routing_algorithms/alternative_path.hpp similarity index 100% rename from routing_algorithms/alternative_path.hpp rename to include/engine/routing_algorithms/alternative_path.hpp diff --git a/routing_algorithms/direct_shortest_path.hpp b/include/engine/routing_algorithms/direct_shortest_path.hpp similarity index 100% rename from routing_algorithms/direct_shortest_path.hpp rename to include/engine/routing_algorithms/direct_shortest_path.hpp diff --git a/routing_algorithms/many_to_many.hpp b/include/engine/routing_algorithms/many_to_many.hpp similarity index 100% rename from routing_algorithms/many_to_many.hpp rename to include/engine/routing_algorithms/many_to_many.hpp diff --git a/routing_algorithms/map_matching.hpp b/include/engine/routing_algorithms/map_matching.hpp similarity index 100% rename from routing_algorithms/map_matching.hpp rename to include/engine/routing_algorithms/map_matching.hpp diff --git a/routing_algorithms/routing_base.hpp b/include/engine/routing_algorithms/routing_base.hpp similarity index 100% rename from routing_algorithms/routing_base.hpp rename to include/engine/routing_algorithms/routing_base.hpp diff --git a/routing_algorithms/shortest_path.hpp b/include/engine/routing_algorithms/shortest_path.hpp similarity index 100% rename from routing_algorithms/shortest_path.hpp rename to include/engine/routing_algorithms/shortest_path.hpp diff --git a/data_structures/search_engine.hpp b/include/engine/search_engine.hpp similarity index 100% rename from data_structures/search_engine.hpp rename to include/engine/search_engine.hpp diff --git a/data_structures/search_engine_data.hpp b/include/engine/search_engine_data.hpp similarity index 100% rename from data_structures/search_engine_data.hpp rename to include/engine/search_engine_data.hpp diff --git a/data_structures/segment_information.hpp b/include/engine/segment_information.hpp similarity index 100% rename from data_structures/segment_information.hpp rename to include/engine/segment_information.hpp diff --git a/algorithms/trip_brute_force.hpp b/include/engine/trip/trip_brute_force.hpp similarity index 100% rename from algorithms/trip_brute_force.hpp rename to include/engine/trip/trip_brute_force.hpp diff --git a/algorithms/trip_farthest_insertion.hpp b/include/engine/trip/trip_farthest_insertion.hpp similarity index 100% rename from algorithms/trip_farthest_insertion.hpp rename to include/engine/trip/trip_farthest_insertion.hpp diff --git a/algorithms/trip_nearest_neighbour.hpp b/include/engine/trip/trip_nearest_neighbour.hpp similarity index 100% rename from algorithms/trip_nearest_neighbour.hpp rename to include/engine/trip/trip_nearest_neighbour.hpp diff --git a/algorithms/trip_tabu_search.hpp b/include/engine/trip/trip_tabu_search.hpp similarity index 100% rename from algorithms/trip_tabu_search.hpp rename to include/engine/trip/trip_tabu_search.hpp diff --git a/data_structures/compressed_edge_container.hpp b/include/extractor/compressed_edge_container.hpp similarity index 100% rename from data_structures/compressed_edge_container.hpp rename to include/extractor/compressed_edge_container.hpp diff --git a/extractor/edge_based_graph_factory.hpp b/include/extractor/edge_based_graph_factory.hpp similarity index 100% rename from extractor/edge_based_graph_factory.hpp rename to include/extractor/edge_based_graph_factory.hpp diff --git a/data_structures/edge_based_node.hpp b/include/extractor/edge_based_node.hpp similarity index 100% rename from data_structures/edge_based_node.hpp rename to include/extractor/edge_based_node.hpp diff --git a/data_structures/external_memory_node.hpp b/include/extractor/external_memory_node.hpp similarity index 100% rename from data_structures/external_memory_node.hpp rename to include/extractor/external_memory_node.hpp diff --git a/extractor/extraction_containers.hpp b/include/extractor/extraction_containers.hpp similarity index 100% rename from extractor/extraction_containers.hpp rename to include/extractor/extraction_containers.hpp diff --git a/extractor/extraction_helper_functions.hpp b/include/extractor/extraction_helper_functions.hpp similarity index 100% rename from extractor/extraction_helper_functions.hpp rename to include/extractor/extraction_helper_functions.hpp diff --git a/extractor/extraction_node.hpp b/include/extractor/extraction_node.hpp similarity index 100% rename from extractor/extraction_node.hpp rename to include/extractor/extraction_node.hpp diff --git a/extractor/extraction_way.hpp b/include/extractor/extraction_way.hpp similarity index 100% rename from extractor/extraction_way.hpp rename to include/extractor/extraction_way.hpp diff --git a/extractor/extractor.hpp b/include/extractor/extractor.hpp similarity index 100% rename from extractor/extractor.hpp rename to include/extractor/extractor.hpp diff --git a/extractor/extractor_callbacks.hpp b/include/extractor/extractor_callbacks.hpp similarity index 100% rename from extractor/extractor_callbacks.hpp rename to include/extractor/extractor_callbacks.hpp diff --git a/extractor/extractor_options.hpp b/include/extractor/extractor_options.hpp similarity index 100% rename from extractor/extractor_options.hpp rename to include/extractor/extractor_options.hpp diff --git a/extractor/first_and_last_segment_of_way.hpp b/include/extractor/first_and_last_segment_of_way.hpp similarity index 100% rename from extractor/first_and_last_segment_of_way.hpp rename to include/extractor/first_and_last_segment_of_way.hpp diff --git a/algorithms/graph_compressor.hpp b/include/extractor/graph_compressor.hpp similarity index 100% rename from algorithms/graph_compressor.hpp rename to include/extractor/graph_compressor.hpp diff --git a/data_structures/import_edge.hpp b/include/extractor/import_edge.hpp similarity index 100% rename from data_structures/import_edge.hpp rename to include/extractor/import_edge.hpp diff --git a/extractor/internal_extractor_edge.hpp b/include/extractor/internal_extractor_edge.hpp similarity index 100% rename from extractor/internal_extractor_edge.hpp rename to include/extractor/internal_extractor_edge.hpp diff --git a/data_structures/node_id.hpp b/include/extractor/node_id.hpp similarity index 100% rename from data_structures/node_id.hpp rename to include/extractor/node_id.hpp diff --git a/data_structures/original_edge_data.hpp b/include/extractor/original_edge_data.hpp similarity index 100% rename from data_structures/original_edge_data.hpp rename to include/extractor/original_edge_data.hpp diff --git a/data_structures/query_node.hpp b/include/extractor/query_node.hpp similarity index 100% rename from data_structures/query_node.hpp rename to include/extractor/query_node.hpp diff --git a/data_structures/raster_source.hpp b/include/extractor/raster_source.hpp similarity index 100% rename from data_structures/raster_source.hpp rename to include/extractor/raster_source.hpp diff --git a/data_structures/restriction.hpp b/include/extractor/restriction.hpp similarity index 100% rename from data_structures/restriction.hpp rename to include/extractor/restriction.hpp diff --git a/data_structures/restriction_map.hpp b/include/extractor/restriction_map.hpp similarity index 100% rename from data_structures/restriction_map.hpp rename to include/extractor/restriction_map.hpp diff --git a/extractor/restriction_parser.hpp b/include/extractor/restriction_parser.hpp similarity index 100% rename from extractor/restriction_parser.hpp rename to include/extractor/restriction_parser.hpp diff --git a/extractor/scripting_environment.hpp b/include/extractor/scripting_environment.hpp similarity index 100% rename from extractor/scripting_environment.hpp rename to include/extractor/scripting_environment.hpp diff --git a/extractor/speed_profile.hpp b/include/extractor/speed_profile.hpp similarity index 100% rename from extractor/speed_profile.hpp rename to include/extractor/speed_profile.hpp diff --git a/algorithms/tarjan_scc.hpp b/include/extractor/tarjan_scc.hpp similarity index 100% rename from algorithms/tarjan_scc.hpp rename to include/extractor/tarjan_scc.hpp diff --git a/data_structures/travel_mode.hpp b/include/extractor/travel_mode.hpp similarity index 100% rename from data_structures/travel_mode.hpp rename to include/extractor/travel_mode.hpp diff --git a/data_structures/turn_instructions.hpp b/include/extractor/turn_instructions.hpp similarity index 100% rename from data_structures/turn_instructions.hpp rename to include/extractor/turn_instructions.hpp diff --git a/server/api_grammar.hpp b/include/server/api_grammar.hpp similarity index 100% rename from server/api_grammar.hpp rename to include/server/api_grammar.hpp diff --git a/server/connection.hpp b/include/server/connection.hpp similarity index 100% rename from server/connection.hpp rename to include/server/connection.hpp diff --git a/server/http/compression_type.hpp b/include/server/http/compression_type.hpp similarity index 100% rename from server/http/compression_type.hpp rename to include/server/http/compression_type.hpp diff --git a/server/http/header.hpp b/include/server/http/header.hpp similarity index 100% rename from server/http/header.hpp rename to include/server/http/header.hpp diff --git a/server/http/reply.hpp b/include/server/http/reply.hpp similarity index 100% rename from server/http/reply.hpp rename to include/server/http/reply.hpp diff --git a/server/http/request.hpp b/include/server/http/request.hpp similarity index 100% rename from server/http/request.hpp rename to include/server/http/request.hpp diff --git a/server/request_handler.hpp b/include/server/request_handler.hpp similarity index 100% rename from server/request_handler.hpp rename to include/server/request_handler.hpp diff --git a/server/request_parser.hpp b/include/server/request_parser.hpp similarity index 100% rename from server/request_parser.hpp rename to include/server/request_parser.hpp diff --git a/server/server.hpp b/include/server/server.hpp similarity index 100% rename from server/server.hpp rename to include/server/server.hpp diff --git a/util/bearing.hpp b/include/util/bearing.hpp similarity index 100% rename from util/bearing.hpp rename to include/util/bearing.hpp diff --git a/data_structures/binary_heap.hpp b/include/util/binary_heap.hpp similarity index 100% rename from data_structures/binary_heap.hpp rename to include/util/binary_heap.hpp diff --git a/util/cast.hpp b/include/util/cast.hpp similarity index 100% rename from util/cast.hpp rename to include/util/cast.hpp diff --git a/util/compute_angle.hpp b/include/util/compute_angle.hpp similarity index 100% rename from util/compute_angle.hpp rename to include/util/compute_angle.hpp diff --git a/util/container.hpp b/include/util/container.hpp similarity index 100% rename from util/container.hpp rename to include/util/container.hpp diff --git a/algorithms/coordinate_calculation.hpp b/include/util/coordinate_calculation.hpp similarity index 100% rename from algorithms/coordinate_calculation.hpp rename to include/util/coordinate_calculation.hpp diff --git a/util/datastore_options.hpp b/include/util/datastore_options.hpp similarity index 100% rename from util/datastore_options.hpp rename to include/util/datastore_options.hpp diff --git a/data_structures/deallocating_vector.hpp b/include/util/deallocating_vector.hpp similarity index 100% rename from data_structures/deallocating_vector.hpp rename to include/util/deallocating_vector.hpp diff --git a/util/debug_geometry.hpp b/include/util/debug_geometry.hpp similarity index 100% rename from util/debug_geometry.hpp rename to include/util/debug_geometry.hpp diff --git a/util/dist_table_wrapper.hpp b/include/util/dist_table_wrapper.hpp similarity index 100% rename from util/dist_table_wrapper.hpp rename to include/util/dist_table_wrapper.hpp diff --git a/data_structures/dynamic_graph.hpp b/include/util/dynamic_graph.hpp similarity index 100% rename from data_structures/dynamic_graph.hpp rename to include/util/dynamic_graph.hpp diff --git a/util/fingerprint.hpp b/include/util/fingerprint.hpp similarity index 100% rename from util/fingerprint.hpp rename to include/util/fingerprint.hpp diff --git a/util/fingerprint_impl.hpp.in b/include/util/fingerprint_impl.hpp.in similarity index 100% rename from util/fingerprint_impl.hpp.in rename to include/util/fingerprint_impl.hpp.in diff --git a/data_structures/fixed_point_number.hpp b/include/util/fixed_point_number.hpp similarity index 100% rename from data_structures/fixed_point_number.hpp rename to include/util/fixed_point_number.hpp diff --git a/util/floating_point.hpp b/include/util/floating_point.hpp similarity index 100% rename from util/floating_point.hpp rename to include/util/floating_point.hpp diff --git a/util/graph_loader.hpp b/include/util/graph_loader.hpp similarity index 100% rename from util/graph_loader.hpp rename to include/util/graph_loader.hpp diff --git a/util/graph_utils.hpp b/include/util/graph_utils.hpp similarity index 100% rename from util/graph_utils.hpp rename to include/util/graph_utils.hpp diff --git a/data_structures/hilbert_value.hpp b/include/util/hilbert_value.hpp similarity index 100% rename from data_structures/hilbert_value.hpp rename to include/util/hilbert_value.hpp diff --git a/util/ini_file.hpp b/include/util/ini_file.hpp similarity index 100% rename from util/ini_file.hpp rename to include/util/ini_file.hpp diff --git a/util/integer_range.hpp b/include/util/integer_range.hpp similarity index 100% rename from util/integer_range.hpp rename to include/util/integer_range.hpp diff --git a/util/iso_8601_duration_parser.hpp b/include/util/iso_8601_duration_parser.hpp similarity index 100% rename from util/iso_8601_duration_parser.hpp rename to include/util/iso_8601_duration_parser.hpp diff --git a/util/json_logger.hpp b/include/util/json_logger.hpp similarity index 100% rename from util/json_logger.hpp rename to include/util/json_logger.hpp diff --git a/util/json_renderer.hpp b/include/util/json_renderer.hpp similarity index 100% rename from util/json_renderer.hpp rename to include/util/json_renderer.hpp diff --git a/util/json_util.hpp b/include/util/json_util.hpp similarity index 100% rename from util/json_util.hpp rename to include/util/json_util.hpp diff --git a/util/lua_util.hpp b/include/util/lua_util.hpp similarity index 100% rename from util/lua_util.hpp rename to include/util/lua_util.hpp diff --git a/util/make_unique.hpp b/include/util/make_unique.hpp similarity index 100% rename from util/make_unique.hpp rename to include/util/make_unique.hpp diff --git a/util/matching_debug_info.hpp b/include/util/matching_debug_info.hpp similarity index 100% rename from util/matching_debug_info.hpp rename to include/util/matching_debug_info.hpp diff --git a/data_structures/matrix_graph_wrapper.hpp b/include/util/matrix_graph_wrapper.hpp similarity index 100% rename from data_structures/matrix_graph_wrapper.hpp rename to include/util/matrix_graph_wrapper.hpp diff --git a/util/mercator.hpp b/include/util/mercator.hpp similarity index 100% rename from util/mercator.hpp rename to include/util/mercator.hpp diff --git a/data_structures/node_based_graph.hpp b/include/util/node_based_graph.hpp similarity index 100% rename from data_structures/node_based_graph.hpp rename to include/util/node_based_graph.hpp diff --git a/util/osrm_exception.hpp b/include/util/osrm_exception.hpp similarity index 100% rename from util/osrm_exception.hpp rename to include/util/osrm_exception.hpp diff --git a/data_structures/percent.hpp b/include/util/percent.hpp similarity index 100% rename from data_structures/percent.hpp rename to include/util/percent.hpp diff --git a/util/range_algorithms.hpp b/include/util/range_algorithms.hpp similarity index 100% rename from util/range_algorithms.hpp rename to include/util/range_algorithms.hpp diff --git a/data_structures/range_table.hpp b/include/util/range_table.hpp similarity index 100% rename from data_structures/range_table.hpp rename to include/util/range_table.hpp diff --git a/data_structures/rectangle.hpp b/include/util/rectangle.hpp similarity index 100% rename from data_structures/rectangle.hpp rename to include/util/rectangle.hpp diff --git a/util/routed_options.hpp b/include/util/routed_options.hpp similarity index 100% rename from util/routed_options.hpp rename to include/util/routed_options.hpp diff --git a/data_structures/shared_memory_vector_wrapper.hpp b/include/util/shared_memory_vector_wrapper.hpp similarity index 100% rename from data_structures/shared_memory_vector_wrapper.hpp rename to include/util/shared_memory_vector_wrapper.hpp diff --git a/util/simple_logger.hpp b/include/util/simple_logger.hpp similarity index 100% rename from util/simple_logger.hpp rename to include/util/simple_logger.hpp diff --git a/data_structures/static_graph.hpp b/include/util/static_graph.hpp similarity index 100% rename from data_structures/static_graph.hpp rename to include/util/static_graph.hpp diff --git a/data_structures/static_rtree.hpp b/include/util/static_rtree.hpp similarity index 100% rename from data_structures/static_rtree.hpp rename to include/util/static_rtree.hpp diff --git a/util/std_hash.hpp b/include/util/std_hash.hpp similarity index 100% rename from util/std_hash.hpp rename to include/util/std_hash.hpp diff --git a/util/string_util.hpp b/include/util/string_util.hpp similarity index 100% rename from util/string_util.hpp rename to include/util/string_util.hpp diff --git a/util/timing_util.hpp b/include/util/timing_util.hpp similarity index 100% rename from util/timing_util.hpp rename to include/util/timing_util.hpp diff --git a/data_structures/tribool.hpp b/include/util/tribool.hpp similarity index 100% rename from data_structures/tribool.hpp rename to include/util/tribool.hpp diff --git a/util/trigonometry_table.hpp b/include/util/trigonometry_table.hpp similarity index 100% rename from util/trigonometry_table.hpp rename to include/util/trigonometry_table.hpp diff --git a/typedefs.h b/include/util/typedefs.hpp similarity index 100% rename from typedefs.h rename to include/util/typedefs.hpp diff --git a/util/version.hpp.in b/include/util/version.hpp.in similarity index 100% rename from util/version.hpp.in rename to include/util/version.hpp.in diff --git a/util/xml_renderer.hpp b/include/util/xml_renderer.hpp similarity index 100% rename from util/xml_renderer.hpp rename to include/util/xml_renderer.hpp diff --git a/data_structures/xor_fast_hash.hpp b/include/util/xor_fast_hash.hpp similarity index 100% rename from data_structures/xor_fast_hash.hpp rename to include/util/xor_fast_hash.hpp diff --git a/data_structures/xor_fast_hash_storage.hpp b/include/util/xor_fast_hash_storage.hpp similarity index 100% rename from data_structures/xor_fast_hash_storage.hpp rename to include/util/xor_fast_hash_storage.hpp diff --git a/benchmarks/static_rtree.cpp b/src/benchmarks/static_rtree.cpp similarity index 100% rename from benchmarks/static_rtree.cpp rename to src/benchmarks/static_rtree.cpp diff --git a/contractor/contractor_options.cpp b/src/contractor/contractor_options.cpp similarity index 100% rename from contractor/contractor_options.cpp rename to src/contractor/contractor_options.cpp diff --git a/contractor/processing_chain.cpp b/src/contractor/processing_chain.cpp similarity index 100% rename from contractor/processing_chain.cpp rename to src/contractor/processing_chain.cpp diff --git a/descriptors/description_factory.cpp b/src/engine/descriptors/description_factory.cpp similarity index 100% rename from descriptors/description_factory.cpp rename to src/engine/descriptors/description_factory.cpp diff --git a/algorithms/douglas_peucker.cpp b/src/engine/douglas_peucker.cpp similarity index 100% rename from algorithms/douglas_peucker.cpp rename to src/engine/douglas_peucker.cpp diff --git a/library/osrm_impl.cpp b/src/engine/osrm_impl.cpp similarity index 100% rename from library/osrm_impl.cpp rename to src/engine/osrm_impl.cpp diff --git a/data_structures/phantom_node.cpp b/src/engine/phantom_node.cpp similarity index 100% rename from data_structures/phantom_node.cpp rename to src/engine/phantom_node.cpp diff --git a/algorithms/polyline_compressor.cpp b/src/engine/polyline_compressor.cpp similarity index 100% rename from algorithms/polyline_compressor.cpp rename to src/engine/polyline_compressor.cpp diff --git a/algorithms/polyline_formatter.cpp b/src/engine/polyline_formatter.cpp similarity index 100% rename from algorithms/polyline_formatter.cpp rename to src/engine/polyline_formatter.cpp diff --git a/data_structures/route_parameters.cpp b/src/engine/route_parameters.cpp similarity index 100% rename from data_structures/route_parameters.cpp rename to src/engine/route_parameters.cpp diff --git a/data_structures/search_engine_data.cpp b/src/engine/search_engine_data.cpp similarity index 100% rename from data_structures/search_engine_data.cpp rename to src/engine/search_engine_data.cpp diff --git a/data_structures/compressed_edge_container.cpp b/src/extractor/compressed_edge_container.cpp similarity index 100% rename from data_structures/compressed_edge_container.cpp rename to src/extractor/compressed_edge_container.cpp diff --git a/extractor/edge_based_graph_factory.cpp b/src/extractor/edge_based_graph_factory.cpp similarity index 100% rename from extractor/edge_based_graph_factory.cpp rename to src/extractor/edge_based_graph_factory.cpp diff --git a/data_structures/external_memory_node.cpp b/src/extractor/external_memory_node.cpp similarity index 100% rename from data_structures/external_memory_node.cpp rename to src/extractor/external_memory_node.cpp diff --git a/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp similarity index 100% rename from extractor/extraction_containers.cpp rename to src/extractor/extraction_containers.cpp diff --git a/extractor/extractor.cpp b/src/extractor/extractor.cpp similarity index 100% rename from extractor/extractor.cpp rename to src/extractor/extractor.cpp diff --git a/extractor/extractor_callbacks.cpp b/src/extractor/extractor_callbacks.cpp similarity index 100% rename from extractor/extractor_callbacks.cpp rename to src/extractor/extractor_callbacks.cpp diff --git a/extractor/extractor_options.cpp b/src/extractor/extractor_options.cpp similarity index 100% rename from extractor/extractor_options.cpp rename to src/extractor/extractor_options.cpp diff --git a/algorithms/graph_compressor.cpp b/src/extractor/graph_compressor.cpp similarity index 100% rename from algorithms/graph_compressor.cpp rename to src/extractor/graph_compressor.cpp diff --git a/data_structures/import_edge.cpp b/src/extractor/import_edge.cpp similarity index 100% rename from data_structures/import_edge.cpp rename to src/extractor/import_edge.cpp diff --git a/data_structures/raster_source.cpp b/src/extractor/raster_source.cpp similarity index 100% rename from data_structures/raster_source.cpp rename to src/extractor/raster_source.cpp diff --git a/data_structures/restriction_map.cpp b/src/extractor/restriction_map.cpp similarity index 100% rename from data_structures/restriction_map.cpp rename to src/extractor/restriction_map.cpp diff --git a/extractor/restriction_parser.cpp b/src/extractor/restriction_parser.cpp similarity index 100% rename from extractor/restriction_parser.cpp rename to src/extractor/restriction_parser.cpp diff --git a/extractor/scripting_environment.cpp b/src/extractor/scripting_environment.cpp similarity index 100% rename from extractor/scripting_environment.cpp rename to src/extractor/scripting_environment.cpp diff --git a/server/connection.cpp b/src/server/connection.cpp similarity index 100% rename from server/connection.cpp rename to src/server/connection.cpp diff --git a/server/http/reply.cpp b/src/server/http/reply.cpp similarity index 100% rename from server/http/reply.cpp rename to src/server/http/reply.cpp diff --git a/server/request_handler.cpp b/src/server/request_handler.cpp similarity index 100% rename from server/request_handler.cpp rename to src/server/request_handler.cpp diff --git a/server/request_parser.cpp b/src/server/request_parser.cpp similarity index 100% rename from server/request_parser.cpp rename to src/server/request_parser.cpp diff --git a/tools/.gitignore b/src/tools/.gitignore similarity index 100% rename from tools/.gitignore rename to src/tools/.gitignore diff --git a/tools/check-hsgr.cpp b/src/tools/check-hsgr.cpp similarity index 100% rename from tools/check-hsgr.cpp rename to src/tools/check-hsgr.cpp diff --git a/tools/components.cpp b/src/tools/components.cpp similarity index 100% rename from tools/components.cpp rename to src/tools/components.cpp diff --git a/prepare.cpp b/src/tools/contract.cpp similarity index 100% rename from prepare.cpp rename to src/tools/contract.cpp diff --git a/datastore.cpp b/src/tools/datastore.cpp similarity index 100% rename from datastore.cpp rename to src/tools/datastore.cpp diff --git a/extract.cpp b/src/tools/extract.cpp similarity index 100% rename from extract.cpp rename to src/tools/extract.cpp diff --git a/tools/io-benchmark.cpp b/src/tools/io-benchmark.cpp similarity index 100% rename from tools/io-benchmark.cpp rename to src/tools/io-benchmark.cpp diff --git a/routed.cpp b/src/tools/routed.cpp similarity index 100% rename from routed.cpp rename to src/tools/routed.cpp diff --git a/tools/simpleclient.cpp b/src/tools/simpleclient.cpp similarity index 100% rename from tools/simpleclient.cpp rename to src/tools/simpleclient.cpp diff --git a/tools/springclean.cpp b/src/tools/springclean.cpp similarity index 100% rename from tools/springclean.cpp rename to src/tools/springclean.cpp diff --git a/tools/unlock_all_mutexes.cpp b/src/tools/unlock_all_mutexes.cpp similarity index 100% rename from tools/unlock_all_mutexes.cpp rename to src/tools/unlock_all_mutexes.cpp diff --git a/util/compute_angle.cpp b/src/util/compute_angle.cpp similarity index 100% rename from util/compute_angle.cpp rename to src/util/compute_angle.cpp diff --git a/data_structures/coordinate.cpp b/src/util/coordinate.cpp similarity index 100% rename from data_structures/coordinate.cpp rename to src/util/coordinate.cpp diff --git a/algorithms/coordinate_calculation.cpp b/src/util/coordinate_calculation.cpp similarity index 100% rename from algorithms/coordinate_calculation.cpp rename to src/util/coordinate_calculation.cpp diff --git a/util/fingerprint.cpp b/src/util/fingerprint.cpp similarity index 100% rename from util/fingerprint.cpp rename to src/util/fingerprint.cpp diff --git a/data_structures/hilbert_value.cpp b/src/util/hilbert_value.cpp similarity index 100% rename from data_structures/hilbert_value.cpp rename to src/util/hilbert_value.cpp diff --git a/util/mercator.cpp b/src/util/mercator.cpp similarity index 100% rename from util/mercator.cpp rename to src/util/mercator.cpp diff --git a/util/osrm_exception.cpp b/src/util/osrm_exception.cpp similarity index 100% rename from util/osrm_exception.cpp rename to src/util/osrm_exception.cpp diff --git a/util/simple_logger.cpp b/src/util/simple_logger.cpp similarity index 100% rename from util/simple_logger.cpp rename to src/util/simple_logger.cpp From 078f71c14411d13cd5520b772064616738298962 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Sat, 2 Jan 2016 17:24:46 +0100 Subject: [PATCH 2/7] Move files in unit_tests around --- unit_tests/{algorithms => engine}/douglas_peucker.cpp | 0 unit_tests/{algorithms => engine}/geometry_string.cpp | 0 unit_tests/{algorithm_tests.cpp => engine_tests.cpp} | 2 +- .../compressed_edge_container.cpp | 0 unit_tests/{algorithms => extractor}/graph_compressor.cpp | 0 unit_tests/{data_structures => extractor}/raster_source.cpp | 0 unit_tests/{datastructure_tests.cpp => extractor_tests.cpp} | 2 +- unit_tests/{data_structures => util}/binary_heap.cpp | 0 unit_tests/{data_structures => util}/coordinate.cpp | 0 unit_tests/{algorithms => util}/duration_parsing.cpp | 0 unit_tests/{data_structures => util}/dynamic_graph.cpp | 0 unit_tests/{data_structures => util}/range_table.cpp | 0 unit_tests/{data_structures => util}/static_graph.cpp | 0 unit_tests/{data_structures => util}/static_rtree.cpp | 0 unit_tests/{algorithms => util}/string_util.cpp | 0 15 files changed, 2 insertions(+), 2 deletions(-) rename unit_tests/{algorithms => engine}/douglas_peucker.cpp (100%) rename unit_tests/{algorithms => engine}/geometry_string.cpp (100%) rename unit_tests/{algorithm_tests.cpp => engine_tests.cpp} (97%) rename unit_tests/{data_structures => extractor}/compressed_edge_container.cpp (100%) rename unit_tests/{algorithms => extractor}/graph_compressor.cpp (100%) rename unit_tests/{data_structures => extractor}/raster_source.cpp (100%) rename unit_tests/{datastructure_tests.cpp => extractor_tests.cpp} (96%) rename unit_tests/{data_structures => util}/binary_heap.cpp (100%) rename unit_tests/{data_structures => util}/coordinate.cpp (100%) rename unit_tests/{algorithms => util}/duration_parsing.cpp (100%) rename unit_tests/{data_structures => util}/dynamic_graph.cpp (100%) rename unit_tests/{data_structures => util}/range_table.cpp (100%) rename unit_tests/{data_structures => util}/static_graph.cpp (100%) rename unit_tests/{data_structures => util}/static_rtree.cpp (100%) rename unit_tests/{algorithms => util}/string_util.cpp (100%) diff --git a/unit_tests/algorithms/douglas_peucker.cpp b/unit_tests/engine/douglas_peucker.cpp similarity index 100% rename from unit_tests/algorithms/douglas_peucker.cpp rename to unit_tests/engine/douglas_peucker.cpp diff --git a/unit_tests/algorithms/geometry_string.cpp b/unit_tests/engine/geometry_string.cpp similarity index 100% rename from unit_tests/algorithms/geometry_string.cpp rename to unit_tests/engine/geometry_string.cpp diff --git a/unit_tests/algorithm_tests.cpp b/unit_tests/engine_tests.cpp similarity index 97% rename from unit_tests/algorithm_tests.cpp rename to unit_tests/engine_tests.cpp index 0a9f3fdff1d..1a2f88ed0b7 100644 --- a/unit_tests/algorithm_tests.cpp +++ b/unit_tests/engine_tests.cpp @@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define BOOST_TEST_MODULE algorithm tests +#define BOOST_TEST_MODULE engine tests #include diff --git a/unit_tests/data_structures/compressed_edge_container.cpp b/unit_tests/extractor/compressed_edge_container.cpp similarity index 100% rename from unit_tests/data_structures/compressed_edge_container.cpp rename to unit_tests/extractor/compressed_edge_container.cpp diff --git a/unit_tests/algorithms/graph_compressor.cpp b/unit_tests/extractor/graph_compressor.cpp similarity index 100% rename from unit_tests/algorithms/graph_compressor.cpp rename to unit_tests/extractor/graph_compressor.cpp diff --git a/unit_tests/data_structures/raster_source.cpp b/unit_tests/extractor/raster_source.cpp similarity index 100% rename from unit_tests/data_structures/raster_source.cpp rename to unit_tests/extractor/raster_source.cpp diff --git a/unit_tests/datastructure_tests.cpp b/unit_tests/extractor_tests.cpp similarity index 96% rename from unit_tests/datastructure_tests.cpp rename to unit_tests/extractor_tests.cpp index 850d619100e..25bc11dff4d 100644 --- a/unit_tests/datastructure_tests.cpp +++ b/unit_tests/extractor_tests.cpp @@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define BOOST_TEST_MODULE datastructure tests +#define BOOST_TEST_MODULE extractor tests #include diff --git a/unit_tests/data_structures/binary_heap.cpp b/unit_tests/util/binary_heap.cpp similarity index 100% rename from unit_tests/data_structures/binary_heap.cpp rename to unit_tests/util/binary_heap.cpp diff --git a/unit_tests/data_structures/coordinate.cpp b/unit_tests/util/coordinate.cpp similarity index 100% rename from unit_tests/data_structures/coordinate.cpp rename to unit_tests/util/coordinate.cpp diff --git a/unit_tests/algorithms/duration_parsing.cpp b/unit_tests/util/duration_parsing.cpp similarity index 100% rename from unit_tests/algorithms/duration_parsing.cpp rename to unit_tests/util/duration_parsing.cpp diff --git a/unit_tests/data_structures/dynamic_graph.cpp b/unit_tests/util/dynamic_graph.cpp similarity index 100% rename from unit_tests/data_structures/dynamic_graph.cpp rename to unit_tests/util/dynamic_graph.cpp diff --git a/unit_tests/data_structures/range_table.cpp b/unit_tests/util/range_table.cpp similarity index 100% rename from unit_tests/data_structures/range_table.cpp rename to unit_tests/util/range_table.cpp diff --git a/unit_tests/data_structures/static_graph.cpp b/unit_tests/util/static_graph.cpp similarity index 100% rename from unit_tests/data_structures/static_graph.cpp rename to unit_tests/util/static_graph.cpp diff --git a/unit_tests/data_structures/static_rtree.cpp b/unit_tests/util/static_rtree.cpp similarity index 100% rename from unit_tests/data_structures/static_rtree.cpp rename to unit_tests/util/static_rtree.cpp diff --git a/unit_tests/algorithms/string_util.cpp b/unit_tests/util/string_util.cpp similarity index 100% rename from unit_tests/algorithms/string_util.cpp rename to unit_tests/util/string_util.cpp From d936009ea1e028f25bae4c1ab16440e895b2685b Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Sat, 2 Jan 2016 14:44:47 +0100 Subject: [PATCH 3/7] DOS -> UNIX file format --- src/extractor/restriction_parser.cpp | 512 +++++++++++++-------------- 1 file changed, 256 insertions(+), 256 deletions(-) diff --git a/src/extractor/restriction_parser.cpp b/src/extractor/restriction_parser.cpp index a3c2a5d25b4..6a54cde2007 100644 --- a/src/extractor/restriction_parser.cpp +++ b/src/extractor/restriction_parser.cpp @@ -1,256 +1,256 @@ -/* - -Copyright (c) 2015, Project OSRM contributors -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ - -#include "restriction_parser.hpp" -#include "extraction_way.hpp" - -#include "../data_structures/external_memory_node.hpp" -#include "../util/lua_util.hpp" -#include "../util/osrm_exception.hpp" -#include "../util/simple_logger.hpp" - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include - -namespace -{ -int lua_error_callback(lua_State *lua_state) -{ - std::string error_msg = lua_tostring(lua_state, -1); - throw osrm::exception("ERROR occurred in profile script:\n" + error_msg); -} -} - -RestrictionParser::RestrictionParser(lua_State *lua_state) : use_turn_restrictions(true) -{ - ReadUseRestrictionsSetting(lua_state); - - if (use_turn_restrictions) - { - ReadRestrictionExceptions(lua_state); - } -} - -void RestrictionParser::ReadUseRestrictionsSetting(lua_State *lua_state) -{ - if (0 == luaL_dostring(lua_state, "return use_turn_restrictions\n") && - lua_isboolean(lua_state, -1)) - { - use_turn_restrictions = lua_toboolean(lua_state, -1); - } - - if (use_turn_restrictions) - { - SimpleLogger().Write() << "Using turn restrictions"; - } - else - { - SimpleLogger().Write() << "Ignoring turn restrictions"; - } -} - -void RestrictionParser::ReadRestrictionExceptions(lua_State *lua_state) -{ - if (lua_function_exists(lua_state, "get_exceptions")) - { - luabind::set_pcall_callback(&lua_error_callback); - // get list of turn restriction exceptions - luabind::call_function(lua_state, "get_exceptions", - boost::ref(restriction_exceptions)); - const unsigned exception_count = restriction_exceptions.size(); - SimpleLogger().Write() << "Found " << exception_count - << " exceptions to turn restrictions:"; - for (const std::string &str : restriction_exceptions) - { - SimpleLogger().Write() << " " << str; - } - } - else - { - SimpleLogger().Write() << "Found no exceptions to turn restrictions"; - } -} - -/** - * Tries to parse an relation as turn restriction. This can fail for a number of - * reasons, this the return type is a boost::optional. - * - * Some restrictions can also be ignored: See the ```get_exceptions``` function - * in the corresponding profile. - */ -boost::optional -RestrictionParser::TryParse(const osmium::Relation &relation) const -{ - // return if turn restrictions should be ignored - if (!use_turn_restrictions) - { - return {}; - } - - osmium::tags::KeyPrefixFilter filter(false); - filter.add(true, "restriction"); - - const osmium::TagList &tag_list = relation.tags(); - - osmium::tags::KeyPrefixFilter::iterator fi_begin(filter, tag_list.begin(), tag_list.end()); - osmium::tags::KeyPrefixFilter::iterator fi_end(filter, tag_list.end(), tag_list.end()); - - // if it's a restriction, continue; - if (std::distance(fi_begin, fi_end) == 0) - { - return {}; - } - - // check if the restriction should be ignored - const char *except = relation.get_value_by_key("except"); - if (except != nullptr && ShouldIgnoreRestriction(except)) - { - return {}; - } - - bool is_only_restriction = false; - - for (; fi_begin != fi_end; ++fi_begin) - { - const std::string key(fi_begin->key()); - const std::string value(fi_begin->value()); - - if (value.find("only_") == 0) - { - is_only_restriction = true; - } - - // if the "restriction*" key is longer than 11 chars, it is a conditional exception (i.e. - // "restriction:") - if (key.size() > 11) - { - const auto ex_suffix = [&](const std::string &exception) - { - return boost::algorithm::ends_with(key, exception); - }; - bool is_actually_restricted = - std::any_of(begin(restriction_exceptions), end(restriction_exceptions), ex_suffix); - - if (!is_actually_restricted) - { - return {}; - } - } - } - - InputRestrictionContainer restriction_container(is_only_restriction); - - for (const auto &member : relation.members()) - { - const char *role = member.role(); - if (strcmp("from", role) != 0 && strcmp("to", role) != 0 && strcmp("via", role) != 0) - { - continue; - } - - switch (member.type()) - { - case osmium::item_type::node: - // Make sure nodes appear only in the role if a via node - if (0 == strcmp("from", role) || 0 == strcmp("to", role)) - { - continue; - } - BOOST_ASSERT(0 == strcmp("via", role)); - - // set via node id - restriction_container.restriction.via.node = member.ref(); - break; - - case osmium::item_type::way: - BOOST_ASSERT(0 == strcmp("from", role) || 0 == strcmp("to", role) || - 0 == strcmp("via", role)); - if (0 == strcmp("from", role)) - { - restriction_container.restriction.from.way = member.ref(); - } - else if (0 == strcmp("to", role)) - { - restriction_container.restriction.to.way = member.ref(); - } - // else if (0 == strcmp("via", role)) - // { - // not yet suppported - // restriction_container.restriction.via.way = member.ref(); - // } - break; - case osmium::item_type::relation: - // not yet supported, but who knows what the future holds... - break; - default: - // shouldn't ever happen - break; - } - } - return boost::make_optional(std::move(restriction_container)); -} - -bool RestrictionParser::ShouldIgnoreRestriction(const std::string &except_tag_string) const -{ - // should this restriction be ignored? yes if there's an overlap between: - // a) the list of modes in the except tag of the restriction - // (except_tag_string), eg: except=bus;bicycle - // b) the lua profile defines a hierachy of modes, - // eg: [access, vehicle, bicycle] - - if (except_tag_string.empty()) - { - return false; - } - - // Be warned, this is quadratic work here, but we assume that - // only a few exceptions are actually defined. - std::vector exceptions; - boost::algorithm::split_regex(exceptions, except_tag_string, boost::regex("[;][ ]*")); - - return std::any_of(std::begin(exceptions), std::end(exceptions), - [&](const std::string ¤t_string) - { - if (std::end(restriction_exceptions) != - std::find(std::begin(restriction_exceptions), - std::end(restriction_exceptions), current_string)) - { - return true; - } - return false; - }); -} +/* + +Copyright (c) 2015, Project OSRM contributors +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ + +#include "restriction_parser.hpp" +#include "extraction_way.hpp" + +#include "../data_structures/external_memory_node.hpp" +#include "../util/lua_util.hpp" +#include "../util/osrm_exception.hpp" +#include "../util/simple_logger.hpp" + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include + +namespace +{ +int lua_error_callback(lua_State *lua_state) +{ + std::string error_msg = lua_tostring(lua_state, -1); + throw osrm::exception("ERROR occurred in profile script:\n" + error_msg); +} +} + +RestrictionParser::RestrictionParser(lua_State *lua_state) : use_turn_restrictions(true) +{ + ReadUseRestrictionsSetting(lua_state); + + if (use_turn_restrictions) + { + ReadRestrictionExceptions(lua_state); + } +} + +void RestrictionParser::ReadUseRestrictionsSetting(lua_State *lua_state) +{ + if (0 == luaL_dostring(lua_state, "return use_turn_restrictions\n") && + lua_isboolean(lua_state, -1)) + { + use_turn_restrictions = lua_toboolean(lua_state, -1); + } + + if (use_turn_restrictions) + { + SimpleLogger().Write() << "Using turn restrictions"; + } + else + { + SimpleLogger().Write() << "Ignoring turn restrictions"; + } +} + +void RestrictionParser::ReadRestrictionExceptions(lua_State *lua_state) +{ + if (lua_function_exists(lua_state, "get_exceptions")) + { + luabind::set_pcall_callback(&lua_error_callback); + // get list of turn restriction exceptions + luabind::call_function(lua_state, "get_exceptions", + boost::ref(restriction_exceptions)); + const unsigned exception_count = restriction_exceptions.size(); + SimpleLogger().Write() << "Found " << exception_count + << " exceptions to turn restrictions:"; + for (const std::string &str : restriction_exceptions) + { + SimpleLogger().Write() << " " << str; + } + } + else + { + SimpleLogger().Write() << "Found no exceptions to turn restrictions"; + } +} + +/** + * Tries to parse an relation as turn restriction. This can fail for a number of + * reasons, this the return type is a boost::optional. + * + * Some restrictions can also be ignored: See the ```get_exceptions``` function + * in the corresponding profile. + */ +boost::optional +RestrictionParser::TryParse(const osmium::Relation &relation) const +{ + // return if turn restrictions should be ignored + if (!use_turn_restrictions) + { + return {}; + } + + osmium::tags::KeyPrefixFilter filter(false); + filter.add(true, "restriction"); + + const osmium::TagList &tag_list = relation.tags(); + + osmium::tags::KeyPrefixFilter::iterator fi_begin(filter, tag_list.begin(), tag_list.end()); + osmium::tags::KeyPrefixFilter::iterator fi_end(filter, tag_list.end(), tag_list.end()); + + // if it's a restriction, continue; + if (std::distance(fi_begin, fi_end) == 0) + { + return {}; + } + + // check if the restriction should be ignored + const char *except = relation.get_value_by_key("except"); + if (except != nullptr && ShouldIgnoreRestriction(except)) + { + return {}; + } + + bool is_only_restriction = false; + + for (; fi_begin != fi_end; ++fi_begin) + { + const std::string key(fi_begin->key()); + const std::string value(fi_begin->value()); + + if (value.find("only_") == 0) + { + is_only_restriction = true; + } + + // if the "restriction*" key is longer than 11 chars, it is a conditional exception (i.e. + // "restriction:") + if (key.size() > 11) + { + const auto ex_suffix = [&](const std::string &exception) + { + return boost::algorithm::ends_with(key, exception); + }; + bool is_actually_restricted = + std::any_of(begin(restriction_exceptions), end(restriction_exceptions), ex_suffix); + + if (!is_actually_restricted) + { + return {}; + } + } + } + + InputRestrictionContainer restriction_container(is_only_restriction); + + for (const auto &member : relation.members()) + { + const char *role = member.role(); + if (strcmp("from", role) != 0 && strcmp("to", role) != 0 && strcmp("via", role) != 0) + { + continue; + } + + switch (member.type()) + { + case osmium::item_type::node: + // Make sure nodes appear only in the role if a via node + if (0 == strcmp("from", role) || 0 == strcmp("to", role)) + { + continue; + } + BOOST_ASSERT(0 == strcmp("via", role)); + + // set via node id + restriction_container.restriction.via.node = member.ref(); + break; + + case osmium::item_type::way: + BOOST_ASSERT(0 == strcmp("from", role) || 0 == strcmp("to", role) || + 0 == strcmp("via", role)); + if (0 == strcmp("from", role)) + { + restriction_container.restriction.from.way = member.ref(); + } + else if (0 == strcmp("to", role)) + { + restriction_container.restriction.to.way = member.ref(); + } + // else if (0 == strcmp("via", role)) + // { + // not yet suppported + // restriction_container.restriction.via.way = member.ref(); + // } + break; + case osmium::item_type::relation: + // not yet supported, but who knows what the future holds... + break; + default: + // shouldn't ever happen + break; + } + } + return boost::make_optional(std::move(restriction_container)); +} + +bool RestrictionParser::ShouldIgnoreRestriction(const std::string &except_tag_string) const +{ + // should this restriction be ignored? yes if there's an overlap between: + // a) the list of modes in the except tag of the restriction + // (except_tag_string), eg: except=bus;bicycle + // b) the lua profile defines a hierachy of modes, + // eg: [access, vehicle, bicycle] + + if (except_tag_string.empty()) + { + return false; + } + + // Be warned, this is quadratic work here, but we assume that + // only a few exceptions are actually defined. + std::vector exceptions; + boost::algorithm::split_regex(exceptions, except_tag_string, boost::regex("[;][ ]*")); + + return std::any_of(std::begin(exceptions), std::end(exceptions), + [&](const std::string ¤t_string) + { + if (std::end(restriction_exceptions) != + std::find(std::begin(restriction_exceptions), + std::end(restriction_exceptions), current_string)) + { + return true; + } + return false; + }); +} From b618a1241f3250eb945c936eb5fae50526a87b5e Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Sat, 2 Jan 2016 16:11:49 +0100 Subject: [PATCH 4/7] Adapt build system --- CMakeLists.txt | 121 +++++++++++++++------------------ cmake/FingerPrint-Config.cmake | 12 ++-- 2 files changed, 59 insertions(+), 74 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8fecc577be..67bd60dedc7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,8 +33,7 @@ option(ENABLE_JSON_LOGGING "Adds additional JSON debug logging to the response" option(DEBUG_GEOMETRY "Enables an option to dump GeoJSON of the final routing graph" OFF) option(BUILD_TOOLS "Build OSRM tools" OFF) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/) include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/) include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include/) @@ -46,74 +45,50 @@ add_custom_target(FingerPrintConfigure ALL ${CMAKE_COMMAND} COMMENT "Configuring revision fingerprint" VERBATIM) -add_custom_target(tests DEPENDS datastructure-tests algorithm-tests util-tests) +add_custom_target(tests DEPENDS engine-tests extractor-tests util-tests) add_custom_target(benchmarks DEPENDS rtree-bench) set(BOOST_COMPONENTS date_time filesystem iostreams program_options regex system thread unit_test_framework) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/util/version.hpp.in - ${CMAKE_CURRENT_BINARY_DIR}/util/version.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/include/util/version.hpp.in + ${CMAKE_CURRENT_BINARY_DIR}/include/util/version.hpp ) -file(GLOB ExtractorGlob extractor/*.cpp data_structures/hilbert_value.cpp) -file(GLOB ImporterGlob data_structures/import_edge.cpp data_structures/external_memory_node.cpp data_structures/raster_source.cpp) -add_library(IMPORT OBJECT ${ImporterGlob}) -add_library(LOGGER OBJECT util/simple_logger.cpp) -add_library(PHANTOMNODE OBJECT data_structures/phantom_node.cpp) -add_library(RASTERSOURCE OBJECT data_structures/raster_source.cpp) -add_library(EXCEPTION OBJECT util/osrm_exception.cpp) -add_library(MERCATOR OBJECT util/mercator.cpp) -add_library(ANGLE OBJECT util/compute_angle.cpp) - -set(ExtractorSources extract.cpp ${ExtractorGlob}) -add_executable(osrm-extract ${ExtractorSources} $ $ $ $ $ $ $ $ $ $) - -add_library(RESTRICTION OBJECT data_structures/restriction_map.cpp) -add_library(COMPRESSEDEDGE OBJECT data_structures/compressed_edge_container.cpp) -add_library(GRAPHCOMPRESSOR OBJECT algorithms/graph_compressor.cpp) - -file(GLOB PrepareGlob contractor/*.cpp data_structures/hilbert_value.cpp {RestrictionMapGlob}) -set(PrepareSources prepare.cpp ${PrepareGlob}) -add_executable(osrm-prepare ${PrepareSources} $ $ $ $ $ $ $ $ $ $) - -file(GLOB ServerGlob server/*.cpp) -file(GLOB DescriptorGlob descriptors/*.cpp) -file(GLOB DatastructureGlob data_structures/search_engine_data.cpp data_structures/route_parameters.cpp util/bearing.cpp) -file(GLOB CoordinateGlob data_structures/coordinate.cpp algorithms/coordinate_calculation.cpp) -file(GLOB AlgorithmGlob algorithms/polyline_compressor.cpp algorithms/polyline_formatter.cpp algorithms/douglas_peucker.cpp) -file(GLOB HttpGlob server/http/*.cpp) -file(GLOB LibOSRMGlob library/*.cpp) -file(GLOB DataStructureTestsGlob unit_tests/data_structures/*.cpp data_structures/hilbert_value.cpp) -file(GLOB AlgorithmTestsGlob unit_tests/algorithms/*.cpp algorithms/graph_compressor.cpp) +file(GLOB UtilGlob src/util/*.cpp) +file(GLOB ExtractorGlob src/extractor/*.cpp) +file(GLOB ContractorGlob src/contractor/*.cpp) +file(GLOB ServerGlob src/server/*.cpp src/server/**/*.cpp) +file(GLOB EngineGlob src/engine/*.cpp src/engine/**/*.cpp) +file(GLOB ExtractorTestsGlob unit_tests/extractor/*.cpp) +file(GLOB EngineTestsGlob unit_tests/engine/*.cpp) file(GLOB UtilTestsGlob unit_tests/util/*.cpp) -set( - OSRMSources - ${LibOSRMGlob} - ${DescriptorGlob} - ${DatastructureGlob} - ${AlgorithmGlob} - ${HttpGlob} -) +add_library(UTIL OBJECT ${UtilGlob}) +add_library(EXTRACTOR OBJECT ${ExtractorGlob}) +add_library(CONTRACTOR OBJECT ${ContractorGlob}) +add_library(ENGINE OBJECT ${EngineGlob}) +add_library(SERVER OBJECT ${ServerGlob}) +add_library(GRAPH OBJECT src/extractor/external_memory_node.cpp src/extractor/import_edge.cpp) +add_library(PHANTOM OBJECT src/engine/phantom_node.cpp) -add_library(COORDINATE OBJECT ${CoordinateGlob}) -add_library(OSRM ${OSRMSources} $ $ $ $ $ $ $ $ $) +add_dependencies(UTIL FingerPrintConfigure) +set_target_properties(UTIL PROPERTIES LINKER_LANGUAGE CXX) -add_library(FINGERPRINT OBJECT util/fingerprint.cpp) -add_dependencies(FINGERPRINT FingerPrintConfigure) -add_dependencies(OSRM FingerPrintConfigure) -set_target_properties(FINGERPRINT PROPERTIES LINKER_LANGUAGE CXX) +add_executable(osrm-extract src/tools/extract.cpp $ $) +add_executable(osrm-prepare src/tools/contract.cpp $ $ $) +add_executable(osrm-routed src/tools/routed.cpp $ $ $) +add_executable(osrm-datastore src/tools/datastore.cpp $ $) +add_library(OSRM $ $ $) -add_executable(osrm-routed routed.cpp ${ServerGlob} $) -add_executable(osrm-datastore datastore.cpp $ $ $ $ $) +target_link_libraries(osrm-routed OSRM) # Unit tests -add_executable(datastructure-tests EXCLUDE_FROM_ALL unit_tests/datastructure_tests.cpp ${DataStructureTestsGlob} $ $ $ $ $ $ $ $ $) -add_executable(algorithm-tests EXCLUDE_FROM_ALL unit_tests/algorithm_tests.cpp ${AlgorithmTestsGlob} $ $ $ $ $ $) -add_executable(util-tests EXCLUDE_FROM_ALL unit_tests/util_tests.cpp ${UtilTestsGlob}) +add_executable(engine-tests EXCLUDE_FROM_ALL unit_tests/engine_tests.cpp ${EngineTestsGlob} $ $ $) +add_executable(extractor-tests EXCLUDE_FROM_ALL unit_tests/extractor_tests.cpp ${ExtractorTestsGlob} $ $) +add_executable(util-tests EXCLUDE_FROM_ALL unit_tests/util_tests.cpp ${UtilTestsGlob} $ $) # Benchmarks -add_executable(rtree-bench EXCLUDE_FROM_ALL benchmarks/static_rtree.cpp $ $ $ $ $) +add_executable(rtree-bench EXCLUDE_FROM_ALL src/benchmarks/static_rtree.cpp $ $) # Check the release mode if(NOT CMAKE_BUILD_TYPE MATCHES Debug) @@ -248,6 +223,7 @@ if(UNIX AND NOT APPLE) target_link_libraries(osrm-prepare rt) target_link_libraries(osrm-datastore rt) target_link_libraries(OSRM rt) + target_link_libraries(engine-tests rt) endif() #Check Boost @@ -262,8 +238,8 @@ target_link_libraries(osrm-extract ${Boost_LIBRARIES}) target_link_libraries(osrm-prepare ${Boost_LIBRARIES}) target_link_libraries(osrm-routed ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSRM) target_link_libraries(osrm-datastore ${Boost_LIBRARIES}) -target_link_libraries(datastructure-tests ${Boost_LIBRARIES}) -target_link_libraries(algorithm-tests ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSRM) +target_link_libraries(engine-tests ${Boost_LIBRARIES}) +target_link_libraries(extractor-tests ${Boost_LIBRARIES}) target_link_libraries(util-tests ${Boost_LIBRARIES}) target_link_libraries(rtree-bench ${Boost_LIBRARIES}) @@ -272,8 +248,9 @@ target_link_libraries(osrm-extract ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(osrm-datastore ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(osrm-prepare ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(OSRM ${CMAKE_THREAD_LIBS_INIT}) -target_link_libraries(datastructure-tests ${CMAKE_THREAD_LIBS_INIT}) -target_link_libraries(algorithm-tests ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(engine-tests ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(extractor-tests ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(util-tests ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(rtree-bench ${CMAKE_THREAD_LIBS_INIT}) find_package(TBB REQUIRED) @@ -284,8 +261,9 @@ target_link_libraries(osrm-datastore ${TBB_LIBRARIES}) target_link_libraries(osrm-extract ${TBB_LIBRARIES}) target_link_libraries(osrm-prepare ${TBB_LIBRARIES}) target_link_libraries(osrm-routed ${TBB_LIBRARIES}) -target_link_libraries(datastructure-tests ${TBB_LIBRARIES}) -target_link_libraries(algorithm-tests ${TBB_LIBRARIES}) +target_link_libraries(engine-tests ${TBB_LIBRARIES}) +target_link_libraries(extractor-tests ${TBB_LIBRARIES}) +target_link_libraries(util-tests ${TBB_LIBRARIES}) target_link_libraries(rtree-bench ${TBB_LIBRARIES}) include_directories(SYSTEM ${TBB_INCLUDE_DIR}) @@ -295,26 +273,31 @@ include(check_luabind) include_directories(SYSTEM ${LUABIND_INCLUDE_DIR}) target_link_libraries(osrm-extract ${LUABIND_LIBRARY}) target_link_libraries(osrm-prepare ${LUABIND_LIBRARY}) +target_link_libraries(extractor-tests ${LUABIND_LIBRARY}) if(LUAJIT_FOUND) target_link_libraries(osrm-extract ${LUAJIT_LIBRARIES}) target_link_libraries(osrm-prepare ${LUAJIT_LIBRARIES}) + target_link_libraries(extractor-tests ${LUAJIT_LIBRARY}) else() target_link_libraries(osrm-extract ${LUA_LIBRARY}) target_link_libraries(osrm-prepare ${LUA_LIBRARY}) + target_link_libraries(extractor-tests ${LUA_LIBRARY}) endif() include_directories(SYSTEM ${LUA_INCLUDE_DIR}) find_package(EXPAT REQUIRED) include_directories(SYSTEM ${EXPAT_INCLUDE_DIRS}) target_link_libraries(osrm-extract ${EXPAT_LIBRARIES}) +target_link_libraries(extractor-tests ${EXPAT_LIBRARY}) find_package(STXXL REQUIRED) include_directories(SYSTEM ${STXXL_INCLUDE_DIR}) target_link_libraries(OSRM ${STXXL_LIBRARY}) target_link_libraries(osrm-extract ${STXXL_LIBRARY}) target_link_libraries(osrm-prepare ${STXXL_LIBRARY}) -target_link_libraries(datastructure-tests ${STXXL_LIBRARY}) +target_link_libraries(extractor-tests ${STXXL_LIBRARY}) +target_link_libraries(util-tests ${STXXL_LIBRARY}) set(OpenMP_FIND_QUIETLY ON) find_package(OpenMP) @@ -326,11 +309,13 @@ endif() find_package(BZip2 REQUIRED) include_directories(SYSTEM ${BZIP_INCLUDE_DIRS}) target_link_libraries(osrm-extract ${BZIP2_LIBRARIES}) +target_link_libraries(extractor-tests ${BZIP2_LIBRARIES}) find_package(ZLIB REQUIRED) include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) target_link_libraries(osrm-extract ${ZLIB_LIBRARY}) target_link_libraries(osrm-routed ${ZLIB_LIBRARY}) +target_link_libraries(extractor-tests ${ZLIB_LIBRARY}) if (ENABLE_JSON_LOGGING) message(STATUS "Enabling json logging") @@ -346,7 +331,7 @@ if(BUILD_TOOLS) message(STATUS "Activating OSRM internal tools") find_package(GDAL) if(GDAL_FOUND) - add_executable(osrm-components tools/components.cpp $ $ $ $ $ $ $) + add_executable(osrm-components src/tools/components.cpp $ $) target_link_libraries(osrm-components ${TBB_LIBRARIES}) include_directories(SYSTEM ${GDAL_INCLUDE_DIR}) target_link_libraries(osrm-components ${GDAL_LIBRARIES} ${Boost_LIBRARIES}) @@ -354,19 +339,19 @@ if(BUILD_TOOLS) else() message(FATAL_ERROR "libgdal and/or development headers not found") endif() - add_executable(osrm-cli tools/simpleclient.cpp $ $ $) + add_executable(osrm-cli src/tools/simpleclient.cpp) target_link_libraries(osrm-cli ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSRM) target_link_libraries(osrm-cli ${TBB_LIBRARIES}) - add_executable(osrm-io-benchmark tools/io-benchmark.cpp $ $) + add_executable(osrm-io-benchmark src/tools/io-benchmark.cpp $) target_link_libraries(osrm-io-benchmark ${Boost_LIBRARIES}) - add_executable(osrm-unlock-all tools/unlock_all_mutexes.cpp $ $) + add_executable(osrm-unlock-all src/tools/unlock_all_mutexes.cpp $) target_link_libraries(osrm-unlock-all ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) if(UNIX AND NOT APPLE) target_link_libraries(osrm-unlock-all rt) endif() - add_executable(osrm-check-hsgr tools/check-hsgr.cpp $ $ $ $) + add_executable(osrm-check-hsgr src/tools/check-hsgr.cpp $ $) target_link_libraries(osrm-check-hsgr ${Boost_LIBRARIES} ${TBB_LIBRARIES}) - add_executable(osrm-springclean tools/springclean.cpp $ $ $) + add_executable(osrm-springclean src/tools/springclean.cpp $ $) target_link_libraries(osrm-springclean ${Boost_LIBRARIES}) install(TARGETS osrm-cli DESTINATION bin) diff --git a/cmake/FingerPrint-Config.cmake b/cmake/FingerPrint-Config.cmake index d36b6227462..0672b340295 100644 --- a/cmake/FingerPrint-Config.cmake +++ b/cmake/FingerPrint-Config.cmake @@ -1,10 +1,10 @@ -set(OLDFILE ${OUTPUT_DIR}/util/fingerprint_impl.hpp) +set(OLDFILE ${OUTPUT_DIR}/include/util/fingerprint_impl.hpp) set(NEWFILE ${OLDFILE}.tmp) -set(INFILE ${SOURCE_DIR}/util/fingerprint_impl.hpp.in) -file(MD5 ${SOURCE_DIR}/prepare.cpp MD5PREPARE) -file(MD5 ${SOURCE_DIR}/data_structures/static_rtree.hpp MD5RTREE) -file(MD5 ${SOURCE_DIR}/util/graph_loader.hpp MD5GRAPH) -file(MD5 ${SOURCE_DIR}/server/data_structures/internal_datafacade.hpp MD5OBJECTS) +set(INFILE ${SOURCE_DIR}/include/util/fingerprint_impl.hpp.in) +file(MD5 ${SOURCE_DIR}/src/tools/contract.cpp MD5PREPARE) +file(MD5 ${SOURCE_DIR}/include/util/static_rtree.hpp MD5RTREE) +file(MD5 ${SOURCE_DIR}/include/util/graph_loader.hpp MD5GRAPH) +file(MD5 ${SOURCE_DIR}/include/engine/datafacade/internal_datafacade.hpp MD5OBJECTS) CONFIGURE_FILE(${INFILE} ${NEWFILE}) From 97585bb26afe6098aecf0f36c0b0a523436f2d2d Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Sat, 2 Jan 2016 17:13:44 +0100 Subject: [PATCH 5/7] Fix include paths --- include/contractor/contractor.hpp | 22 ++++---- include/contractor/processing_chain.hpp | 12 ++--- include/contractor/query_edge.hpp | 2 +- include/datastore/shared_memory_factory.hpp | 4 +- include/engine/datafacade/datafacade_base.hpp | 20 ++++---- .../engine/datafacade/internal_datafacade.hpp | 28 +++++------ .../engine/datafacade/shared_datafacade.hpp | 18 +++---- include/engine/datafacade/shared_datatype.hpp | 4 +- .../descriptors/description_factory.hpp | 12 ++--- .../engine/descriptors/descriptor_base.hpp | 10 ++-- include/engine/descriptors/gpx_descriptor.hpp | 6 +-- .../engine/descriptors/json_descriptor.hpp | 30 +++++------ include/engine/douglas_peucker.hpp | 2 +- include/engine/geospatial_query.hpp | 10 ++-- include/engine/internal_route_result.hpp | 10 ++-- .../map_matching/hidden_markov_model.hpp | 2 +- include/engine/osrm_impl.hpp | 8 +-- include/engine/phantom_node.hpp | 6 +-- include/engine/plugins/distance_table.hpp | 24 ++++----- include/engine/plugins/hello_world.hpp | 6 +-- include/engine/plugins/match.hpp | 26 +++++----- include/engine/plugins/nearest.hpp | 10 ++-- include/engine/plugins/plugin_base.hpp | 8 +-- include/engine/plugins/timestamp.hpp | 6 +-- include/engine/plugins/trip.hpp | 32 ++++++------ include/engine/plugins/viaroute.hpp | 28 +++++------ include/engine/polyline_compressor.hpp | 2 +- include/engine/polyline_formatter.hpp | 2 +- .../routing_algorithms/alternative_path.hpp | 8 +-- .../direct_shortest_path.hpp | 10 ++-- .../routing_algorithms/many_to_many.hpp | 6 +-- .../routing_algorithms/map_matching.hpp | 10 ++-- .../routing_algorithms/routing_base.hpp | 8 +-- .../routing_algorithms/shortest_path.hpp | 8 +-- include/engine/search_engine.hpp | 12 ++--- include/engine/search_engine_data.hpp | 4 +- include/engine/segment_information.hpp | 8 +-- include/engine/trip/trip_brute_force.hpp | 8 +-- .../engine/trip/trip_farthest_insertion.hpp | 6 +-- .../engine/trip/trip_nearest_neighbour.hpp | 8 +-- include/engine/trip/trip_tabu_search.hpp | 6 +-- .../extractor/compressed_edge_container.hpp | 2 +- .../extractor/edge_based_graph_factory.hpp | 20 ++++---- include/extractor/edge_based_node.hpp | 6 +-- include/extractor/external_memory_node.hpp | 4 +- include/extractor/extraction_containers.hpp | 10 ++-- .../extractor/extraction_helper_functions.hpp | 4 +- include/extractor/extraction_way.hpp | 4 +- include/extractor/extractor.hpp | 6 +-- include/extractor/extractor_callbacks.hpp | 2 +- .../first_and_last_segment_of_way.hpp | 4 +- include/extractor/graph_compressor.hpp | 6 +-- include/extractor/import_edge.hpp | 4 +- include/extractor/internal_extractor_edge.hpp | 8 +-- include/extractor/node_id.hpp | 2 +- include/extractor/original_edge_data.hpp | 6 +-- include/extractor/query_node.hpp | 4 +- include/extractor/raster_source.hpp | 2 +- include/extractor/restriction.hpp | 2 +- include/extractor/restriction_map.hpp | 6 +-- include/extractor/restriction_parser.hpp | 2 +- include/extractor/tarjan_scc.hpp | 24 ++++----- include/osrm/route_parameters.hpp | 2 +- include/server/connection.hpp | 8 +-- include/server/http/reply.hpp | 2 +- include/server/request_parser.hpp | 6 +-- include/server/server.hpp | 8 +-- include/util/datastore_options.hpp | 6 +-- include/util/deallocating_vector.hpp | 2 +- include/util/debug_geometry.hpp | 8 +-- include/util/dynamic_graph.hpp | 6 +-- include/util/graph_loader.hpp | 16 +++--- include/util/graph_utils.hpp | 2 +- include/util/json_logger.hpp | 2 +- include/util/json_renderer.hpp | 6 +-- include/util/json_util.hpp | 2 +- include/util/matching_debug_info.hpp | 8 +-- include/util/matrix_graph_wrapper.hpp | 2 +- include/util/node_based_graph.hpp | 6 +-- include/util/range_table.hpp | 6 +-- include/util/rectangle.hpp | 4 +- include/util/routed_options.hpp | 6 +-- include/util/static_graph.hpp | 8 +-- include/util/static_rtree.hpp | 26 +++++----- include/util/trigonometry_table.hpp | 2 +- include/util/typedefs.hpp | 2 +- include/util/xml_renderer.hpp | 4 +- include/util/xor_fast_hash_storage.hpp | 2 +- src/benchmarks/static_rtree.cpp | 12 ++--- src/contractor/contractor_options.cpp | 4 +- src/contractor/processing_chain.cpp | 28 +++++------ .../descriptors/description_factory.cpp | 18 +++---- src/engine/douglas_peucker.cpp | 6 +-- src/engine/osrm_impl.cpp | 38 +++++++------- src/engine/phantom_node.cpp | 8 +-- src/engine/polyline_compressor.cpp | 6 +-- src/engine/polyline_formatter.cpp | 8 +-- src/engine/route_parameters.cpp | 4 +- src/engine/search_engine_data.cpp | 4 +- src/extractor/compressed_edge_container.cpp | 4 +- src/extractor/edge_based_graph_factory.cpp | 22 ++++---- src/extractor/external_memory_node.cpp | 4 +- src/extractor/extraction_containers.cpp | 24 ++++----- src/extractor/extractor.cpp | 50 +++++++++---------- src/extractor/extractor_callbacks.cpp | 18 +++---- src/extractor/extractor_options.cpp | 6 +-- src/extractor/graph_compressor.cpp | 14 +++--- src/extractor/import_edge.cpp | 6 +-- src/extractor/raster_source.cpp | 8 +-- src/extractor/restriction_map.cpp | 2 +- src/extractor/restriction_parser.cpp | 12 ++--- src/extractor/scripting_environment.cpp | 24 ++++----- src/server/connection.cpp | 6 +-- src/server/http/reply.cpp | 2 +- src/server/request_handler.cpp | 24 ++++----- src/server/request_parser.cpp | 10 ++-- src/tools/check-hsgr.cpp | 14 +++--- src/tools/components.cpp | 22 ++++---- src/tools/datastore.cpp | 30 +++++------ src/tools/io-benchmark.cpp | 6 +-- src/tools/routed.cpp | 4 +- src/tools/simpleclient.cpp | 14 +++--- src/tools/springclean.cpp | 6 +-- src/tools/unlock_all_mutexes.cpp | 4 +- src/util/compute_angle.cpp | 8 +-- src/util/coordinate.cpp | 6 +-- src/util/coordinate_calculation.cpp | 8 +-- src/util/hilbert_value.cpp | 4 +- src/util/mercator.cpp | 2 +- src/util/osrm_exception.cpp | 2 +- src/util/simple_logger.cpp | 2 +- unit_tests/engine/douglas_peucker.cpp | 4 +- unit_tests/engine/geometry_string.cpp | 4 +- .../extractor/compressed_edge_container.cpp | 4 +- unit_tests/extractor/graph_compressor.cpp | 12 ++--- unit_tests/extractor/raster_source.cpp | 6 +-- unit_tests/util/bearing.cpp | 4 +- unit_tests/util/binary_heap.cpp | 4 +- unit_tests/util/coordinate.cpp | 2 +- unit_tests/util/duration_parsing.cpp | 2 +- unit_tests/util/dynamic_graph.cpp | 4 +- unit_tests/util/range_table.cpp | 4 +- unit_tests/util/static_graph.cpp | 4 +- unit_tests/util/static_rtree.cpp | 14 +++--- unit_tests/util/string_util.cpp | 2 +- 145 files changed, 653 insertions(+), 653 deletions(-) diff --git a/include/contractor/contractor.hpp b/include/contractor/contractor.hpp index 07a21dc50d9..4ae4fcc4b9c 100644 --- a/include/contractor/contractor.hpp +++ b/include/contractor/contractor.hpp @@ -28,17 +28,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef CONTRACTOR_HPP #define CONTRACTOR_HPP -#include "../data_structures/binary_heap.hpp" -#include "../data_structures/deallocating_vector.hpp" -#include "../data_structures/dynamic_graph.hpp" -#include "../data_structures/percent.hpp" -#include "../data_structures/query_edge.hpp" -#include "../data_structures/xor_fast_hash.hpp" -#include "../data_structures/xor_fast_hash_storage.hpp" -#include "../util/integer_range.hpp" -#include "../util/simple_logger.hpp" -#include "../util/timing_util.hpp" -#include "../typedefs.h" +#include "util/binary_heap.hpp" +#include "util/deallocating_vector.hpp" +#include "util/dynamic_graph.hpp" +#include "util/percent.hpp" +#include "contractor/query_edge.hpp" +#include "util/xor_fast_hash.hpp" +#include "util/xor_fast_hash_storage.hpp" +#include "util/integer_range.hpp" +#include "util/simple_logger.hpp" +#include "util/timing_util.hpp" +#include "util/typedefs.hpp" #include diff --git a/include/contractor/processing_chain.hpp b/include/contractor/processing_chain.hpp index 0eb65553dfa..e303a6fc69c 100644 --- a/include/contractor/processing_chain.hpp +++ b/include/contractor/processing_chain.hpp @@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef PROCESSING_CHAIN_HPP #define PROCESSING_CHAIN_HPP -#include "contractor.hpp" -#include "contractor_options.hpp" -#include "../data_structures/query_edge.hpp" -#include "../data_structures/static_graph.hpp" -#include "../data_structures/deallocating_vector.hpp" -#include "../data_structures/node_based_graph.hpp" +#include "contractor/contractor.hpp" +#include "contractor/contractor_options.hpp" +#include "contractor/query_edge.hpp" +#include "util/static_graph.hpp" +#include "util/deallocating_vector.hpp" +#include "util/node_based_graph.hpp" struct SpeedProfileProperties; struct EdgeBasedNode; diff --git a/include/contractor/query_edge.hpp b/include/contractor/query_edge.hpp index 1c4af03d9c4..86d5d63a805 100644 --- a/include/contractor/query_edge.hpp +++ b/include/contractor/query_edge.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef QUERYEDGE_HPP #define QUERYEDGE_HPP -#include "../typedefs.h" +#include "util/typedefs.hpp" #include diff --git a/include/datastore/shared_memory_factory.hpp b/include/datastore/shared_memory_factory.hpp index 7d92eaaa596..c88fc725e4a 100644 --- a/include/datastore/shared_memory_factory.hpp +++ b/include/datastore/shared_memory_factory.hpp @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SHARED_MEMORY_FACTORY_HPP #define SHARED_MEMORY_FACTORY_HPP -#include "../util/osrm_exception.hpp" -#include "../util/simple_logger.hpp" +#include "util/osrm_exception.hpp" +#include "util/simple_logger.hpp" #include #include diff --git a/include/engine/datafacade/datafacade_base.hpp b/include/engine/datafacade/datafacade_base.hpp index 5c5c522968b..a0d1f0e9818 100644 --- a/include/engine/datafacade/datafacade_base.hpp +++ b/include/engine/datafacade/datafacade_base.hpp @@ -30,16 +30,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Exposes all data access interfaces to the algorithms via base class ptr -#include "../../data_structures/edge_based_node.hpp" -#include "../../data_structures/external_memory_node.hpp" -#include "../../data_structures/phantom_node.hpp" -#include "../../data_structures/turn_instructions.hpp" -#include "../../util/integer_range.hpp" -#include "../../util/osrm_exception.hpp" -#include "../../util/string_util.hpp" -#include "../../typedefs.h" - -#include +#include "extractor/edge_based_node.hpp" +#include "extractor/external_memory_node.hpp" +#include "engine/phantom_node.hpp" +#include "extractor/turn_instructions.hpp" +#include "util/integer_range.hpp" +#include "util/osrm_exception.hpp" +#include "util/string_util.hpp" +#include "util/typedefs.hpp" + +#include "osrm/coordinate.hpp" #include #include diff --git a/include/engine/datafacade/internal_datafacade.hpp b/include/engine/datafacade/internal_datafacade.hpp index a2f74e5874d..82bbe30e2c7 100644 --- a/include/engine/datafacade/internal_datafacade.hpp +++ b/include/engine/datafacade/internal_datafacade.hpp @@ -30,20 +30,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // implements all data storage when shared memory is _NOT_ used -#include "datafacade_base.hpp" - -#include "../../algorithms/geospatial_query.hpp" -#include "../../data_structures/original_edge_data.hpp" -#include "../../data_structures/query_node.hpp" -#include "../../data_structures/query_edge.hpp" -#include "../../data_structures/shared_memory_vector_wrapper.hpp" -#include "../../data_structures/static_graph.hpp" -#include "../../data_structures/static_rtree.hpp" -#include "../../data_structures/range_table.hpp" -#include "../../util/graph_loader.hpp" -#include "../../util/simple_logger.hpp" - -#include +#include "engine/datafacade/datafacade_base.hpp" + +#include "engine/geospatial_query.hpp" +#include "extractor/original_edge_data.hpp" +#include "extractor/query_node.hpp" +#include "contractor/query_edge.hpp" +#include "util/shared_memory_vector_wrapper.hpp" +#include "util/static_graph.hpp" +#include "util/static_rtree.hpp" +#include "util/range_table.hpp" +#include "util/graph_loader.hpp" +#include "util/simple_logger.hpp" + +#include "osrm/coordinate.hpp" #include diff --git a/include/engine/datafacade/shared_datafacade.hpp b/include/engine/datafacade/shared_datafacade.hpp index 024a8948f69..dc7938cd59e 100644 --- a/include/engine/datafacade/shared_datafacade.hpp +++ b/include/engine/datafacade/shared_datafacade.hpp @@ -30,15 +30,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // implements all data storage when shared memory _IS_ used -#include "datafacade_base.hpp" -#include "shared_datatype.hpp" - -#include "../../algorithms/geospatial_query.hpp" -#include "../../data_structures/range_table.hpp" -#include "../../data_structures/static_graph.hpp" -#include "../../data_structures/static_rtree.hpp" -#include "../../util/make_unique.hpp" -#include "../../util/simple_logger.hpp" +#include "engine/datafacade/datafacade_base.hpp" +#include "engine/datafacade/shared_datatype.hpp" + +#include "engine/geospatial_query.hpp" +#include "util/range_table.hpp" +#include "util/static_graph.hpp" +#include "util/static_rtree.hpp" +#include "util/make_unique.hpp" +#include "util/simple_logger.hpp" #include diff --git a/include/engine/datafacade/shared_datatype.hpp b/include/engine/datafacade/shared_datatype.hpp index c0ad7d45be9..f012073e4d7 100644 --- a/include/engine/datafacade/shared_datatype.hpp +++ b/include/engine/datafacade/shared_datatype.hpp @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SHARED_DATA_TYPE_HPP #define SHARED_DATA_TYPE_HPP -#include "../../util/osrm_exception.hpp" -#include "../../util/simple_logger.hpp" +#include "util/osrm_exception.hpp" +#include "util/simple_logger.hpp" #include diff --git a/include/engine/descriptors/description_factory.hpp b/include/engine/descriptors/description_factory.hpp index 985f9c1c5d8..0e3dc241381 100644 --- a/include/engine/descriptors/description_factory.hpp +++ b/include/engine/descriptors/description_factory.hpp @@ -28,15 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef DESCRIPTION_FACTORY_HPP #define DESCRIPTION_FACTORY_HPP -#include "../algorithms/douglas_peucker.hpp" -#include "../data_structures/phantom_node.hpp" -#include "../data_structures/segment_information.hpp" -#include "../data_structures/turn_instructions.hpp" +#include "engine/douglas_peucker.hpp" +#include "engine/phantom_node.hpp" +#include "engine/segment_information.hpp" +#include "extractor/turn_instructions.hpp" #include -#include -#include +#include "osrm/coordinate.hpp" +#include "osrm/json_container.hpp" #include diff --git a/include/engine/descriptors/descriptor_base.hpp b/include/engine/descriptors/descriptor_base.hpp index e85ea902f0b..41511a08212 100644 --- a/include/engine/descriptors/descriptor_base.hpp +++ b/include/engine/descriptors/descriptor_base.hpp @@ -28,14 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef DESCRIPTOR_BASE_HPP #define DESCRIPTOR_BASE_HPP -#include "../algorithms/coordinate_calculation.hpp" -#include "../data_structures/internal_route_result.hpp" -#include "../data_structures/phantom_node.hpp" -#include "../typedefs.h" +#include "util/coordinate_calculation.hpp" +#include "engine/internal_route_result.hpp" +#include "engine/phantom_node.hpp" +#include "util/typedefs.hpp" #include -#include +#include "osrm/json_container.hpp" #include #include diff --git a/include/engine/descriptors/gpx_descriptor.hpp b/include/engine/descriptors/gpx_descriptor.hpp index fb4c5b9de9e..dd750662543 100644 --- a/include/engine/descriptors/gpx_descriptor.hpp +++ b/include/engine/descriptors/gpx_descriptor.hpp @@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef GPX_DESCRIPTOR_HPP #define GPX_DESCRIPTOR_HPP -#include "descriptor_base.hpp" -#include "../util/xml_renderer.hpp" +#include "engine/descriptors/descriptor_base.hpp" +#include "util/xml_renderer.hpp" -#include +#include "osrm/json_container.hpp" #include diff --git a/include/engine/descriptors/json_descriptor.hpp b/include/engine/descriptors/json_descriptor.hpp index a4344d9bb12..0e9e629a6a8 100644 --- a/include/engine/descriptors/json_descriptor.hpp +++ b/include/engine/descriptors/json_descriptor.hpp @@ -28,21 +28,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef JSON_DESCRIPTOR_HPP #define JSON_DESCRIPTOR_HPP -#include "descriptor_base.hpp" -#include "description_factory.hpp" -#include "../algorithms/object_encoder.hpp" -#include "../algorithms/route_name_extraction.hpp" -#include "../data_structures/segment_information.hpp" -#include "../data_structures/turn_instructions.hpp" -#include "../util/bearing.hpp" -#include "../util/cast.hpp" -#include "../util/integer_range.hpp" -#include "../util/json_renderer.hpp" -#include "../util/simple_logger.hpp" -#include "../util/string_util.hpp" -#include "../util/timing_util.hpp" - -#include +#include "engine/descriptors/descriptor_base.hpp" +#include "engine/descriptors/description_factory.hpp" +#include "engine/object_encoder.hpp" +#include "engine/route_name_extraction.hpp" +#include "engine/segment_information.hpp" +#include "extractor/turn_instructions.hpp" +#include "util/bearing.hpp" +#include "util/cast.hpp" +#include "util/integer_range.hpp" +#include "util/json_renderer.hpp" +#include "util/simple_logger.hpp" +#include "util/string_util.hpp" +#include "util/timing_util.hpp" + +#include "osrm/json_container.hpp" #include #include diff --git a/include/engine/douglas_peucker.hpp b/include/engine/douglas_peucker.hpp index da02982f3d5..7ef6bd6c2f0 100644 --- a/include/engine/douglas_peucker.hpp +++ b/include/engine/douglas_peucker.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef DOUGLAS_PEUCKER_HPP_ #define DOUGLAS_PEUCKER_HPP_ -#include "../data_structures/segment_information.hpp" +#include "engine/segment_information.hpp" #include #include diff --git a/include/engine/geospatial_query.hpp b/include/engine/geospatial_query.hpp index 96b4fc5a207..05105554e41 100644 --- a/include/engine/geospatial_query.hpp +++ b/include/engine/geospatial_query.hpp @@ -1,12 +1,12 @@ #ifndef GEOSPATIAL_QUERY_HPP #define GEOSPATIAL_QUERY_HPP -#include "coordinate_calculation.hpp" -#include "../typedefs.h" -#include "../data_structures/phantom_node.hpp" -#include "../util/bearing.hpp" +#include "util/coordinate_calculation.hpp" +#include "util/typedefs.hpp" +#include "engine/phantom_node.hpp" +#include "util/bearing.hpp" -#include +#include "osrm/coordinate.hpp" #include #include diff --git a/include/engine/internal_route_result.hpp b/include/engine/internal_route_result.hpp index 068b63a800b..be8dec22320 100644 --- a/include/engine/internal_route_result.hpp +++ b/include/engine/internal_route_result.hpp @@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef RAW_ROUTE_DATA_H #define RAW_ROUTE_DATA_H -#include "../data_structures/phantom_node.hpp" -#include "../data_structures/travel_mode.hpp" -#include "../data_structures/turn_instructions.hpp" -#include "../typedefs.h" +#include "engine/phantom_node.hpp" +#include "extractor/travel_mode.hpp" +#include "extractor/turn_instructions.hpp" +#include "util/typedefs.hpp" -#include +#include "osrm/coordinate.hpp" #include diff --git a/include/engine/map_matching/hidden_markov_model.hpp b/include/engine/map_matching/hidden_markov_model.hpp index e3efcea0874..d6e79a6eb93 100644 --- a/include/engine/map_matching/hidden_markov_model.hpp +++ b/include/engine/map_matching/hidden_markov_model.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef HIDDEN_MARKOV_MODEL #define HIDDEN_MARKOV_MODEL -#include "../util/integer_range.hpp" +#include "util/integer_range.hpp" #include diff --git a/include/engine/osrm_impl.hpp b/include/engine/osrm_impl.hpp index c223449e475..b6c8928d26c 100644 --- a/include/engine/osrm_impl.hpp +++ b/include/engine/osrm_impl.hpp @@ -31,11 +31,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. class BasePlugin; struct RouteParameters; -#include "../data_structures/query_edge.hpp" +#include "contractor/query_edge.hpp" -#include -#include -#include +#include "osrm/json_container.hpp" +#include "osrm/libosrm_config.hpp" +#include "osrm/osrm.hpp" #include #include diff --git a/include/engine/phantom_node.hpp b/include/engine/phantom_node.hpp index b12c4feb6b1..f2255e35e29 100644 --- a/include/engine/phantom_node.hpp +++ b/include/engine/phantom_node.hpp @@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef PHANTOM_NODES_H #define PHANTOM_NODES_H -#include "travel_mode.hpp" -#include "../typedefs.h" +#include "extractor/travel_mode.hpp" +#include "util/typedefs.hpp" -#include +#include "osrm/coordinate.hpp" #include #include diff --git a/include/engine/plugins/distance_table.hpp b/include/engine/plugins/distance_table.hpp index c4ed250c87c..8009e6818e6 100644 --- a/include/engine/plugins/distance_table.hpp +++ b/include/engine/plugins/distance_table.hpp @@ -28,18 +28,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef DISTANCE_TABLE_HPP #define DISTANCE_TABLE_HPP -#include "plugin_base.hpp" - -#include "../algorithms/object_encoder.hpp" -#include "../data_structures/query_edge.hpp" -#include "../data_structures/search_engine.hpp" -#include "../descriptors/descriptor_base.hpp" -#include "../util/json_renderer.hpp" -#include "../util/make_unique.hpp" -#include "../util/string_util.hpp" -#include "../util/timing_util.hpp" - -#include +#include "engine/plugins/plugin_base.hpp" + +#include "engine/object_encoder.hpp" +#include "contractor/query_edge.hpp" +#include "engine/search_engine.hpp" +#include "engine/descriptors/descriptor_base.hpp" +#include "util/json_renderer.hpp" +#include "util/make_unique.hpp" +#include "util/string_util.hpp" +#include "util/timing_util.hpp" + +#include "osrm/json_container.hpp" #include diff --git a/include/engine/plugins/hello_world.hpp b/include/engine/plugins/hello_world.hpp index 512fb07e0c0..ac6aa53d959 100644 --- a/include/engine/plugins/hello_world.hpp +++ b/include/engine/plugins/hello_world.hpp @@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef HELLO_WORLD_HPP #define HELLO_WORLD_HPP -#include "plugin_base.hpp" +#include "engine/plugins/plugin_base.hpp" -#include "../util/json_renderer.hpp" +#include "util/json_renderer.hpp" -#include +#include "osrm/json_container.hpp" #include diff --git a/include/engine/plugins/match.hpp b/include/engine/plugins/match.hpp index f1769562f15..64da8785666 100644 --- a/include/engine/plugins/match.hpp +++ b/include/engine/plugins/match.hpp @@ -28,19 +28,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef MATCH_HPP #define MATCH_HPP -#include "plugin_base.hpp" - -#include "../algorithms/bayes_classifier.hpp" -#include "../algorithms/object_encoder.hpp" -#include "../data_structures/search_engine.hpp" -#include "../descriptors/descriptor_base.hpp" -#include "../descriptors/json_descriptor.hpp" -#include "../routing_algorithms/map_matching.hpp" -#include "../util/compute_angle.hpp" -#include "../util/integer_range.hpp" -#include "../util/json_logger.hpp" -#include "../util/json_util.hpp" -#include "../util/string_util.hpp" +#include "engine/plugins/plugin_base.hpp" + +#include "engine/map_matching/bayes_classifier.hpp" +#include "engine/object_encoder.hpp" +#include "engine/search_engine.hpp" +#include "engine/descriptors/descriptor_base.hpp" +#include "engine/descriptors/json_descriptor.hpp" +#include "engine/routing_algorithms/map_matching.hpp" +#include "util/compute_angle.hpp" +#include "util/integer_range.hpp" +#include "util/json_logger.hpp" +#include "util/json_util.hpp" +#include "util/string_util.hpp" #include diff --git a/include/engine/plugins/nearest.hpp b/include/engine/plugins/nearest.hpp index 24598198180..1fc66efec68 100644 --- a/include/engine/plugins/nearest.hpp +++ b/include/engine/plugins/nearest.hpp @@ -28,13 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef NEAREST_HPP #define NEAREST_HPP -#include "plugin_base.hpp" +#include "engine/plugins/plugin_base.hpp" -#include "../data_structures/phantom_node.hpp" -#include "../util/integer_range.hpp" -#include "../util/json_renderer.hpp" +#include "engine/phantom_node.hpp" +#include "util/integer_range.hpp" +#include "util/json_renderer.hpp" -#include +#include "osrm/json_container.hpp" #include diff --git a/include/engine/plugins/plugin_base.hpp b/include/engine/plugins/plugin_base.hpp index a05785a3731..b623aa1f40e 100644 --- a/include/engine/plugins/plugin_base.hpp +++ b/include/engine/plugins/plugin_base.hpp @@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef BASE_PLUGIN_HPP #define BASE_PLUGIN_HPP -#include "../data_structures/phantom_node.hpp" +#include "engine/phantom_node.hpp" -#include -#include -#include +#include "osrm/coordinate.hpp" +#include "osrm/json_container.hpp" +#include "osrm/route_parameters.hpp" #include #include diff --git a/include/engine/plugins/timestamp.hpp b/include/engine/plugins/timestamp.hpp index 899ef467066..0b1ef077281 100644 --- a/include/engine/plugins/timestamp.hpp +++ b/include/engine/plugins/timestamp.hpp @@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef TIMESTAMP_PLUGIN_H #define TIMESTAMP_PLUGIN_H -#include "plugin_base.hpp" +#include "engine/plugins/plugin_base.hpp" -#include "../util/json_renderer.hpp" +#include "util/json_renderer.hpp" -#include +#include "osrm/json_container.hpp" #include diff --git a/include/engine/plugins/trip.hpp b/include/engine/plugins/trip.hpp index a69e25e7759..7ca1e663b45 100644 --- a/include/engine/plugins/trip.hpp +++ b/include/engine/plugins/trip.hpp @@ -28,25 +28,25 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef TRIP_HPP #define TRIP_HPP -#include "plugin_base.hpp" - -#include "../algorithms/object_encoder.hpp" -#include "../algorithms/tarjan_scc.hpp" -#include "../algorithms/trip_nearest_neighbour.hpp" -#include "../algorithms/trip_farthest_insertion.hpp" -#include "../algorithms/trip_brute_force.hpp" -#include "../data_structures/search_engine.hpp" -#include "../data_structures/matrix_graph_wrapper.hpp" // wrapper to use tarjan +#include "engine/plugins/plugin_base.hpp" + +#include "engine/object_encoder.hpp" +#include "extractor/tarjan_scc.hpp" +#include "engine/trip/trip_nearest_neighbour.hpp" +#include "engine/trip/trip_farthest_insertion.hpp" +#include "engine/trip/trip_brute_force.hpp" +#include "engine/search_engine.hpp" +#include "util/matrix_graph_wrapper.hpp" // wrapper to use tarjan // scc on dist table -#include "../descriptors/descriptor_base.hpp" // to make json output -#include "../descriptors/json_descriptor.hpp" // to make json output -#include "../util/make_unique.hpp" -#include "../util/timing_util.hpp" // to time runtime -//#include "../util/simple_logger.hpp" // for logging output -#include "../util/dist_table_wrapper.hpp" // to access the dist +#include "engine/descriptors/descriptor_base.hpp" // to make json output +#include "engine/descriptors/json_descriptor.hpp" // to make json output +#include "util/make_unique.hpp" +#include "util/timing_util.hpp" // to time runtime +//#include "util/simple_logger.hpp" // for logging output +#include "util/dist_table_wrapper.hpp" // to access the dist // table more easily -#include +#include "osrm/json_container.hpp" #include #include diff --git a/include/engine/plugins/viaroute.hpp b/include/engine/plugins/viaroute.hpp index f9a6737da68..43e8728c3cb 100644 --- a/include/engine/plugins/viaroute.hpp +++ b/include/engine/plugins/viaroute.hpp @@ -28,20 +28,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef VIA_ROUTE_HPP #define VIA_ROUTE_HPP -#include "plugin_base.hpp" - -#include "../algorithms/object_encoder.hpp" -#include "../data_structures/search_engine.hpp" -#include "../descriptors/descriptor_base.hpp" -#include "../descriptors/gpx_descriptor.hpp" -#include "../descriptors/json_descriptor.hpp" -#include "../util/integer_range.hpp" -#include "../util/json_renderer.hpp" -#include "../util/make_unique.hpp" -#include "../util/simple_logger.hpp" -#include "../util/timing_util.hpp" - -#include +#include "engine/plugins/plugin_base.hpp" + +#include "engine/object_encoder.hpp" +#include "engine/search_engine.hpp" +#include "engine/descriptors/descriptor_base.hpp" +#include "engine/descriptors/gpx_descriptor.hpp" +#include "engine/descriptors/json_descriptor.hpp" +#include "util/integer_range.hpp" +#include "util/json_renderer.hpp" +#include "util/make_unique.hpp" +#include "util/simple_logger.hpp" +#include "util/timing_util.hpp" + +#include "osrm/json_container.hpp" #include diff --git a/include/engine/polyline_compressor.hpp b/include/engine/polyline_compressor.hpp index a148200ca0c..f4c449156df 100644 --- a/include/engine/polyline_compressor.hpp +++ b/include/engine/polyline_compressor.hpp @@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. struct SegmentInformation; -#include +#include "osrm/coordinate.hpp" #include #include diff --git a/include/engine/polyline_formatter.hpp b/include/engine/polyline_formatter.hpp index 68cc70293ef..9f7c60eeffb 100644 --- a/include/engine/polyline_formatter.hpp +++ b/include/engine/polyline_formatter.hpp @@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. struct SegmentInformation; -#include +#include "osrm/json_container.hpp" #include #include diff --git a/include/engine/routing_algorithms/alternative_path.hpp b/include/engine/routing_algorithms/alternative_path.hpp index 59b772edb4d..78f7a172be0 100644 --- a/include/engine/routing_algorithms/alternative_path.hpp +++ b/include/engine/routing_algorithms/alternative_path.hpp @@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ALTERNATIVE_PATH_ROUTING_HPP #define ALTERNATIVE_PATH_ROUTING_HPP -#include "routing_base.hpp" -#include "../data_structures/search_engine_data.hpp" -#include "../util/integer_range.hpp" -#include "../util/container.hpp" +#include "engine/routing_algorithms/routing_base.hpp" +#include "engine/search_engine_data.hpp" +#include "util/integer_range.hpp" +#include "util/container.hpp" #include diff --git a/include/engine/routing_algorithms/direct_shortest_path.hpp b/include/engine/routing_algorithms/direct_shortest_path.hpp index 2237d682ada..3209423ddab 100644 --- a/include/engine/routing_algorithms/direct_shortest_path.hpp +++ b/include/engine/routing_algorithms/direct_shortest_path.hpp @@ -31,11 +31,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "routing_base.hpp" -#include "../data_structures/search_engine_data.hpp" -#include "../util/integer_range.hpp" -#include "../util/timing_util.hpp" -#include "../typedefs.h" +#include "engine/routing_algorithms/routing_base.hpp" +#include "engine/search_engine_data.hpp" +#include "util/integer_range.hpp" +#include "util/timing_util.hpp" +#include "util/typedefs.hpp" /// This is a striped down version of the general shortest path algorithm. /// The general algorithm always computes two queries for each leg. This is only diff --git a/include/engine/routing_algorithms/many_to_many.hpp b/include/engine/routing_algorithms/many_to_many.hpp index c5dfb7ca5e6..e9d804a2d77 100644 --- a/include/engine/routing_algorithms/many_to_many.hpp +++ b/include/engine/routing_algorithms/many_to_many.hpp @@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef MANY_TO_MANY_ROUTING_HPP #define MANY_TO_MANY_ROUTING_HPP -#include "routing_base.hpp" -#include "../data_structures/search_engine_data.hpp" -#include "../typedefs.h" +#include "engine/routing_algorithms/routing_base.hpp" +#include "engine/search_engine_data.hpp" +#include "util/typedefs.hpp" #include diff --git a/include/engine/routing_algorithms/map_matching.hpp b/include/engine/routing_algorithms/map_matching.hpp index 430682d920a..9afc2653afc 100644 --- a/include/engine/routing_algorithms/map_matching.hpp +++ b/include/engine/routing_algorithms/map_matching.hpp @@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef MAP_MATCHING_HPP #define MAP_MATCHING_HPP -#include "routing_base.hpp" +#include "engine/routing_algorithms/routing_base.hpp" -#include "../algorithms/coordinate_calculation.hpp" -#include "../data_structures/hidden_markov_model.hpp" -#include "../util/json_logger.hpp" -#include "../util/matching_debug_info.hpp" +#include "util/coordinate_calculation.hpp" +#include "engine/map_matching/hidden_markov_model.hpp" +#include "util/json_logger.hpp" +#include "util/matching_debug_info.hpp" #include diff --git a/include/engine/routing_algorithms/routing_base.hpp b/include/engine/routing_algorithms/routing_base.hpp index ecbc07e3564..14c5b9c0a02 100644 --- a/include/engine/routing_algorithms/routing_base.hpp +++ b/include/engine/routing_algorithms/routing_base.hpp @@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ROUTING_BASE_HPP #define ROUTING_BASE_HPP -#include "../algorithms/coordinate_calculation.hpp" -#include "../data_structures/internal_route_result.hpp" -#include "../data_structures/search_engine_data.hpp" -#include "../data_structures/turn_instructions.hpp" +#include "util/coordinate_calculation.hpp" +#include "engine/internal_route_result.hpp" +#include "engine/search_engine_data.hpp" +#include "extractor/turn_instructions.hpp" #include diff --git a/include/engine/routing_algorithms/shortest_path.hpp b/include/engine/routing_algorithms/shortest_path.hpp index 601e39460d0..cedeca83ab8 100644 --- a/include/engine/routing_algorithms/shortest_path.hpp +++ b/include/engine/routing_algorithms/shortest_path.hpp @@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SHORTEST_PATH_HPP #define SHORTEST_PATH_HPP -#include "../typedefs.h" +#include "util/typedefs.hpp" -#include "routing_base.hpp" +#include "engine/routing_algorithms/routing_base.hpp" -#include "../data_structures/search_engine_data.hpp" -#include "../util/integer_range.hpp" +#include "engine/search_engine_data.hpp" +#include "util/integer_range.hpp" #include diff --git a/include/engine/search_engine.hpp b/include/engine/search_engine.hpp index 5af734e77f9..8efc9d21115 100644 --- a/include/engine/search_engine.hpp +++ b/include/engine/search_engine.hpp @@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SEARCH_ENGINE_HPP #define SEARCH_ENGINE_HPP -#include "search_engine_data.hpp" -#include "../routing_algorithms/alternative_path.hpp" -#include "../routing_algorithms/many_to_many.hpp" -#include "../routing_algorithms/map_matching.hpp" -#include "../routing_algorithms/shortest_path.hpp" -#include "../routing_algorithms/direct_shortest_path.hpp" +#include "engine/search_engine_data.hpp" +#include "engine/routing_algorithms/alternative_path.hpp" +#include "engine/routing_algorithms/many_to_many.hpp" +#include "engine/routing_algorithms/map_matching.hpp" +#include "engine/routing_algorithms/shortest_path.hpp" +#include "engine/routing_algorithms/direct_shortest_path.hpp" #include diff --git a/include/engine/search_engine_data.hpp b/include/engine/search_engine_data.hpp index 8c1c1619e09..1914478654d 100644 --- a/include/engine/search_engine_data.hpp +++ b/include/engine/search_engine_data.hpp @@ -30,8 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include "../typedefs.h" -#include "binary_heap.hpp" +#include "util/typedefs.hpp" +#include "util/binary_heap.hpp" struct HeapData { diff --git a/include/engine/segment_information.hpp b/include/engine/segment_information.hpp index d9cdc81609c..725358b5094 100644 --- a/include/engine/segment_information.hpp +++ b/include/engine/segment_information.hpp @@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SEGMENT_INFORMATION_HPP #define SEGMENT_INFORMATION_HPP -#include "turn_instructions.hpp" +#include "extractor/turn_instructions.hpp" -#include "../data_structures/travel_mode.hpp" -#include "../typedefs.h" +#include "extractor/travel_mode.hpp" +#include "util/typedefs.hpp" -#include +#include "osrm/coordinate.hpp" #include // Struct fits everything in one cache line diff --git a/include/engine/trip/trip_brute_force.hpp b/include/engine/trip/trip_brute_force.hpp index 601971cf779..5203deea875 100644 --- a/include/engine/trip/trip_brute_force.hpp +++ b/include/engine/trip/trip_brute_force.hpp @@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef TRIP_BRUTE_FORCE_HPP #define TRIP_BRUTE_FORCE_HPP -#include "../data_structures/search_engine.hpp" -#include "../util/dist_table_wrapper.hpp" -#include "../util/simple_logger.hpp" +#include "engine/search_engine.hpp" +#include "util/dist_table_wrapper.hpp" +#include "util/simple_logger.hpp" -#include +#include "osrm/json_container.hpp" #include #include diff --git a/include/engine/trip/trip_farthest_insertion.hpp b/include/engine/trip/trip_farthest_insertion.hpp index 91f0aa417e7..13f301235bf 100644 --- a/include/engine/trip/trip_farthest_insertion.hpp +++ b/include/engine/trip/trip_farthest_insertion.hpp @@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef TRIP_FARTHEST_INSERTION_HPP #define TRIP_FARTHEST_INSERTION_HPP -#include "../data_structures/search_engine.hpp" -#include "../util/dist_table_wrapper.hpp" +#include "engine/search_engine.hpp" +#include "util/dist_table_wrapper.hpp" -#include +#include "osrm/json_container.hpp" #include #include diff --git a/include/engine/trip/trip_nearest_neighbour.hpp b/include/engine/trip/trip_nearest_neighbour.hpp index 0ae179284de..e931bcda7d6 100644 --- a/include/engine/trip/trip_nearest_neighbour.hpp +++ b/include/engine/trip/trip_nearest_neighbour.hpp @@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef TRIP_NEAREST_NEIGHBOUR_HPP #define TRIP_NEAREST_NEIGHBOUR_HPP -#include "../data_structures/search_engine.hpp" -#include "../util/simple_logger.hpp" -#include "../util/dist_table_wrapper.hpp" +#include "engine/search_engine.hpp" +#include "util/simple_logger.hpp" +#include "util/dist_table_wrapper.hpp" -#include +#include "osrm/json_container.hpp" #include #include diff --git a/include/engine/trip/trip_tabu_search.hpp b/include/engine/trip/trip_tabu_search.hpp index 32f50fc59f8..988d0a66838 100644 --- a/include/engine/trip/trip_tabu_search.hpp +++ b/include/engine/trip/trip_tabu_search.hpp @@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef TRIP_BRUTE_FORCE_HPP #define TRIP_BRUTE_FORCE_HPP -#include "../data_structures/search_engine.hpp" -#include "../util/simple_logger.hpp" +#include "engine/search_engine.hpp" +#include "util/simple_logger.hpp" -#include +#include "osrm/json_container.hpp" #include #include diff --git a/include/extractor/compressed_edge_container.hpp b/include/extractor/compressed_edge_container.hpp index 5d94ee6deb1..afae26f7d4e 100644 --- a/include/extractor/compressed_edge_container.hpp +++ b/include/extractor/compressed_edge_container.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef GEOMETRY_COMPRESSOR_HPP_ #define GEOMETRY_COMPRESSOR_HPP_ -#include "../typedefs.h" +#include "util/typedefs.hpp" #include diff --git a/include/extractor/edge_based_graph_factory.hpp b/include/extractor/edge_based_graph_factory.hpp index 997c7ea8ee2..56344c0188d 100644 --- a/include/extractor/edge_based_graph_factory.hpp +++ b/include/extractor/edge_based_graph_factory.hpp @@ -30,16 +30,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef EDGE_BASED_GRAPH_FACTORY_HPP_ #define EDGE_BASED_GRAPH_FACTORY_HPP_ -#include "speed_profile.hpp" -#include "../typedefs.h" -#include "../data_structures/compressed_edge_container.hpp" -#include "../data_structures/deallocating_vector.hpp" -#include "../data_structures/edge_based_node.hpp" -#include "../data_structures/original_edge_data.hpp" -#include "../data_structures/query_node.hpp" -#include "../data_structures/turn_instructions.hpp" -#include "../data_structures/node_based_graph.hpp" -#include "../data_structures/restriction_map.hpp" +#include "extractor/speed_profile.hpp" +#include "util/typedefs.hpp" +#include "extractor/compressed_edge_container.hpp" +#include "util/deallocating_vector.hpp" +#include "extractor/edge_based_node.hpp" +#include "extractor/original_edge_data.hpp" +#include "extractor/query_node.hpp" +#include "extractor/turn_instructions.hpp" +#include "util/node_based_graph.hpp" +#include "extractor/restriction_map.hpp" #include #include diff --git a/include/extractor/edge_based_node.hpp b/include/extractor/edge_based_node.hpp index 8efbf017572..cc09ed2a0c5 100644 --- a/include/extractor/edge_based_node.hpp +++ b/include/extractor/edge_based_node.hpp @@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef EDGE_BASED_NODE_HPP #define EDGE_BASED_NODE_HPP -#include "../data_structures/travel_mode.hpp" -#include "../typedefs.h" +#include "extractor/travel_mode.hpp" +#include "util/typedefs.hpp" #include -#include +#include "osrm/coordinate.hpp" #include diff --git a/include/extractor/external_memory_node.hpp b/include/extractor/external_memory_node.hpp index a48d1a13aed..ac56d2393f6 100644 --- a/include/extractor/external_memory_node.hpp +++ b/include/extractor/external_memory_node.hpp @@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef EXTERNAL_MEMORY_NODE_HPP_ #define EXTERNAL_MEMORY_NODE_HPP_ -#include "query_node.hpp" +#include "extractor/query_node.hpp" -#include "../typedefs.h" +#include "util/typedefs.hpp" struct ExternalMemoryNode : QueryNode { diff --git a/include/extractor/extraction_containers.hpp b/include/extractor/extraction_containers.hpp index 541ad35376e..f8a330edba3 100644 --- a/include/extractor/extraction_containers.hpp +++ b/include/extractor/extraction_containers.hpp @@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef EXTRACTION_CONTAINERS_HPP #define EXTRACTION_CONTAINERS_HPP -#include "internal_extractor_edge.hpp" -#include "first_and_last_segment_of_way.hpp" -#include "scripting_environment.hpp" -#include "../data_structures/external_memory_node.hpp" -#include "../data_structures/restriction.hpp" +#include "extractor/internal_extractor_edge.hpp" +#include "extractor/first_and_last_segment_of_way.hpp" +#include "extractor/scripting_environment.hpp" +#include "extractor/external_memory_node.hpp" +#include "extractor/restriction.hpp" #include #include diff --git a/include/extractor/extraction_helper_functions.hpp b/include/extractor/extraction_helper_functions.hpp index 69ab456afba..2b266d75fc4 100644 --- a/include/extractor/extraction_helper_functions.hpp +++ b/include/extractor/extraction_helper_functions.hpp @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef EXTRACTION_HELPER_FUNCTIONS_HPP #define EXTRACTION_HELPER_FUNCTIONS_HPP -#include "../util/cast.hpp" -#include "../util/iso_8601_duration_parser.hpp" +#include "util/cast.hpp" +#include "util/iso_8601_duration_parser.hpp" #include #include diff --git a/include/extractor/extraction_way.hpp b/include/extractor/extraction_way.hpp index 094c10a54d5..c88588ef1a7 100644 --- a/include/extractor/extraction_way.hpp +++ b/include/extractor/extraction_way.hpp @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef EXTRACTION_WAY_HPP #define EXTRACTION_WAY_HPP -#include "../data_structures/travel_mode.hpp" -#include "../typedefs.h" +#include "extractor/travel_mode.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/include/extractor/extractor.hpp b/include/extractor/extractor.hpp index c147f196146..45a4ee8db85 100644 --- a/include/extractor/extractor.hpp +++ b/include/extractor/extractor.hpp @@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef EXTRACTOR_HPP #define EXTRACTOR_HPP -#include "extractor_options.hpp" -#include "edge_based_graph_factory.hpp" -#include "../algorithms/graph_compressor.hpp" +#include "extractor/extractor_options.hpp" +#include "extractor/edge_based_graph_factory.hpp" +#include "extractor/graph_compressor.hpp" class extractor { diff --git a/include/extractor/extractor_callbacks.hpp b/include/extractor/extractor_callbacks.hpp index 0026b6fb0f3..808119be58c 100644 --- a/include/extractor/extractor_callbacks.hpp +++ b/include/extractor/extractor_callbacks.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef EXTRACTOR_CALLBACKS_HPP #define EXTRACTOR_CALLBACKS_HPP -#include "../typedefs.h" +#include "util/typedefs.hpp" #include #include diff --git a/include/extractor/first_and_last_segment_of_way.hpp b/include/extractor/first_and_last_segment_of_way.hpp index ead8b4c5cb1..55a096f4593 100644 --- a/include/extractor/first_and_last_segment_of_way.hpp +++ b/include/extractor/first_and_last_segment_of_way.hpp @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef FIRST_AND_LAST_SEGMENT_OF_WAY_HPP #define FIRST_AND_LAST_SEGMENT_OF_WAY_HPP -#include "../data_structures/external_memory_node.hpp" -#include "../typedefs.h" +#include "extractor/external_memory_node.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/include/extractor/graph_compressor.hpp b/include/extractor/graph_compressor.hpp index 8096a92d66f..7ddcd140245 100644 --- a/include/extractor/graph_compressor.hpp +++ b/include/extractor/graph_compressor.hpp @@ -27,10 +27,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef GEOMETRY_COMPRESSOR_HPP #define GEOMETRY_COMPRESSOR_HPP -#include "../typedefs.h" +#include "util/typedefs.hpp" -#include "../extractor/speed_profile.hpp" -#include "../data_structures/node_based_graph.hpp" +#include "extractor/speed_profile.hpp" +#include "util/node_based_graph.hpp" #include #include diff --git a/include/extractor/import_edge.hpp b/include/extractor/import_edge.hpp index 449ded2a1a7..f436502c103 100644 --- a/include/extractor/import_edge.hpp +++ b/include/extractor/import_edge.hpp @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef IMPORT_EDGE_HPP #define IMPORT_EDGE_HPP -#include "../data_structures/travel_mode.hpp" -#include "../typedefs.h" +#include "extractor/travel_mode.hpp" +#include "util/typedefs.hpp" struct NodeBasedEdge { diff --git a/include/extractor/internal_extractor_edge.hpp b/include/extractor/internal_extractor_edge.hpp index 0df6e8cb834..546bb32dcb5 100644 --- a/include/extractor/internal_extractor_edge.hpp +++ b/include/extractor/internal_extractor_edge.hpp @@ -28,13 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef INTERNAL_EXTRACTOR_EDGE_HPP #define INTERNAL_EXTRACTOR_EDGE_HPP -#include "../typedefs.h" -#include "../data_structures/travel_mode.hpp" -#include "../data_structures/import_edge.hpp" +#include "util/typedefs.hpp" +#include "extractor/travel_mode.hpp" +#include "extractor/import_edge.hpp" #include -#include +#include "osrm/coordinate.hpp" #include struct InternalExtractorEdge diff --git a/include/extractor/node_id.hpp b/include/extractor/node_id.hpp index 0671a4d9de1..b17de382917 100644 --- a/include/extractor/node_id.hpp +++ b/include/extractor/node_id.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef NODE_ID_HPP #define NODE_ID_HPP -#include "../typedefs.h" +#include "util/typedefs.hpp" struct Cmp { diff --git a/include/extractor/original_edge_data.hpp b/include/extractor/original_edge_data.hpp index cbbc1b2760c..b2009f69bf0 100644 --- a/include/extractor/original_edge_data.hpp +++ b/include/extractor/original_edge_data.hpp @@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ORIGINAL_EDGE_DATA_HPP #define ORIGINAL_EDGE_DATA_HPP -#include "travel_mode.hpp" -#include "turn_instructions.hpp" -#include "../typedefs.h" +#include "extractor/travel_mode.hpp" +#include "extractor/turn_instructions.hpp" +#include "util/typedefs.hpp" #include diff --git a/include/extractor/query_node.hpp b/include/extractor/query_node.hpp index 0f32a536f82..2c956262e53 100644 --- a/include/extractor/query_node.hpp +++ b/include/extractor/query_node.hpp @@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef QUERY_NODE_HPP #define QUERY_NODE_HPP -#include "../typedefs.h" +#include "util/typedefs.hpp" #include -#include +#include "osrm/coordinate.hpp" #include diff --git a/include/extractor/raster_source.hpp b/include/extractor/raster_source.hpp index 86c859639fa..d5bdc3937f2 100644 --- a/include/extractor/raster_source.hpp +++ b/include/extractor/raster_source.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef RASTER_SOURCE_HPP #define RASTER_SOURCE_HPP -#include "../util/osrm_exception.hpp" +#include "util/osrm_exception.hpp" #include #include diff --git a/include/extractor/restriction.hpp b/include/extractor/restriction.hpp index ecab4f92197..4cfeccd1d57 100644 --- a/include/extractor/restriction.hpp +++ b/include/extractor/restriction.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef RESTRICTION_HPP #define RESTRICTION_HPP -#include "../typedefs.h" +#include "util/typedefs.hpp" #include diff --git a/include/extractor/restriction_map.hpp b/include/extractor/restriction_map.hpp index dbca35651ff..64d65b873fe 100644 --- a/include/extractor/restriction_map.hpp +++ b/include/extractor/restriction_map.hpp @@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef RESTRICTION_MAP_HPP #define RESTRICTION_MAP_HPP -#include "restriction.hpp" -#include "../util/std_hash.hpp" -#include "../typedefs.h" +#include "extractor/restriction.hpp" +#include "util/std_hash.hpp" +#include "util/typedefs.hpp" #include diff --git a/include/extractor/restriction_parser.hpp b/include/extractor/restriction_parser.hpp index 11f94ee21e1..3d19bb9fffc 100644 --- a/include/extractor/restriction_parser.hpp +++ b/include/extractor/restriction_parser.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef RESTRICTION_PARSER_HPP #define RESTRICTION_PARSER_HPP -#include "../data_structures/restriction.hpp" +#include "extractor/restriction.hpp" #include diff --git a/include/extractor/tarjan_scc.hpp b/include/extractor/tarjan_scc.hpp index 59077322d60..ad829d1672e 100644 --- a/include/extractor/tarjan_scc.hpp +++ b/include/extractor/tarjan_scc.hpp @@ -28,18 +28,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef TARJAN_SCC_HPP #define TARJAN_SCC_HPP -#include "../typedefs.h" -#include "../data_structures/deallocating_vector.hpp" -#include "../data_structures/import_edge.hpp" -#include "../data_structures/query_node.hpp" -#include "../data_structures/percent.hpp" - -#include "../util/integer_range.hpp" -#include "../util/simple_logger.hpp" -#include "../util/std_hash.hpp" -#include "../util/timing_util.hpp" - -#include +#include "util/typedefs.hpp" +#include "util/deallocating_vector.hpp" +#include "extractor/import_edge.hpp" +#include "extractor/query_node.hpp" +#include "util/percent.hpp" + +#include "util/integer_range.hpp" +#include "util/simple_logger.hpp" +#include "util/std_hash.hpp" +#include "util/timing_util.hpp" + +#include "osrm/coordinate.hpp" #include #include diff --git a/include/osrm/route_parameters.hpp b/include/osrm/route_parameters.hpp index 6d2dda71977..700c55807b8 100644 --- a/include/osrm/route_parameters.hpp +++ b/include/osrm/route_parameters.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ROUTE_PARAMETERS_HPP #define ROUTE_PARAMETERS_HPP -#include +#include "coordinate.hpp" #include #include diff --git a/include/server/connection.hpp b/include/server/connection.hpp index aa6fd0544bf..315800d1a79 100644 --- a/include/server/connection.hpp +++ b/include/server/connection.hpp @@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef CONNECTION_HPP #define CONNECTION_HPP -#include "http/compression_type.hpp" -#include "http/reply.hpp" -#include "http/request.hpp" -#include "request_parser.hpp" +#include "server/http/compression_type.hpp" +#include "server/http/reply.hpp" +#include "server/http/request.hpp" +#include "server/request_parser.hpp" #include #include diff --git a/include/server/http/reply.hpp b/include/server/http/reply.hpp index 733818c2c9b..7689e5ed260 100644 --- a/include/server/http/reply.hpp +++ b/include/server/http/reply.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef REPLY_HPP #define REPLY_HPP -#include "header.hpp" +#include "server/http/header.hpp" #include diff --git a/include/server/request_parser.hpp b/include/server/request_parser.hpp index 3724613a762..920876dcf5a 100644 --- a/include/server/request_parser.hpp +++ b/include/server/request_parser.hpp @@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef REQUEST_PARSER_HPP #define REQUEST_PARSER_HPP -#include "http/compression_type.hpp" -#include "http/header.hpp" -#include "../data_structures/tribool.hpp" +#include "server/http/compression_type.hpp" +#include "server/http/header.hpp" +#include "util/tribool.hpp" #include diff --git a/include/server/server.hpp b/include/server/server.hpp index 80fae9704f7..48ac2686aa5 100644 --- a/include/server/server.hpp +++ b/include/server/server.hpp @@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SERVER_HPP #define SERVER_HPP -#include "connection.hpp" -#include "request_handler.hpp" +#include "server/connection.hpp" +#include "server/request_handler.hpp" -#include "../util/integer_range.hpp" -#include "../util/simple_logger.hpp" +#include "util/integer_range.hpp" +#include "util/simple_logger.hpp" #include #include diff --git a/include/util/datastore_options.hpp b/include/util/datastore_options.hpp index 4a8320c775b..ccb909f1433 100644 --- a/include/util/datastore_options.hpp +++ b/include/util/datastore_options.hpp @@ -29,9 +29,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define DATASTORE_OPTIONS_HPP #include "util/version.hpp" -#include "ini_file.hpp" -#include "osrm_exception.hpp" -#include "simple_logger.hpp" +#include "util/ini_file.hpp" +#include "util/osrm_exception.hpp" +#include "util/simple_logger.hpp" #include #include diff --git a/include/util/deallocating_vector.hpp b/include/util/deallocating_vector.hpp index 72cb0816c66..c98bd317430 100644 --- a/include/util/deallocating_vector.hpp +++ b/include/util/deallocating_vector.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef DEALLOCATING_VECTOR_HPP #define DEALLOCATING_VECTOR_HPP -#include "../util/integer_range.hpp" +#include "util/integer_range.hpp" #include diff --git a/include/util/debug_geometry.hpp b/include/util/debug_geometry.hpp index daa7e10742f..bf2b26bce31 100644 --- a/include/util/debug_geometry.hpp +++ b/include/util/debug_geometry.hpp @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef DEBUG_GEOMETRY_H #define DEBUG_GEOMETRY_H -#include "../contractor/contractor_options.hpp" -#include "../data_structures/query_node.hpp" +#include "contractor/contractor_options.hpp" +#include "extractor/query_node.hpp" #ifndef DEBUG_GEOMETRY @@ -57,8 +57,8 @@ inline void DEBUG_TURNS_STOP() {} #include #include -#include "../include/osrm/coordinate.hpp" -#include "../algorithms/coordinate_calculation.hpp" +#include "util/coordinate.hpp" +#include "util/coordinate_calculation.hpp" boost::filesystem::ofstream debug_geometry_file; bool dg_output_debug_geometry = false; diff --git a/include/util/dynamic_graph.hpp b/include/util/dynamic_graph.hpp index 4f63c02d482..c0cf2bb4d85 100644 --- a/include/util/dynamic_graph.hpp +++ b/include/util/dynamic_graph.hpp @@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef DYNAMICGRAPH_HPP #define DYNAMICGRAPH_HPP -#include "deallocating_vector.hpp" -#include "../util/integer_range.hpp" -#include "../typedefs.h" +#include "util/deallocating_vector.hpp" +#include "util/integer_range.hpp" +#include "util/typedefs.hpp" #include diff --git a/include/util/graph_loader.hpp b/include/util/graph_loader.hpp index 6ddd0ebcb4c..b720a9bdf8d 100644 --- a/include/util/graph_loader.hpp +++ b/include/util/graph_loader.hpp @@ -28,14 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef GRAPH_LOADER_HPP #define GRAPH_LOADER_HPP -#include "fingerprint.hpp" -#include "osrm_exception.hpp" -#include "simple_logger.hpp" -#include "../data_structures/external_memory_node.hpp" -#include "../data_structures/import_edge.hpp" -#include "../data_structures/query_node.hpp" -#include "../data_structures/restriction.hpp" -#include "../typedefs.h" +#include "util/fingerprint.hpp" +#include "util/osrm_exception.hpp" +#include "util/simple_logger.hpp" +#include "extractor/external_memory_node.hpp" +#include "extractor/import_edge.hpp" +#include "extractor/query_node.hpp" +#include "extractor/restriction.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/include/util/graph_utils.hpp b/include/util/graph_utils.hpp index 9af8dbc077f..d9d2fc46e3a 100644 --- a/include/util/graph_utils.hpp +++ b/include/util/graph_utils.hpp @@ -1,7 +1,7 @@ #ifndef GRAPH_UTILS_HPP #define GRAPH_UTILS_HPP -#include "../typedefs.h" +#include "util/typedefs.hpp" #include #include diff --git a/include/util/json_logger.hpp b/include/util/json_logger.hpp index 8726f78d99c..dbef457e6eb 100644 --- a/include/util/json_logger.hpp +++ b/include/util/json_logger.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef JSON_LOGGER_HPP #define JSON_LOGGER_HPP -#include +#include "osrm/json_container.hpp" #include diff --git a/include/util/json_renderer.hpp b/include/util/json_renderer.hpp index 09d7bb251b0..d44d507fa7c 100644 --- a/include/util/json_renderer.hpp +++ b/include/util/json_renderer.hpp @@ -31,10 +31,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef JSON_RENDERER_HPP #define JSON_RENDERER_HPP -#include "cast.hpp" -#include "string_util.hpp" +#include "util/cast.hpp" +#include "util/string_util.hpp" -#include +#include "osrm/json_container.hpp" namespace osrm { diff --git a/include/util/json_util.hpp b/include/util/json_util.hpp index bfb8a8bc44b..0804f0a6feb 100644 --- a/include/util/json_util.hpp +++ b/include/util/json_util.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef JSON_UTIL_HPP #define JSON_UTIL_HPP -#include +#include "osrm/json_container.hpp" #include #include diff --git a/include/util/matching_debug_info.hpp b/include/util/matching_debug_info.hpp index 28bc6ee3f92..a21c8f6bc95 100644 --- a/include/util/matching_debug_info.hpp +++ b/include/util/matching_debug_info.hpp @@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef MATCHING_DEBUG_INFO_HPP #define MATCHING_DEBUG_INFO_HPP -#include "json_logger.hpp" -#include "json_util.hpp" -#include "../data_structures/hidden_markov_model.hpp" +#include "util/json_logger.hpp" +#include "util/json_util.hpp" +#include "engine/map_matching/hidden_markov_model.hpp" -#include +#include "osrm/coordinate.hpp" // Provides the debug interface for introspection tools struct MatchingDebugInfo diff --git a/include/util/matrix_graph_wrapper.hpp b/include/util/matrix_graph_wrapper.hpp index f8b3e65bb2f..3439d6f2bd8 100644 --- a/include/util/matrix_graph_wrapper.hpp +++ b/include/util/matrix_graph_wrapper.hpp @@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "../typedefs.h" +#include "util/typedefs.hpp" // This Wrapper provides all methods that are needed for TarjanSCC, when the graph is given in a // matrix representation (e.g. as output from a distance table call) diff --git a/include/util/node_based_graph.hpp b/include/util/node_based_graph.hpp index e58cfceb450..42b53d626f6 100644 --- a/include/util/node_based_graph.hpp +++ b/include/util/node_based_graph.hpp @@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef NODE_BASED_GRAPH_HPP #define NODE_BASED_GRAPH_HPP -#include "dynamic_graph.hpp" -#include "import_edge.hpp" -#include "../util/graph_utils.hpp" +#include "util/dynamic_graph.hpp" +#include "extractor/import_edge.hpp" +#include "util/graph_utils.hpp" #include diff --git a/include/util/range_table.hpp b/include/util/range_table.hpp index e750c90a7e7..6de3debfd59 100644 --- a/include/util/range_table.hpp +++ b/include/util/range_table.hpp @@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef RANGE_TABLE_HPP #define RANGE_TABLE_HPP -#include "../util/integer_range.hpp" -#include "shared_memory_factory.hpp" -#include "shared_memory_vector_wrapper.hpp" +#include "util/integer_range.hpp" +#include "datastore/shared_memory_factory.hpp" +#include "util/shared_memory_vector_wrapper.hpp" #include #include diff --git a/include/util/rectangle.hpp b/include/util/rectangle.hpp index 7f6704a9b21..f4dd5280d42 100644 --- a/include/util/rectangle.hpp +++ b/include/util/rectangle.hpp @@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef RECTANGLE_HPP #define RECTANGLE_HPP -#include "../algorithms/coordinate_calculation.hpp" +#include "util/coordinate_calculation.hpp" #include -#include +#include "osrm/coordinate.hpp" #include #include diff --git a/include/util/routed_options.hpp b/include/util/routed_options.hpp index bfe8e5c36a5..6edcefb72f7 100644 --- a/include/util/routed_options.hpp +++ b/include/util/routed_options.hpp @@ -29,9 +29,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define ROUTED_OPTIONS_HPP #include "util/version.hpp" -#include "ini_file.hpp" -#include "osrm_exception.hpp" -#include "simple_logger.hpp" +#include "util/ini_file.hpp" +#include "util/osrm_exception.hpp" +#include "util/simple_logger.hpp" #include #include diff --git a/include/util/static_graph.hpp b/include/util/static_graph.hpp index 3b8f9273824..a2fd47333bf 100644 --- a/include/util/static_graph.hpp +++ b/include/util/static_graph.hpp @@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef STATIC_GRAPH_HPP #define STATIC_GRAPH_HPP -#include "percent.hpp" -#include "shared_memory_vector_wrapper.hpp" -#include "../util/integer_range.hpp" -#include "../typedefs.h" +#include "util/percent.hpp" +#include "util/shared_memory_vector_wrapper.hpp" +#include "util/integer_range.hpp" +#include "util/typedefs.hpp" #include diff --git a/include/util/static_rtree.hpp b/include/util/static_rtree.hpp index 6bc36782473..8483142e829 100644 --- a/include/util/static_rtree.hpp +++ b/include/util/static_rtree.hpp @@ -28,19 +28,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef STATIC_RTREE_HPP #define STATIC_RTREE_HPP -#include "deallocating_vector.hpp" -#include "hilbert_value.hpp" -#include "rectangle.hpp" -#include "shared_memory_factory.hpp" -#include "shared_memory_vector_wrapper.hpp" - -#include "../util/bearing.hpp" -#include "../util/integer_range.hpp" -#include "../util/mercator.hpp" -#include "../util/osrm_exception.hpp" -#include "../typedefs.h" - -#include +#include "util/deallocating_vector.hpp" +#include "util/hilbert_value.hpp" +#include "util/rectangle.hpp" +#include "datastore/shared_memory_factory.hpp" +#include "util/shared_memory_vector_wrapper.hpp" + +#include "util/bearing.hpp" +#include "util/integer_range.hpp" +#include "util/mercator.hpp" +#include "util/osrm_exception.hpp" +#include "util/typedefs.hpp" + +#include "osrm/coordinate.hpp" #include #include diff --git a/include/util/trigonometry_table.hpp b/include/util/trigonometry_table.hpp index 234a94e56c6..463dbbecd65 100644 --- a/include/util/trigonometry_table.hpp +++ b/include/util/trigonometry_table.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef TRIGONOMETRY_TABLE_HPP #define TRIGONOMETRY_TABLE_HPP -#include "../typedefs.h" +#include "util/typedefs.hpp" #include #include diff --git a/include/util/typedefs.hpp b/include/util/typedefs.hpp index dc77f39c76d..efc15965f02 100644 --- a/include/util/typedefs.hpp +++ b/include/util/typedefs.hpp @@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define TYPEDEFS_H #include -#include +#include "osrm/strong_typedef.hpp" #include // Necessary workaround for Windows as VS doesn't implement C99 diff --git a/include/util/xml_renderer.hpp b/include/util/xml_renderer.hpp index 44f7c2d9fc0..ffd155de8f0 100644 --- a/include/util/xml_renderer.hpp +++ b/include/util/xml_renderer.hpp @@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef XML_RENDERER_HPP #define XML_RENDERER_HPP -#include "cast.hpp" +#include "util/cast.hpp" -#include +#include "osrm/json_container.hpp" namespace osrm { diff --git a/include/util/xor_fast_hash_storage.hpp b/include/util/xor_fast_hash_storage.hpp index ff65717a3a5..f56ff7cb11c 100644 --- a/include/util/xor_fast_hash_storage.hpp +++ b/include/util/xor_fast_hash_storage.hpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef XOR_FAST_HASH_STORAGE_HPP #define XOR_FAST_HASH_STORAGE_HPP -#include "xor_fast_hash.hpp" +#include "util/xor_fast_hash.hpp" #include #include diff --git a/src/benchmarks/static_rtree.cpp b/src/benchmarks/static_rtree.cpp index ebe055cce74..26b1badcb32 100644 --- a/src/benchmarks/static_rtree.cpp +++ b/src/benchmarks/static_rtree.cpp @@ -25,13 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../data_structures/query_node.hpp" -#include "../data_structures/static_rtree.hpp" -#include "../data_structures/edge_based_node.hpp" -#include "../algorithms/geospatial_query.hpp" -#include "../util/timing_util.hpp" +#include "extractor/query_node.hpp" +#include "util/static_rtree.hpp" +#include "extractor/edge_based_node.hpp" +#include "engine/geospatial_query.hpp" +#include "util/timing_util.hpp" -#include +#include "osrm/coordinate.hpp" #include #include diff --git a/src/contractor/contractor_options.cpp b/src/contractor/contractor_options.cpp index d4834656361..aa9a328c4bf 100644 --- a/src/contractor/contractor_options.cpp +++ b/src/contractor/contractor_options.cpp @@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "contractor_options.hpp" +#include "contractor/contractor_options.hpp" #include "util/version.hpp" -#include "../util/simple_logger.hpp" +#include "util/simple_logger.hpp" #include #include diff --git a/src/contractor/processing_chain.cpp b/src/contractor/processing_chain.cpp index 2bd5350930f..d0d7d508d60 100644 --- a/src/contractor/processing_chain.cpp +++ b/src/contractor/processing_chain.cpp @@ -25,22 +25,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "processing_chain.hpp" -#include "contractor.hpp" +#include "contractor/processing_chain.hpp" +#include "contractor/contractor.hpp" -#include "contractor.hpp" +#include "contractor/contractor.hpp" -#include "../data_structures/deallocating_vector.hpp" +#include "util/deallocating_vector.hpp" -#include "../algorithms/crc32_processor.hpp" -#include "../util/graph_loader.hpp" -#include "../util/integer_range.hpp" -#include "../util/lua_util.hpp" -#include "../util/osrm_exception.hpp" -#include "../util/simple_logger.hpp" -#include "../util/string_util.hpp" -#include "../util/timing_util.hpp" -#include "../typedefs.h" +#include "contractor/crc32_processor.hpp" +#include "util/graph_loader.hpp" +#include "util/integer_range.hpp" +#include "util/lua_util.hpp" +#include "util/osrm_exception.hpp" +#include "util/simple_logger.hpp" +#include "util/string_util.hpp" +#include "util/timing_util.hpp" +#include "util/typedefs.hpp" #include @@ -55,7 +55,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "../util/debug_geometry.hpp" +#include "util/debug_geometry.hpp" Prepare::~Prepare() {} diff --git a/src/engine/descriptors/description_factory.cpp b/src/engine/descriptors/description_factory.cpp index 5086e0d17c8..a645987aa2d 100644 --- a/src/engine/descriptors/description_factory.cpp +++ b/src/engine/descriptors/description_factory.cpp @@ -25,15 +25,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "description_factory.hpp" - -#include "../algorithms/polyline_formatter.hpp" -#include "../algorithms/coordinate_calculation.hpp" -#include "../data_structures/internal_route_result.hpp" -#include "../data_structures/turn_instructions.hpp" -#include "../util/container.hpp" -#include "../util/integer_range.hpp" -#include "../typedefs.h" +#include "engine/descriptors/description_factory.hpp" + +#include "engine/polyline_formatter.hpp" +#include "util/coordinate_calculation.hpp" +#include "engine/internal_route_result.hpp" +#include "extractor/turn_instructions.hpp" +#include "util/container.hpp" +#include "util/integer_range.hpp" +#include "util/typedefs.hpp" DescriptionFactory::DescriptionFactory() : entire_length(0) { via_indices.push_back(0); } diff --git a/src/engine/douglas_peucker.cpp b/src/engine/douglas_peucker.cpp index 280c90fa876..e95a1497b1e 100644 --- a/src/engine/douglas_peucker.cpp +++ b/src/engine/douglas_peucker.cpp @@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "douglas_peucker.hpp" +#include "engine/douglas_peucker.hpp" -#include "../data_structures/segment_information.hpp" +#include "engine/segment_information.hpp" #include -#include +#include "osrm/coordinate.hpp" #include #include diff --git a/src/engine/osrm_impl.cpp b/src/engine/osrm_impl.cpp index 3f5b62b1923..04cc4a2e19c 100644 --- a/src/engine/osrm_impl.cpp +++ b/src/engine/osrm_impl.cpp @@ -33,30 +33,30 @@ class named_mutex; } } -#include "osrm_impl.hpp" - -#include "../plugins/distance_table.hpp" -#include "../plugins/hello_world.hpp" -#include "../plugins/nearest.hpp" -#include "../plugins/timestamp.hpp" -#include "../plugins/trip.hpp" -#include "../plugins/viaroute.hpp" -#include "../plugins/match.hpp" -#include "../server/data_structures/datafacade_base.hpp" -#include "../server/data_structures/internal_datafacade.hpp" -#include "../server/data_structures/shared_barriers.hpp" -#include "../server/data_structures/shared_datafacade.hpp" -#include "../util/make_unique.hpp" -#include "../util/routed_options.hpp" -#include "../util/simple_logger.hpp" +#include "engine/osrm_impl.hpp" + +#include "engine/plugins/distance_table.hpp" +#include "engine/plugins/hello_world.hpp" +#include "engine/plugins/nearest.hpp" +#include "engine/plugins/timestamp.hpp" +#include "engine/plugins/trip.hpp" +#include "engine/plugins/viaroute.hpp" +#include "engine/plugins/match.hpp" +#include "engine/datafacade/datafacade_base.hpp" +#include "engine/datafacade/internal_datafacade.hpp" +#include "engine/datafacade/shared_barriers.hpp" +#include "engine/datafacade/shared_datafacade.hpp" +#include "util/make_unique.hpp" +#include "util/routed_options.hpp" +#include "util/simple_logger.hpp" #include #include #include -#include -#include -#include +#include "osrm/route_parameters.hpp" +#include "osrm/libosrm_config.hpp" +#include "osrm/osrm.hpp" #include #include diff --git a/src/engine/phantom_node.cpp b/src/engine/phantom_node.cpp index 95c5bbb4ab8..bb1a7f38393 100644 --- a/src/engine/phantom_node.cpp +++ b/src/engine/phantom_node.cpp @@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "phantom_node.hpp" +#include "engine/phantom_node.hpp" -#include "../typedefs.h" -#include "travel_mode.hpp" +#include "util/typedefs.hpp" +#include "extractor/travel_mode.hpp" -#include +#include "osrm/coordinate.hpp" #include diff --git a/src/engine/polyline_compressor.cpp b/src/engine/polyline_compressor.cpp index 0db75dcc681..56e6ca24e99 100644 --- a/src/engine/polyline_compressor.cpp +++ b/src/engine/polyline_compressor.cpp @@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "polyline_compressor.hpp" -#include "../data_structures/segment_information.hpp" +#include "engine/polyline_compressor.hpp" +#include "engine/segment_information.hpp" -#include +#include "osrm/coordinate.hpp" std::string PolylineCompressor::encode_vector(std::vector &numbers) const { diff --git a/src/engine/polyline_formatter.cpp b/src/engine/polyline_formatter.cpp index 670a6121ffb..4b6ac48fbaf 100644 --- a/src/engine/polyline_formatter.cpp +++ b/src/engine/polyline_formatter.cpp @@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "polyline_formatter.hpp" +#include "engine/polyline_formatter.hpp" -#include "polyline_compressor.hpp" -#include "../data_structures/segment_information.hpp" +#include "engine/polyline_compressor.hpp" +#include "engine/segment_information.hpp" -#include +#include "osrm/coordinate.hpp" osrm::json::String PolylineFormatter::printEncodedString(const std::vector &polyline) const diff --git a/src/engine/route_parameters.cpp b/src/engine/route_parameters.cpp index 61789bbb43f..f753245204c 100644 --- a/src/engine/route_parameters.cpp +++ b/src/engine/route_parameters.cpp @@ -30,9 +30,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include +#include "osrm/route_parameters.hpp" -#include "../algorithms/polyline_compressor.hpp" +#include "engine/polyline_compressor.hpp" RouteParameters::RouteParameters() : zoom_level(18), print_instructions(false), alternate_route(true), geometry(true), diff --git a/src/engine/search_engine_data.cpp b/src/engine/search_engine_data.cpp index 3282a0ccb23..321d814b139 100644 --- a/src/engine/search_engine_data.cpp +++ b/src/engine/search_engine_data.cpp @@ -25,9 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "search_engine_data.hpp" +#include "engine/search_engine_data.hpp" -#include "binary_heap.hpp" +#include "util/binary_heap.hpp" void SearchEngineData::InitializeOrClearFirstThreadLocalStorage(const unsigned number_of_nodes) { diff --git a/src/extractor/compressed_edge_container.cpp b/src/extractor/compressed_edge_container.cpp index da916cee732..ee155d45883 100644 --- a/src/extractor/compressed_edge_container.cpp +++ b/src/extractor/compressed_edge_container.cpp @@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "compressed_edge_container.hpp" -#include "../util/simple_logger.hpp" +#include "extractor/compressed_edge_container.hpp" +#include "util/simple_logger.hpp" #include #include diff --git a/src/extractor/edge_based_graph_factory.cpp b/src/extractor/edge_based_graph_factory.cpp index f0c083d2d96..682773a9445 100644 --- a/src/extractor/edge_based_graph_factory.cpp +++ b/src/extractor/edge_based_graph_factory.cpp @@ -25,17 +25,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "edge_based_graph_factory.hpp" -#include "../algorithms/coordinate_calculation.hpp" -#include "../data_structures/percent.hpp" -#include "../util/compute_angle.hpp" -#include "../util/integer_range.hpp" -#include "../util/lua_util.hpp" -#include "../util/simple_logger.hpp" -#include "../util/timing_util.hpp" -#include "../util/osrm_exception.hpp" - -#include "../util/debug_geometry.hpp" +#include "extractor/edge_based_graph_factory.hpp" +#include "util/coordinate_calculation.hpp" +#include "util/percent.hpp" +#include "util/compute_angle.hpp" +#include "util/integer_range.hpp" +#include "util/lua_util.hpp" +#include "util/simple_logger.hpp" +#include "util/timing_util.hpp" +#include "util/osrm_exception.hpp" + +#include "util/debug_geometry.hpp" #include diff --git a/src/extractor/external_memory_node.cpp b/src/extractor/external_memory_node.cpp index d144f52a984..ebafbd2b73f 100644 --- a/src/extractor/external_memory_node.cpp +++ b/src/extractor/external_memory_node.cpp @@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "external_memory_node.hpp" -#include "query_node.hpp" +#include "extractor/external_memory_node.hpp" +#include "extractor/query_node.hpp" #include diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp index 48a626b1c5a..9592b9eba8b 100644 --- a/src/extractor/extraction_containers.cpp +++ b/src/extractor/extraction_containers.cpp @@ -25,18 +25,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "extraction_containers.hpp" -#include "extraction_way.hpp" - -#include "../algorithms/coordinate_calculation.hpp" -#include "../data_structures/node_id.hpp" -#include "../data_structures/range_table.hpp" - -#include "../util/osrm_exception.hpp" -#include "../util/simple_logger.hpp" -#include "../util/timing_util.hpp" -#include "../util/fingerprint.hpp" -#include "../util/lua_util.hpp" +#include "extractor/extraction_containers.hpp" +#include "extractor/extraction_way.hpp" + +#include "util/coordinate_calculation.hpp" +#include "extractor/node_id.hpp" +#include "util/range_table.hpp" + +#include "util/osrm_exception.hpp" +#include "util/simple_logger.hpp" +#include "util/timing_util.hpp" +#include "util/fingerprint.hpp" +#include "util/lua_util.hpp" #include #include diff --git a/src/extractor/extractor.cpp b/src/extractor/extractor.cpp index f442efe3150..6a2a1609d4b 100644 --- a/src/extractor/extractor.cpp +++ b/src/extractor/extractor.cpp @@ -25,31 +25,31 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "extractor.hpp" - -#include "extraction_containers.hpp" -#include "extraction_node.hpp" -#include "extraction_way.hpp" -#include "extractor_callbacks.hpp" -#include "restriction_parser.hpp" -#include "scripting_environment.hpp" - -#include "../data_structures/raster_source.hpp" -#include "../util/make_unique.hpp" -#include "../util/simple_logger.hpp" -#include "../util/timing_util.hpp" -#include "../util/lua_util.hpp" -#include "../util/graph_loader.hpp" - -#include "../typedefs.h" - -#include "../data_structures/static_graph.hpp" -#include "../data_structures/static_rtree.hpp" -#include "../data_structures/restriction_map.hpp" -#include "../data_structures/compressed_edge_container.hpp" - -#include "../algorithms/tarjan_scc.hpp" -#include "../algorithms/crc32_processor.hpp" +#include "extractor/extractor.hpp" + +#include "extractor/extraction_containers.hpp" +#include "extractor/extraction_node.hpp" +#include "extractor/extraction_way.hpp" +#include "extractor/extractor_callbacks.hpp" +#include "extractor/restriction_parser.hpp" +#include "extractor/scripting_environment.hpp" + +#include "extractor/raster_source.hpp" +#include "util/make_unique.hpp" +#include "util/simple_logger.hpp" +#include "util/timing_util.hpp" +#include "util/lua_util.hpp" +#include "util/graph_loader.hpp" + +#include "util/typedefs.hpp" + +#include "util/static_graph.hpp" +#include "util/static_rtree.hpp" +#include "extractor/restriction_map.hpp" +#include "extractor/compressed_edge_container.hpp" + +#include "extractor/tarjan_scc.hpp" +#include "contractor/crc32_processor.hpp" #include #include diff --git a/src/extractor/extractor_callbacks.cpp b/src/extractor/extractor_callbacks.cpp index 2eb1a9b467c..013b20966ef 100644 --- a/src/extractor/extractor_callbacks.cpp +++ b/src/extractor/extractor_callbacks.cpp @@ -25,21 +25,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "extractor_callbacks.hpp" -#include "extraction_containers.hpp" -#include "extraction_node.hpp" -#include "extraction_way.hpp" +#include "extractor/extractor_callbacks.hpp" +#include "extractor/extraction_containers.hpp" +#include "extractor/extraction_node.hpp" +#include "extractor/extraction_way.hpp" -#include "../data_structures/external_memory_node.hpp" -#include "../data_structures/restriction.hpp" -#include "../util/container.hpp" -#include "../util/simple_logger.hpp" +#include "extractor/external_memory_node.hpp" +#include "extractor/restriction.hpp" +#include "util/container.hpp" +#include "util/simple_logger.hpp" #include #include -#include +#include "osrm/coordinate.hpp" #include #include diff --git a/src/extractor/extractor_options.cpp b/src/extractor/extractor_options.cpp index b607dca95f9..2e0bc32b4ba 100644 --- a/src/extractor/extractor_options.cpp +++ b/src/extractor/extractor_options.cpp @@ -25,11 +25,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "extractor_options.hpp" +#include "extractor/extractor_options.hpp" #include "util/version.hpp" -#include "../util/ini_file.hpp" -#include "../util/simple_logger.hpp" +#include "util/ini_file.hpp" +#include "util/simple_logger.hpp" #include #include diff --git a/src/extractor/graph_compressor.cpp b/src/extractor/graph_compressor.cpp index f3b5f8dd957..c9e1d5b76a0 100644 --- a/src/extractor/graph_compressor.cpp +++ b/src/extractor/graph_compressor.cpp @@ -1,12 +1,12 @@ -#include "graph_compressor.hpp" +#include "extractor/graph_compressor.hpp" -#include "../data_structures/compressed_edge_container.hpp" -#include "../data_structures/dynamic_graph.hpp" -#include "../data_structures/node_based_graph.hpp" -#include "../data_structures/restriction_map.hpp" -#include "../data_structures/percent.hpp" +#include "extractor/compressed_edge_container.hpp" +#include "util/dynamic_graph.hpp" +#include "util/node_based_graph.hpp" +#include "extractor/restriction_map.hpp" +#include "util/percent.hpp" -#include "../util/simple_logger.hpp" +#include "util/simple_logger.hpp" GraphCompressor::GraphCompressor(SpeedProfileProperties speed_profile) : speed_profile(std::move(speed_profile)) diff --git a/src/extractor/import_edge.cpp b/src/extractor/import_edge.cpp index bf2829d4ed7..36c409cbeea 100644 --- a/src/extractor/import_edge.cpp +++ b/src/extractor/import_edge.cpp @@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "import_edge.hpp" +#include "extractor/import_edge.hpp" -#include "travel_mode.hpp" -#include "../typedefs.h" +#include "extractor/travel_mode.hpp" +#include "util/typedefs.hpp" bool NodeBasedEdge::operator<(const NodeBasedEdge &other) const { diff --git a/src/extractor/raster_source.cpp b/src/extractor/raster_source.cpp index 9e880a218f0..b5f9665a62a 100644 --- a/src/extractor/raster_source.cpp +++ b/src/extractor/raster_source.cpp @@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "raster_source.hpp" +#include "extractor/raster_source.hpp" -#include "../util/simple_logger.hpp" -#include "../util/timing_util.hpp" +#include "util/simple_logger.hpp" +#include "util/timing_util.hpp" -#include +#include "osrm/coordinate.hpp" #include diff --git a/src/extractor/restriction_map.cpp b/src/extractor/restriction_map.cpp index eb685be80f0..b92fc707e29 100644 --- a/src/extractor/restriction_map.cpp +++ b/src/extractor/restriction_map.cpp @@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "restriction_map.hpp" +#include "extractor/restriction_map.hpp" RestrictionMap::RestrictionMap(const std::vector &restriction_list) : m_count(0) { diff --git a/src/extractor/restriction_parser.cpp b/src/extractor/restriction_parser.cpp index 6a54cde2007..e3c1e3f143d 100644 --- a/src/extractor/restriction_parser.cpp +++ b/src/extractor/restriction_parser.cpp @@ -25,13 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "restriction_parser.hpp" -#include "extraction_way.hpp" +#include "extractor/restriction_parser.hpp" +#include "extractor/extraction_way.hpp" -#include "../data_structures/external_memory_node.hpp" -#include "../util/lua_util.hpp" -#include "../util/osrm_exception.hpp" -#include "../util/simple_logger.hpp" +#include "extractor/external_memory_node.hpp" +#include "util/lua_util.hpp" +#include "util/osrm_exception.hpp" +#include "util/simple_logger.hpp" #include #include diff --git a/src/extractor/scripting_environment.cpp b/src/extractor/scripting_environment.cpp index 9653ca049a5..df8cb92ce7b 100644 --- a/src/extractor/scripting_environment.cpp +++ b/src/extractor/scripting_environment.cpp @@ -25,18 +25,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "scripting_environment.hpp" - -#include "extraction_helper_functions.hpp" -#include "extraction_node.hpp" -#include "extraction_way.hpp" -#include "internal_extractor_edge.hpp" -#include "../data_structures/external_memory_node.hpp" -#include "../data_structures/raster_source.hpp" -#include "../util/lua_util.hpp" -#include "../util/osrm_exception.hpp" -#include "../util/simple_logger.hpp" -#include "../typedefs.h" +#include "extractor/scripting_environment.hpp" + +#include "extractor/extraction_helper_functions.hpp" +#include "extractor/extraction_node.hpp" +#include "extractor/extraction_way.hpp" +#include "extractor/internal_extractor_edge.hpp" +#include "extractor/external_memory_node.hpp" +#include "extractor/raster_source.hpp" +#include "util/lua_util.hpp" +#include "util/osrm_exception.hpp" +#include "util/simple_logger.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/src/server/connection.cpp b/src/server/connection.cpp index dbf85fd2a77..ddfac1c743c 100644 --- a/src/server/connection.cpp +++ b/src/server/connection.cpp @@ -25,9 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "connection.hpp" -#include "request_handler.hpp" -#include "request_parser.hpp" +#include "server/connection.hpp" +#include "server/request_handler.hpp" +#include "server/request_parser.hpp" #include #include diff --git a/src/server/http/reply.cpp b/src/server/http/reply.cpp index a3d3d96247e..39957add837 100644 --- a/src/server/http/reply.cpp +++ b/src/server/http/reply.cpp @@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "reply.hpp" +#include "server/http/reply.hpp" #include diff --git a/src/server/request_handler.cpp b/src/server/request_handler.cpp index 54f039502e3..a506df6719a 100644 --- a/src/server/request_handler.cpp +++ b/src/server/request_handler.cpp @@ -25,21 +25,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "request_handler.hpp" +#include "server/request_handler.hpp" -#include "api_grammar.hpp" -#include "http/reply.hpp" -#include "http/request.hpp" +#include "server/api_grammar.hpp" +#include "server/http/reply.hpp" +#include "server/http/request.hpp" -#include "../util/json_renderer.hpp" -#include "../util/simple_logger.hpp" -#include "../util/string_util.hpp" -#include "../util/xml_renderer.hpp" -#include "../typedefs.h" +#include "util/json_renderer.hpp" +#include "util/simple_logger.hpp" +#include "util/string_util.hpp" +#include "util/xml_renderer.hpp" +#include "util/typedefs.hpp" -#include -#include -#include +#include "osrm/route_parameters.hpp" +#include "osrm/json_container.hpp" +#include "osrm/osrm.hpp" #include diff --git a/src/server/request_parser.cpp b/src/server/request_parser.cpp index b52d730d941..83cebb1af18 100644 --- a/src/server/request_parser.cpp +++ b/src/server/request_parser.cpp @@ -25,13 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "request_parser.hpp" +#include "server/request_parser.hpp" -#include "http/compression_type.hpp" -#include "http/header.hpp" -#include "http/request.hpp" +#include "server/http/compression_type.hpp" +#include "server/http/header.hpp" +#include "server/http/request.hpp" -#include "../data_structures/tribool.hpp" +#include "util/tribool.hpp" #include diff --git a/src/tools/check-hsgr.cpp b/src/tools/check-hsgr.cpp index 2418a473fe1..0dc8310b343 100644 --- a/src/tools/check-hsgr.cpp +++ b/src/tools/check-hsgr.cpp @@ -24,13 +24,13 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../data_structures/percent.hpp" -#include "../data_structures/query_edge.hpp" -#include "../data_structures/static_graph.hpp" -#include "../util/integer_range.hpp" -#include "../util/graph_loader.hpp" -#include "../util/simple_logger.hpp" -#include "../util/osrm_exception.hpp" +#include "util/percent.hpp" +#include "contractor/query_edge.hpp" +#include "util/static_graph.hpp" +#include "util/integer_range.hpp" +#include "util/graph_loader.hpp" +#include "util/simple_logger.hpp" +#include "util/osrm_exception.hpp" #include #include diff --git a/src/tools/components.cpp b/src/tools/components.cpp index db0e52685c9..7634d9d8ee3 100644 --- a/src/tools/components.cpp +++ b/src/tools/components.cpp @@ -25,16 +25,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../typedefs.h" -#include "../algorithms/tarjan_scc.hpp" -#include "../algorithms/coordinate_calculation.hpp" -#include "../data_structures/dynamic_graph.hpp" -#include "../data_structures/static_graph.hpp" -#include "../util/fingerprint.hpp" -#include "../util/graph_loader.hpp" -#include "../util/make_unique.hpp" -#include "../util/osrm_exception.hpp" -#include "../util/simple_logger.hpp" +#include "util/typedefs.hpp" +#include "extractor/tarjan_scc.hpp" +#include "util/coordinate_calculation.hpp" +#include "util/dynamic_graph.hpp" +#include "util/static_graph.hpp" +#include "util/fingerprint.hpp" +#include "util/graph_loader.hpp" +#include "util/make_unique.hpp" +#include "util/osrm_exception.hpp" +#include "util/simple_logger.hpp" #include @@ -46,7 +46,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #endif -#include +#include "osrm/coordinate.hpp" #include #include diff --git a/src/tools/datastore.cpp b/src/tools/datastore.cpp index 504dd3d449d..42b600aa4fe 100644 --- a/src/tools/datastore.cpp +++ b/src/tools/datastore.cpp @@ -25,26 +25,26 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "data_structures/original_edge_data.hpp" -#include "data_structures/range_table.hpp" -#include "data_structures/query_edge.hpp" -#include "data_structures/query_node.hpp" -#include "data_structures/shared_memory_factory.hpp" -#include "data_structures/shared_memory_vector_wrapper.hpp" -#include "data_structures/static_graph.hpp" -#include "data_structures/static_rtree.hpp" -#include "data_structures/travel_mode.hpp" -#include "data_structures/turn_instructions.hpp" -#include "server/data_structures/datafacade_base.hpp" -#include "server/data_structures/shared_datatype.hpp" -#include "server/data_structures/shared_barriers.hpp" +#include "extractor/original_edge_data.hpp" +#include "util/range_table.hpp" +#include "contractor/query_edge.hpp" +#include "extractor/query_node.hpp" +#include "datastore/shared_memory_factory.hpp" +#include "util/shared_memory_vector_wrapper.hpp" +#include "util/static_graph.hpp" +#include "util/static_rtree.hpp" +#include "extractor/travel_mode.hpp" +#include "extractor/turn_instructions.hpp" +#include "engine/datafacade/datafacade_base.hpp" +#include "engine/datafacade/shared_datatype.hpp" +#include "engine/datafacade/shared_barriers.hpp" #include "util/datastore_options.hpp" #include "util/simple_logger.hpp" #include "util/osrm_exception.hpp" #include "util/fingerprint.hpp" -#include "typedefs.h" +#include "util/typedefs.hpp" -#include +#include "osrm/coordinate.hpp" using RTreeLeaf = BaseDataFacade::RTreeLeaf; using RTreeNode = StaticRTree::vector, true>::TreeNode; diff --git a/src/tools/io-benchmark.cpp b/src/tools/io-benchmark.cpp index 41e41b2b1cd..2de94c61b8b 100644 --- a/src/tools/io-benchmark.cpp +++ b/src/tools/io-benchmark.cpp @@ -26,9 +26,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "util/version.hpp" -#include "../util/osrm_exception.hpp" -#include "../util/simple_logger.hpp" -#include "../util/timing_util.hpp" +#include "util/osrm_exception.hpp" +#include "util/simple_logger.hpp" +#include "util/timing_util.hpp" #include #include diff --git a/src/tools/routed.cpp b/src/tools/routed.cpp index b4404c12ec5..4d132554933 100644 --- a/src/tools/routed.cpp +++ b/src/tools/routed.cpp @@ -30,8 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "util/routed_options.hpp" #include "util/simple_logger.hpp" -#include -#include +#include "osrm/osrm.hpp" +#include "osrm/libosrm_config.hpp" #ifdef __linux__ #include diff --git a/src/tools/simpleclient.cpp b/src/tools/simpleclient.cpp index 17058a64147..aa3aa262e79 100644 --- a/src/tools/simpleclient.cpp +++ b/src/tools/simpleclient.cpp @@ -26,14 +26,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "util/version.hpp" -#include "../util/json_renderer.hpp" -#include "../util/routed_options.hpp" -#include "../util/simple_logger.hpp" +#include "util/json_renderer.hpp" +#include "util/routed_options.hpp" +#include "util/simple_logger.hpp" -#include -#include -#include -#include +#include "osrm/json_container.hpp" +#include "osrm/libosrm_config.hpp" +#include "osrm/route_parameters.hpp" +#include "osrm/osrm.hpp" #include diff --git a/src/tools/springclean.cpp b/src/tools/springclean.cpp index 18e5711f97a..296d96e5cb0 100644 --- a/src/tools/springclean.cpp +++ b/src/tools/springclean.cpp @@ -27,10 +27,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include "../data_structures/shared_memory_factory.hpp" -#include "../server/data_structures/shared_datatype.hpp" +#include "datastore/shared_memory_factory.hpp" +#include "engine/datafacade/shared_datatype.hpp" #include "util/version.hpp" -#include "../util/simple_logger.hpp" +#include "util/simple_logger.hpp" void delete_region(const SharedDataType region) { diff --git a/src/tools/unlock_all_mutexes.cpp b/src/tools/unlock_all_mutexes.cpp index 953254ba8c9..3b4c9b07271 100644 --- a/src/tools/unlock_all_mutexes.cpp +++ b/src/tools/unlock_all_mutexes.cpp @@ -26,8 +26,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "util/version.hpp" -#include "../util/simple_logger.hpp" -#include "../server/data_structures/shared_barriers.hpp" +#include "util/simple_logger.hpp" +#include "engine/datafacade/shared_barriers.hpp" #include diff --git a/src/util/compute_angle.cpp b/src/util/compute_angle.cpp index 8cd8aa4410b..b821d795882 100644 --- a/src/util/compute_angle.cpp +++ b/src/util/compute_angle.cpp @@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "compute_angle.hpp" +#include "util/compute_angle.hpp" -#include "trigonometry_table.hpp" -#include "../util/mercator.hpp" +#include "util/trigonometry_table.hpp" +#include "util/mercator.hpp" -#include +#include "osrm/coordinate.hpp" #include diff --git a/src/util/coordinate.cpp b/src/util/coordinate.cpp index 208f3eb0766..63f81aadb99 100644 --- a/src/util/coordinate.cpp +++ b/src/util/coordinate.cpp @@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../algorithms/coordinate_calculation.hpp" +#include "util/coordinate_calculation.hpp" #ifndef NDEBUG -#include "../util/simple_logger.hpp" +#include "util/simple_logger.hpp" #endif -#include +#include "osrm/coordinate.hpp" #ifndef NDEBUG #include diff --git a/src/util/coordinate_calculation.cpp b/src/util/coordinate_calculation.cpp index ff7626e90ba..54ebaf947b7 100644 --- a/src/util/coordinate_calculation.cpp +++ b/src/util/coordinate_calculation.cpp @@ -25,14 +25,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "coordinate_calculation.hpp" +#include "util/coordinate_calculation.hpp" -#include "../util/mercator.hpp" -#include "../util/string_util.hpp" +#include "util/mercator.hpp" +#include "util/string_util.hpp" #include -#include +#include "osrm/coordinate.hpp" #include diff --git a/src/util/hilbert_value.cpp b/src/util/hilbert_value.cpp index d0d61e60a73..d653540307b 100644 --- a/src/util/hilbert_value.cpp +++ b/src/util/hilbert_value.cpp @@ -25,9 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "hilbert_value.hpp" +#include "util/hilbert_value.hpp" -#include +#include "osrm/coordinate.hpp" uint64_t HilbertCode::operator()(const FixedPointCoordinate ¤t_coordinate) const { diff --git a/src/util/mercator.cpp b/src/util/mercator.cpp index 0ccd999814f..239441aa653 100644 --- a/src/util/mercator.cpp +++ b/src/util/mercator.cpp @@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "mercator.hpp" +#include "util/mercator.hpp" #include diff --git a/src/util/osrm_exception.cpp b/src/util/osrm_exception.cpp index 9738b8e36b2..9715cac72cc 100644 --- a/src/util/osrm_exception.cpp +++ b/src/util/osrm_exception.cpp @@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "osrm_exception.hpp" +#include "util/osrm_exception.hpp" namespace osrm { diff --git a/src/util/simple_logger.cpp b/src/util/simple_logger.cpp index e3f4f8ed064..362dce63822 100644 --- a/src/util/simple_logger.cpp +++ b/src/util/simple_logger.cpp @@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "simple_logger.hpp" +#include "util/simple_logger.hpp" #ifdef _MSC_VER #include #define isatty _isatty diff --git a/unit_tests/engine/douglas_peucker.cpp b/unit_tests/engine/douglas_peucker.cpp index 8a3920976bf..519e90da433 100644 --- a/unit_tests/engine/douglas_peucker.cpp +++ b/unit_tests/engine/douglas_peucker.cpp @@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../../algorithms/douglas_peucker.hpp" -#include "../../data_structures/segment_information.hpp" +#include "engine/douglas_peucker.hpp" +#include "engine/segment_information.hpp" #include #include diff --git a/unit_tests/engine/geometry_string.cpp b/unit_tests/engine/geometry_string.cpp index ab9f357557e..7b2dd3ccb19 100644 --- a/unit_tests/engine/geometry_string.cpp +++ b/unit_tests/engine/geometry_string.cpp @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include "../../algorithms/polyline_compressor.hpp" -#include "../../algorithms/coordinate_calculation.hpp" +#include "engine/polyline_compressor.hpp" +#include "util/coordinate_calculation.hpp" #include diff --git a/unit_tests/extractor/compressed_edge_container.cpp b/unit_tests/extractor/compressed_edge_container.cpp index 12d9d3f4b04..4a83f04020e 100644 --- a/unit_tests/extractor/compressed_edge_container.cpp +++ b/unit_tests/extractor/compressed_edge_container.cpp @@ -1,5 +1,5 @@ -#include "../../data_structures/compressed_edge_container.hpp" -#include "../../typedefs.h" +#include "extractor/compressed_edge_container.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/unit_tests/extractor/graph_compressor.cpp b/unit_tests/extractor/graph_compressor.cpp index a3407c04d99..07e3b7ef7d3 100644 --- a/unit_tests/extractor/graph_compressor.cpp +++ b/unit_tests/extractor/graph_compressor.cpp @@ -1,9 +1,9 @@ -#include "../../algorithms/graph_compressor.hpp" -#include "../../data_structures/compressed_edge_container.hpp" -#include "../../data_structures/restriction_map.hpp" -#include "../../data_structures/node_based_graph.hpp" -#include "../../extractor/speed_profile.hpp" -#include "../../typedefs.h" +#include "extractor/graph_compressor.hpp" +#include "extractor/compressed_edge_container.hpp" +#include "extractor/restriction_map.hpp" +#include "util/node_based_graph.hpp" +#include "extractor/speed_profile.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/unit_tests/extractor/raster_source.cpp b/unit_tests/extractor/raster_source.cpp index 691cba108e2..0406676b96e 100644 --- a/unit_tests/extractor/raster_source.cpp +++ b/unit_tests/extractor/raster_source.cpp @@ -25,9 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../../data_structures/raster_source.hpp" -#include "../../typedefs.h" -#include "../../util/osrm_exception.hpp" +#include "extractor/raster_source.hpp" +#include "util/typedefs.hpp" +#include "util/osrm_exception.hpp" #include diff --git a/unit_tests/util/bearing.cpp b/unit_tests/util/bearing.cpp index f0866de3322..93d3eb31352 100644 --- a/unit_tests/util/bearing.cpp +++ b/unit_tests/util/bearing.cpp @@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../../util/bearing.hpp" -#include "../../typedefs.h" +#include "util/bearing.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/unit_tests/util/binary_heap.cpp b/unit_tests/util/binary_heap.cpp index ee22a1fbbca..6b7cf64ff49 100644 --- a/unit_tests/util/binary_heap.cpp +++ b/unit_tests/util/binary_heap.cpp @@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../../data_structures/binary_heap.hpp" -#include "../../typedefs.h" +#include "util/binary_heap.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/unit_tests/util/coordinate.cpp b/unit_tests/util/coordinate.cpp index e8209763e23..f153175ab06 100644 --- a/unit_tests/util/coordinate.cpp +++ b/unit_tests/util/coordinate.cpp @@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include "../../algorithms/coordinate_calculation.hpp" +#include "util/coordinate_calculation.hpp" #include diff --git a/unit_tests/util/duration_parsing.cpp b/unit_tests/util/duration_parsing.cpp index e3035dce76a..d0599106a82 100644 --- a/unit_tests/util/duration_parsing.cpp +++ b/unit_tests/util/duration_parsing.cpp @@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../../extractor/extraction_helper_functions.hpp" +#include "extractor/extraction_helper_functions.hpp" #include #include diff --git a/unit_tests/util/dynamic_graph.cpp b/unit_tests/util/dynamic_graph.cpp index df8eb21b189..585d2e47127 100644 --- a/unit_tests/util/dynamic_graph.cpp +++ b/unit_tests/util/dynamic_graph.cpp @@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../../data_structures/dynamic_graph.hpp" -#include "../../typedefs.h" +#include "util/dynamic_graph.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/unit_tests/util/range_table.cpp b/unit_tests/util/range_table.cpp index 065840ba1e9..8d30a0876a1 100644 --- a/unit_tests/util/range_table.cpp +++ b/unit_tests/util/range_table.cpp @@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../../data_structures/range_table.hpp" -#include "../../typedefs.h" +#include "util/range_table.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/unit_tests/util/static_graph.cpp b/unit_tests/util/static_graph.cpp index ddadd7fdbbe..21c034be2d9 100644 --- a/unit_tests/util/static_graph.cpp +++ b/unit_tests/util/static_graph.cpp @@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../../data_structures/static_graph.hpp" -#include "../../typedefs.h" +#include "util/static_graph.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/unit_tests/util/static_rtree.cpp b/unit_tests/util/static_rtree.cpp index 2539d5ffb22..33c9eed74bd 100644 --- a/unit_tests/util/static_rtree.cpp +++ b/unit_tests/util/static_rtree.cpp @@ -25,13 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../../algorithms/coordinate_calculation.hpp" -#include "../../algorithms/geospatial_query.hpp" -#include "../../data_structures/static_rtree.hpp" -#include "../../data_structures/query_node.hpp" -#include "../../data_structures/edge_based_node.hpp" -#include "../../util/floating_point.hpp" -#include "../../typedefs.h" +#include "util/coordinate_calculation.hpp" +#include "engine/geospatial_query.hpp" +#include "util/static_rtree.hpp" +#include "extractor/query_node.hpp" +#include "extractor/edge_based_node.hpp" +#include "util/floating_point.hpp" +#include "util/typedefs.hpp" #include #include diff --git a/unit_tests/util/string_util.cpp b/unit_tests/util/string_util.cpp index cf82eba5bfc..9ec734aebff 100644 --- a/unit_tests/util/string_util.cpp +++ b/unit_tests/util/string_util.cpp @@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../../util/string_util.hpp" +#include "util/string_util.hpp" #include #include From 02a49c8a686de35f721360adf760140b50c2f782 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Sun, 3 Jan 2016 17:03:20 +0100 Subject: [PATCH 6/7] Use local includes before system includes --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 67bd60dedc7..c64c5d97843 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,8 +33,8 @@ option(ENABLE_JSON_LOGGING "Adds additional JSON debug logging to the response" option(DEBUG_GEOMETRY "Enables an option to dump GeoJSON of the final routing graph" OFF) option(BUILD_TOOLS "Build OSRM tools" OFF) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/) +include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/) include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/) include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include/) From facbe2c012994026cdfe6c0dc8045c2de46100fc Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Sun, 3 Jan 2016 18:10:09 +0100 Subject: [PATCH 7/7] Fix test names for travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0659495bb8..dc040514229 100644 --- a/.travis.yml +++ b/.travis.yml @@ -139,8 +139,8 @@ script: - make --jobs=2 - make tests --jobs=2 - make benchmarks - - ./algorithm-tests - - ./datastructure-tests + - ./extractor-tests + - ./engine-tests - ./util-tests - cd .. - cucumber -p verify