Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix include paths

Browse Source
This commit is contained in:
Patrick Niklaus
2016-01-02 17:13:44 +01:00
parent b618a1241f
commit 97585bb26a
145 changed files with 627 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/engine/datafacade/datafacade_base.hpp
+9 -9
View File
@@ -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 "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 "osrm/coordinate.hpp"
#include <string>
#include <boost/optional.hpp>
include/engine/datafacade/internal_datafacade.hpp
+12 -12
View File
@@ -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 "engine/datafacade/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 "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 "osrm/coordinate.hpp"
#include <boost/thread.hpp>
include/engine/datafacade/shared_datafacade.hpp
+8 -8
View File
@@ -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 "engine/datafacade/datafacade_base.hpp"
#include "engine/datafacade/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/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 <boost/thread.hpp>
include/engine/datafacade/shared_datatype.hpp
+2 -2
View File
@@ -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 <cstdint>
include/engine/descriptors/description_factory.hpp
+6 -6
View File
@@ -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 <boost/assert.hpp>
#include <osrm/coordinate.hpp>
#include <osrm/json_container.hpp>
#include "osrm/coordinate.hpp"
#include "osrm/json_container.hpp"
#include <cmath>
include/engine/descriptors/descriptor_base.hpp
+5 -5
View File
@@ -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 <boost/assert.hpp>
#include <osrm/json_container.hpp>
#include "osrm/json_container.hpp"
#include <string>
#include <unordered_map>
include/engine/descriptors/gpx_descriptor.hpp
+3 -3
View File
@@ -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 <osrm/json_container.hpp>
#include "osrm/json_container.hpp"
#include <iostream>
include/engine/descriptors/json_descriptor.hpp
+14 -14
View File
@@ -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 "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 "osrm/json_container.hpp"
#include <limits>
#include <algorithm>
include/engine/douglas_peucker.hpp
+1 -1
View File
@@ -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 <array>
#include <stack>
include/engine/geospatial_query.hpp
+5 -5
View File
@@ -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 <osrm/coordinate.hpp>
#include "osrm/coordinate.hpp"
#include <vector>
#include <memory>
include/engine/internal_route_result.hpp
+5 -5
View File
@@ -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 <osrm/coordinate.hpp>
#include "osrm/coordinate.hpp"
#include <vector>
include/engine/map_matching/hidden_markov_model.hpp
+1 -1
View File
@@ -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 <boost/assert.hpp>
include/engine/osrm_impl.hpp
+4 -4
View File
@@ -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 <osrm/json_container.hpp>
#include <osrm/libosrm_config.hpp>
#include <osrm/osrm.hpp>
#include "osrm/json_container.hpp"
#include "osrm/libosrm_config.hpp"
#include "osrm/osrm.hpp"
#include <memory>
#include <unordered_map>
include/engine/phantom_node.hpp
+3 -3
View File
@@ -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 <osrm/coordinate.hpp>
#include "osrm/coordinate.hpp"
#include <iostream>
#include <utility>
include/engine/plugins/distance_table.hpp
+10 -10
View File
@@ -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 "engine/plugins/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 "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 "osrm/json_container.hpp"
#include <cstdlib>
include/engine/plugins/hello_world.hpp
+3 -3
View File
@@ -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 <osrm/json_container.hpp>
#include "osrm/json_container.hpp"
#include <string>
include/engine/plugins/match.hpp
+12 -12
View File
@@ -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 "engine/plugins/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/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 <cstdlib>
include/engine/plugins/nearest.hpp
+5 -5
View File
@@ -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 <osrm/json_container.hpp>
#include "osrm/json_container.hpp"
#include <string>
include/engine/plugins/plugin_base.hpp
+4 -4
View File
@@ -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 <osrm/coordinate.hpp>
#include <osrm/json_container.hpp>
#include <osrm/route_parameters.hpp>
#include "osrm/coordinate.hpp"
#include "osrm/json_container.hpp"
#include "osrm/route_parameters.hpp"
#include <algorithm>
#include <string>
include/engine/plugins/timestamp.hpp
+3 -3
View File
@@ -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 <osrm/json_container.hpp>
#include "osrm/json_container.hpp"
#include <string>
include/engine/plugins/trip.hpp
+15 -15
View File
@@ -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 "engine/plugins/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/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 <osrm/json_container.hpp>
#include "osrm/json_container.hpp"
#include <boost/assert.hpp>
#include <cstdlib>
include/engine/plugins/viaroute.hpp
+12 -12
View File
@@ -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 "engine/plugins/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 "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 "osrm/json_container.hpp"
#include <cstdlib>
include/engine/polyline_compressor.hpp
+1 -1
View File
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
struct SegmentInformation;
#include <osrm/coordinate.hpp>
#include "osrm/coordinate.hpp"
#include <string>
#include <vector>
include/engine/polyline_formatter.hpp
+1 -1
View File
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
struct SegmentInformation;
#include <osrm/json_container.hpp>
#include "osrm/json_container.hpp"
#include <string>
#include <vector>
include/engine/routing_algorithms/alternative_path.hpp
+4 -4
View File
@@ -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 <boost/assert.hpp>
include/engine/routing_algorithms/direct_shortest_path.hpp
+5 -5
View File
@@ -31,11 +31,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/assert.hpp>
#include <iterator>
#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
include/engine/routing_algorithms/many_to_many.hpp
+3 -3
View File
@@ -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 <boost/assert.hpp>
include/engine/routing_algorithms/map_matching.hpp
+5 -5
View File
@@ -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 <cstddef>
include/engine/routing_algorithms/routing_base.hpp
+4 -4
View File
@@ -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 <boost/assert.hpp>
include/engine/routing_algorithms/shortest_path.hpp
+4 -4
View File
@@ -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 <boost/assert.hpp>
include/engine/search_engine.hpp
+6 -6
View File
@@ -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 <type_traits>
include/engine/search_engine_data.hpp
+2 -2
View File
@@ -30,8 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/thread/tss.hpp>
#include "../typedefs.h"
#include "binary_heap.hpp"
#include "util/typedefs.hpp"
#include "util/binary_heap.hpp"
struct HeapData
{
include/engine/segment_information.hpp
+4 -4
View File
@@ -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 <osrm/coordinate.hpp>
#include "osrm/coordinate.hpp"
#include <utility>
// Struct fits everything in one cache line
include/engine/trip/trip_brute_force.hpp
+4 -4
View File
@@ -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 <osrm/json_container.hpp>
#include "osrm/json_container.hpp"
#include <cstdlib>
#include <algorithm>
include/engine/trip/trip_farthest_insertion.hpp
+3 -3
View File
@@ -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 <osrm/json_container.hpp>
#include "osrm/json_container.hpp"
#include <boost/assert.hpp>
#include <cstdlib>
include/engine/trip/trip_nearest_neighbour.hpp
+4 -4
View File
@@ -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 <osrm/json_container.hpp>
#include "osrm/json_container.hpp"
#include <cstdlib>
#include <algorithm>
include/engine/trip/trip_tabu_search.hpp
+3 -3
View File
@@ -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 <osrm/json_container.hpp>
#include "osrm/json_container.hpp"
#include <cstdlib>
#include <algorithm>