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

renamed: DataStructures/* -> data_structures/*

Browse Source
This commit is contained in:
Dennis Luxen 2014-11-28 12:13:18 +01:00
parent 7b3a0c5105
commit 58de37e822
111 changed files with 489 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -36,7 +36,7 @@ Thumbs.db
# build related files # # build related files #
####################### #######################
/build/ /build/
/Util/FingerPrint.cpp /Util/finger_print.cpp
/Util/GitDescription.cpp /Util/GitDescription.cpp
/cmake/postinst /cmake/postinst

2
Algorithms/bfs_components.hpp
View File

@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define BFS_COMPONENTS_HPP_ #define BFS_COMPONENTS_HPP_
#include "../typedefs.h" #include "../typedefs.h"
#include "../DataStructures/restriction_map.hpp" #include "../data_structures/restriction_map.hpp"
#include <queue> #include <queue>
#include <unordered_set> #include <unordered_set>

4
Algorithms/douglas_peucker.cpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "douglas_peucker.hpp" #include "douglas_peucker.hpp"
#include "../DataStructures/segment_information.hpp" #include "../data_structures/segment_information.hpp"
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>

2
Algorithms/polyline_compressor.cpp
View File

@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "polyline_compressor.hpp" #include "polyline_compressor.hpp"
#include "../DataStructures/segment_information.hpp" #include "../data_structures/segment_information.hpp"
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>

2
Algorithms/polyline_formatter.cpp
View File

@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "polyline_formatter.hpp" #include "polyline_formatter.hpp"
#include "polyline_compressor.hpp" #include "polyline_compressor.hpp"
#include "../DataStructures/segment_information.hpp" #include "../data_structures/segment_information.hpp"
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>

10
Algorithms/polyline_formatter.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef POLYLINE_FORMATTER_H_ #ifndef POLYLINE_FORMATTER_HPP
#define POLYLINE_FORMATTER_H_ #define POLYLINE_FORMATTER_HPP
struct SegmentInformation; struct SegmentInformation;
#include "../DataStructures/JSONContainer.h" #include "../data_structures/json_container.hpp"
#include <string> #include <string>
#include <vector> #include <vector>
@ -42,4 +42,4 @@ struct PolylineFormatter
JSON::Array printUnencodedString(const std::vector<SegmentInformation> &polyline) const; JSON::Array printUnencodedString(const std::vector<SegmentInformation> &polyline) const;
}; };
#endif /* POLYLINE_FORMATTER_H_ */ #endif /* POLYLINE_FORMATTER_HPP */

22
Algorithms/tiny_components.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,17 +25,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef STRONGLYCONNECTEDCOMPONENTS_H_ #ifndef TINY_COMPONENTS_HPP
#define STRONGLYCONNECTEDCOMPONENTS_H_ #define TINY_COMPONENTS_HPP
#include "../typedefs.h" #include "../typedefs.h"
#include "../DataStructures/DeallocatingVector.h" #include "../data_structures/deallocating_vector.hpp"
#include "../DataStructures/DynamicGraph.h" #include "../data_structures/dynamic_graph.hpp"
#include "../DataStructures/ImportEdge.h" #include "../data_structures/import_edge.hpp"
#include "../DataStructures/QueryNode.h" #include "../data_structures/query_node.hpp"
#include "../DataStructures/Percent.h" #include "../data_structures/percent.hpp"
#include "../DataStructures/Restriction.h" #include "../data_structures/restriction.hpp"
#include "../DataStructures/TurnInstructions.h" #include "../data_structures/turn_instructions.hpp"
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"
#include "../Util/OSRMException.h" #include "../Util/OSRMException.h"
@ -456,4 +456,4 @@ class TarjanSCC
} }
}; };
#endif /* STRONGLYCONNECTEDCOMPONENTS_H_ */ #endif /* TINY_COMPONENTS_HPP */

10
Benchmarks/static_rtree.cpp
View File

@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../DataStructures/OriginalEdgeData.h" #include "../data_structures/original_edge_data.hpp"
#include "../DataStructures/QueryNode.h" #include "../data_structures/query_node.hpp"
#include "../DataStructures/SharedMemoryVectorWrapper.h" #include "../data_structures/shared_memory_vector_wrapper.hpp"
#include "../DataStructures/StaticRTree.h" #include "../data_structures/static_rtree.hpp"
#include "../data_structures/edge_based_node.hpp"
#include "../Util/BoostFileSystemFix.h" #include "../Util/BoostFileSystemFix.h"
#include "../DataStructures/EdgeBasedNode.h"
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>

24
CMakeLists.txt
View File

@ -33,15 +33,15 @@ OPTION(BUILD_TOOLS "Build OSRM tools" OFF)
include_directories(${CMAKE_SOURCE_DIR}/Include/) include_directories(${CMAKE_SOURCE_DIR}/Include/)
include_directories(${CMAKE_SOURCE_DIR}/ThirdParty/) include_directories(${CMAKE_SOURCE_DIR}/ThirdParty/)
add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/Util/FingerPrint.cpp FingerPrint.cpp.alwaysbuild add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/Util/finger_print.cpp finger_print.cpp.alwaysbuild
COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_SOURCE_DIR} COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FingerPrint-Config.cmake -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FingerPrint-Config.cmake
DEPENDS DEPENDS
${CMAKE_SOURCE_DIR}/Util/FingerPrint.cpp.in ${CMAKE_SOURCE_DIR}/Util/finger_print.cpp.in
COMMENT "Configuring FingerPrint.cpp" COMMENT "Configuring finger_print.cpp"
VERBATIM) VERBATIM)
add_custom_target(FingerPrintConfigure DEPENDS ${CMAKE_SOURCE_DIR}/Util/FingerPrint.cpp) add_custom_target(FingerPrintConfigure DEPENDS ${CMAKE_SOURCE_DIR}/Util/finger_print.cpp)
add_custom_target(tests DEPENDS datastructure-tests algorithm-tests) add_custom_target(tests DEPENDS datastructure-tests algorithm-tests)
add_custom_target(benchmarks DEPENDS rtree-bench) add_custom_target(benchmarks DEPENDS rtree-bench)
@ -52,27 +52,27 @@ configure_file(
${CMAKE_SOURCE_DIR}/Util/GitDescription.cpp ${CMAKE_SOURCE_DIR}/Util/GitDescription.cpp
) )
file(GLOB ExtractorGlob Extractor/*.cpp) file(GLOB ExtractorGlob Extractor/*.cpp)
file(GLOB ImporterGlob DataStructures/ImportEdge.cpp DataStructures/ExternalMemoryNode.cpp) file(GLOB ImporterGlob data_structures/import_edge.cpp data_structures/external_memory_node.cpp)
add_library(IMPORT OBJECT ${ImporterGlob}) add_library(IMPORT OBJECT ${ImporterGlob})
add_library(LOGGER OBJECT Util/simple_logger.cpp) add_library(LOGGER OBJECT Util/simple_logger.cpp)
add_library(PHANTOMNODE OBJECT DataStructures/phantom_node.cpp) add_library(PHANTOMNODE OBJECT data_structures/phantom_node.cpp)
set(ExtractorSources extractor.cpp ${ExtractorGlob}) set(ExtractorSources extractor.cpp ${ExtractorGlob})
add_executable(osrm-extract ${ExtractorSources} $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:LOGGER>) add_executable(osrm-extract ${ExtractorSources} $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:LOGGER>)
file(GLOB PrepareGlob contractor/*.cpp DataStructures/HilbertValue.cpp DataStructures/restriction_map.cpp Util/compute_angle.cpp) file(GLOB PrepareGlob contractor/*.cpp data_structures/hilbert_value.cpp data_structures/restriction_map.cpp Util/compute_angle.cpp)
set(PrepareSources prepare.cpp ${PrepareGlob}) set(PrepareSources prepare.cpp ${PrepareGlob})
add_executable(osrm-prepare ${PrepareSources} $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:LOGGER>) add_executable(osrm-prepare ${PrepareSources} $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:LOGGER>)
file(GLOB ServerGlob Server/*.cpp) file(GLOB ServerGlob Server/*.cpp)
file(GLOB DescriptorGlob Descriptors/*.cpp) file(GLOB DescriptorGlob Descriptors/*.cpp)
file(GLOB DatastructureGlob DataStructures/SearchEngineData.cpp DataStructures/RouteParameters.cpp Util/bearing.cpp) file(GLOB DatastructureGlob data_structures/search_engine_data.cpp data_structures/route_parameters.cpp Util/bearing.cpp)
list(REMOVE_ITEM DatastructureGlob DataStructures/Coordinate.cpp) list(REMOVE_ITEM DatastructureGlob data_structures/Coordinate.cpp)
file(GLOB CoordinateGlob DataStructures/Coordinate.cpp) file(GLOB CoordinateGlob data_structures/Coordinate.cpp)
file(GLOB AlgorithmGlob algorithms/*.cpp) file(GLOB AlgorithmGlob algorithms/*.cpp)
file(GLOB HttpGlob Server/Http/*.cpp) file(GLOB HttpGlob Server/Http/*.cpp)
file(GLOB LibOSRMGlob Library/*.cpp) file(GLOB LibOSRMGlob Library/*.cpp)
file(GLOB DataStructureTestsGlob UnitTests/DataStructures/*.cpp DataStructures/HilbertValue.cpp) file(GLOB DataStructureTestsGlob UnitTests/data_structures/*.cpp data_structures/hilbert_value.cpp)
file(GLOB AlgorithmTestsGlob UnitTests/Algorithms/*.cpp) file(GLOB AlgorithmTestsGlob UnitTests/Algorithms/*.cpp)
set( set(
@ -85,7 +85,7 @@ set(
${HttpGlob} ${HttpGlob}
) )
add_library(COORDINATE OBJECT ${CoordinateGlob}) add_library(COORDINATE OBJECT ${CoordinateGlob})
add_library(FINGERPRINT OBJECT Util/FingerPrint.cpp) add_library(FINGERPRINT OBJECT Util/finger_print.cpp)
add_library(GITDESCRIPTION OBJECT Util/GitDescription.cpp) add_library(GITDESCRIPTION OBJECT Util/GitDescription.cpp)
add_library(OSRM ${OSRMSources} $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE>) add_library(OSRM ${OSRMSources} $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE>)
add_dependencies(FINGERPRINT FingerPrintConfigure) add_dependencies(FINGERPRINT FingerPrintConfigure)

14
Contractor/contractor.hpp
View File

@ -28,13 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef CONTRACTOR_HPP #ifndef CONTRACTOR_HPP
#define CONTRACTOR_HPP #define CONTRACTOR_HPP
#include "../DataStructures/BinaryHeap.h" #include "../data_structures/binary_heap.hpp"
#include "../DataStructures/DeallocatingVector.h" #include "../data_structures/deallocating_vector.hpp"
#include "../DataStructures/DynamicGraph.h" #include "../data_structures/dynamic_graph.hpp"
#include "../DataStructures/Percent.h" #include "../data_structures/percent.hpp"
#include "../DataStructures/QueryEdge.h" #include "../data_structures/query_edge.hpp"
#include "../DataStructures/XORFastHash.h" #include "../data_structures/xor_fast_hash.hpp"
#include "../DataStructures/XORFastHashStorage.h" #include "../data_structures/xor_fast_hash_storage.hpp"
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"
#include "../Util/simple_logger.hpp" #include "../Util/simple_logger.hpp"
#include "../Util/StringUtil.h" #include "../Util/StringUtil.h"

6
Descriptors/BaseDescriptor.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef BASE_DESCRIPTOR_H #ifndef BASE_DESCRIPTOR_H
#define BASE_DESCRIPTOR_H #define BASE_DESCRIPTOR_H
#include "../DataStructures/phantom_node.hpp" #include "../data_structures/phantom_node.hpp"
#include "../DataStructures/RawRouteData.h" #include "../data_structures/raw_route_data.hpp"
#include "../typedefs.h" #include "../typedefs.h"
#include <osrm/Reply.h> #include <osrm/Reply.h>

4
Descriptors/DescriptionFactory.cpp
View File

@ -31,8 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../typedefs.h" #include "../typedefs.h"
#include "../algorithms/polyline_formatter.hpp" #include "../algorithms/polyline_formatter.hpp"
#include "../DataStructures/RawRouteData.h" #include "../data_structures/raw_route_data.hpp"
#include "../DataStructures/TurnInstructions.h" #include "../data_structures/turn_instructions.hpp"
DescriptionFactory::DescriptionFactory() : entire_length(0) { via_indices.push_back(0); } DescriptionFactory::DescriptionFactory() : entire_length(0) { via_indices.push_back(0); }

8
Descriptors/DescriptionFactory.h
View File

@ -29,10 +29,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define DESCRIPTIONFACTORY_H_ #define DESCRIPTIONFACTORY_H_
#include "../algorithms/douglas_peucker.hpp" #include "../algorithms/douglas_peucker.hpp"
#include "../DataStructures/phantom_node.hpp" #include "../data_structures/phantom_node.hpp"
#include "../DataStructures/JSONContainer.h" #include "../data_structures/json_container.hpp"
#include "../DataStructures/segment_information.hpp" #include "../data_structures/segment_information.hpp"
#include "../DataStructures/TurnInstructions.h" #include "../data_structures/turn_instructions.hpp"
#include "../typedefs.h" #include "../typedefs.h"
#include <boost/assert.hpp> #include <boost/assert.hpp>

4
Descriptors/GPXDescriptor.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define GPX_DESCRIPTOR_H #define GPX_DESCRIPTOR_H
#include "BaseDescriptor.h" #include "BaseDescriptor.h"
#include "../DataStructures/JSONContainer.h" #include "../data_structures/json_container.hpp"
#include "../Util/xml_renderer.hpp" #include "../Util/xml_renderer.hpp"
#include <iostream> #include <iostream>

6
Descriptors/JSONDescriptor.h
View File

@ -32,9 +32,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "DescriptionFactory.h" #include "DescriptionFactory.h"
#include "../algorithms/object_encoder.hpp" #include "../algorithms/object_encoder.hpp"
#include "../algorithms/route_name_extraction.hpp" #include "../algorithms/route_name_extraction.hpp"
#include "../DataStructures/JSONContainer.h" #include "../data_structures/json_container.hpp"
#include "../DataStructures/segment_information.hpp" #include "../data_structures/segment_information.hpp"
#include "../DataStructures/TurnInstructions.h" #include "../data_structures/turn_instructions.hpp"
#include "../Util/bearing.hpp" #include "../Util/bearing.hpp"
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"
#include "../Util/json_renderer.hpp" #include "../Util/json_renderer.hpp"

6
Extractor/ExtractionContainers.cpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "ExtractionContainers.h" #include "ExtractionContainers.h"
#include "ExtractionWay.h" #include "ExtractionWay.h"
#include "../DataStructures/NodeID.h" #include "../data_structures/node_id.hpp"
#include "../DataStructures/RangeTable.h" #include "../data_structures/range_table.hpp"
#include "../Util/OSRMException.h" #include "../Util/OSRMException.h"
#include "../Util/simple_logger.hpp" #include "../Util/simple_logger.hpp"

6
Extractor/ExtractionContainers.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -30,8 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "InternalExtractorEdge.h" #include "InternalExtractorEdge.h"
#include "FirstAndLastSegmentOfWay.h" #include "FirstAndLastSegmentOfWay.h"
#include "../DataStructures/ExternalMemoryNode.h" #include "../data_structures/external_memory_node.hpp"
#include "../DataStructures/Restriction.h" #include "../data_structures/restriction.hpp"
#include "../Util/FingerPrint.h" #include "../Util/FingerPrint.h"
#include <stxxl/vector> #include <stxxl/vector>

2
Extractor/ExtractionNode.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,

4
Extractor/ExtractionWay.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef EXTRACTION_WAY_H #ifndef EXTRACTION_WAY_H
#define EXTRACTION_WAY_H #define EXTRACTION_WAY_H
#include "../DataStructures/TravelMode.h" #include "../data_structures/travel_mode.hpp"
#include "../typedefs.h" #include "../typedefs.h"
#include <string> #include <string>

1
Extractor/Extractor.cpp
View File

@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../Util/GitDescription.h" #include "../Util/GitDescription.h"
#include "../Util/IniFileUtil.h" #include "../Util/IniFileUtil.h"
#include "../DataStructures/ConcurrentQueue.h"
#include "../Util/OSRMException.h" #include "../Util/OSRMException.h"
#include "../Util/simple_logger.hpp" #include "../Util/simple_logger.hpp"
#include "../Util/TimingUtil.h" #include "../Util/TimingUtil.h"

6
Extractor/ExtractorCallbacks.cpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -30,8 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "ExtractionNode.h" #include "ExtractionNode.h"
#include "ExtractionWay.h" #include "ExtractionWay.h"
#include "../DataStructures/ExternalMemoryNode.h" #include "../data_structures/external_memory_node.hpp"
#include "../DataStructures/Restriction.h" #include "../data_structures/restriction.hpp"
#include "../Util/container.hpp" #include "../Util/container.hpp"
#include "../Util/simple_logger.hpp" #include "../Util/simple_logger.hpp"

4
Extractor/FirstAndLastSegmentOfWay.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef EXTRACTORSTRUCTS_H_ #ifndef EXTRACTORSTRUCTS_H_
#define EXTRACTORSTRUCTS_H_ #define EXTRACTORSTRUCTS_H_
#include "../DataStructures/ExternalMemoryNode.h" #include "../data_structures/external_memory_node.hpp"
#include "../typedefs.h" #include "../typedefs.h"
#include <limits> #include <limits>

4
Extractor/InternalExtractorEdge.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define INTERNAL_EXTRACTOR_EDGE_H #define INTERNAL_EXTRACTOR_EDGE_H
#include "../typedefs.h" #include "../typedefs.h"
#include "../DataStructures/TravelMode.h" #include "../data_structures/travel_mode.hpp"
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>
#include <boost/assert.hpp> #include <boost/assert.hpp>

2
Extractor/RestrictionParser.cpp
View File

@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "ExtractionWay.h" #include "ExtractionWay.h"
#include "ScriptingEnvironment.h" #include "ScriptingEnvironment.h"
#include "../DataStructures/ExternalMemoryNode.h" #include "../data_structures/external_memory_node.hpp"
#include "../Util/lua_util.hpp" #include "../Util/lua_util.hpp"
#include "../Util/OSRMException.h" #include "../Util/OSRMException.h"
#include "../Util/simple_logger.hpp" #include "../Util/simple_logger.hpp"

4
Extractor/RestrictionParser.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef RESTRICTION_PARSER_H_ #ifndef RESTRICTION_PARSER_H_
#define RESTRICTION_PARSER_H_ #define RESTRICTION_PARSER_H_
#include "../DataStructures/Restriction.h" #include "../data_structures/restriction.hpp"
#include <osmium/osm.hpp> #include <osmium/osm.hpp>
#include <osmium/tags/regex_filter.hpp> #include <osmium/tags/regex_filter.hpp>

2
Extractor/ScriptingEnvironment.cpp
View File

@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "ExtractionHelperFunctions.h" #include "ExtractionHelperFunctions.h"
#include "ExtractionNode.h" #include "ExtractionNode.h"
#include "ExtractionWay.h" #include "ExtractionWay.h"
#include "../DataStructures/ExternalMemoryNode.h" #include "../data_structures/external_memory_node.hpp"
#include "../Util/lua_util.hpp" #include "../Util/lua_util.hpp"
#include "../Util/OSRMException.h" #include "../Util/OSRMException.h"
#include "../Util/simple_logger.hpp" #include "../Util/simple_logger.hpp"

3
Library/OSRM_impl.cpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -34,7 +34,6 @@ namespace boost { namespace interprocess { class named_mutex; } }
#include <osrm/RouteParameters.h> #include <osrm/RouteParameters.h>
#include <osrm/ServerPaths.h> #include <osrm/ServerPaths.h>
#include "../DataStructures/QueryEdge.h"
#include "../Plugins/DistanceTablePlugin.h" #include "../Plugins/DistanceTablePlugin.h"
#include "../Plugins/HelloWorldPlugin.h" #include "../Plugins/HelloWorldPlugin.h"
#include "../Plugins/LocatePlugin.h" #include "../Plugins/LocatePlugin.h"

2
Library/OSRM_impl.h
View File

@ -34,7 +34,7 @@ struct RouteParameters;
#include <osrm/ServerPaths.h> #include <osrm/ServerPaths.h>
#include "../DataStructures/QueryEdge.h" #include "../data_structures/query_edge.hpp"
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>

6
Plugins/DistanceTablePlugin.h
View File

@ -31,9 +31,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BasePlugin.h" #include "BasePlugin.h"
#include "../algorithms/object_encoder.hpp" #include "../algorithms/object_encoder.hpp"
#include "../DataStructures/JSONContainer.h" #include "../data_structures/json_container.hpp"
#include "../DataStructures/QueryEdge.h" #include "../data_structures/query_edge.hpp"
#include "../DataStructures/SearchEngine.h" #include "../data_structures/search_engine.hpp"
#include "../Descriptors/BaseDescriptor.h" #include "../Descriptors/BaseDescriptor.h"
#include "../Util/json_renderer.hpp" #include "../Util/json_renderer.hpp"
#include "../Util/make_unique.hpp" #include "../Util/make_unique.hpp"

4
Plugins/HelloWorldPlugin.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define HELLO_WORLD_PLUGIN_H #define HELLO_WORLD_PLUGIN_H
#include "BasePlugin.h" #include "BasePlugin.h"
#include "../DataStructures/JSONContainer.h" #include "../data_structures/json_container.hpp"
#include "../Util/cast.hpp" #include "../Util/cast.hpp"
#include "../Util/json_renderer.hpp" #include "../Util/json_renderer.hpp"

4
Plugins/LocatePlugin.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define LOCATE_PLUGIN_H #define LOCATE_PLUGIN_H
#include "BasePlugin.h" #include "BasePlugin.h"
#include "../DataStructures/JSONContainer.h" #include "../data_structures/json_container.hpp"
#include "../Util/json_renderer.hpp" #include "../Util/json_renderer.hpp"
#include "../Util/StringUtil.h" #include "../Util/StringUtil.h"

6
Plugins/NearestPlugin.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define NEAREST_PLUGIN_H #define NEAREST_PLUGIN_H
#include "BasePlugin.h" #include "BasePlugin.h"
#include "../DataStructures/JSONContainer.h" #include "../data_structures/json_container.hpp"
#include "../DataStructures/phantom_node.hpp" #include "../data_structures/phantom_node.hpp"
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"
#include "../Util/json_renderer.hpp" #include "../Util/json_renderer.hpp"

4
Plugins/TimestampPlugin.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define TIMESTAMP_PLUGIN_H #define TIMESTAMP_PLUGIN_H
#include "BasePlugin.h" #include "BasePlugin.h"
#include "../DataStructures/JSONContainer.h" #include "../data_structures/json_container.hpp"
#include "../Util/json_renderer.hpp" #include "../Util/json_renderer.hpp"
#include <string> #include <string>

4
Plugins/ViaRoutePlugin.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BasePlugin.h" #include "BasePlugin.h"
#include "../algorithms/object_encoder.hpp" #include "../algorithms/object_encoder.hpp"
#include "../DataStructures/SearchEngine.h" #include "../data_structures/search_engine.hpp"
#include "../Descriptors/BaseDescriptor.h" #include "../Descriptors/BaseDescriptor.h"
#include "../Descriptors/GPXDescriptor.h" #include "../Descriptors/GPXDescriptor.h"
#include "../Descriptors/JSONDescriptor.h" #include "../Descriptors/JSONDescriptor.h"

4
RoutingAlgorithms/AlternativePathRouting.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define ALTERNATIVE_PATH_ROUTING_H #define ALTERNATIVE_PATH_ROUTING_H
#include "BasicRoutingInterface.h" #include "BasicRoutingInterface.h"
#include "../data_structures/search_engine_data.hpp"
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"
#include "../DataStructures/SearchEngineData.h"
#include "../Util/container.hpp" #include "../Util/container.hpp"
#include <boost/assert.hpp> #include <boost/assert.hpp>

8
RoutingAlgorithms/BasicRoutingInterface.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef BASIC_ROUTING_INTERFACE_H #ifndef BASIC_ROUTING_INTERFACE_H
#define BASIC_ROUTING_INTERFACE_H #define BASIC_ROUTING_INTERFACE_H
#include "../DataStructures/RawRouteData.h" #include "../data_structures/raw_route_data.hpp"
#include "../DataStructures/SearchEngineData.h" #include "../data_structures/search_engine_data.hpp"
#include "../DataStructures/TurnInstructions.h" #include "../data_structures/turn_instructions.hpp"
// #include "../Util/simple_logger.hpp.h" // #include "../Util/simple_logger.hpp.h"
#include <boost/assert.hpp> #include <boost/assert.hpp>

2
RoutingAlgorithms/ManyToManyRouting.h
View File

@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define MANY_TO_MANY_ROUTING_H #define MANY_TO_MANY_ROUTING_H
#include "BasicRoutingInterface.h" #include "BasicRoutingInterface.h"
#include "../DataStructures/SearchEngineData.h" #include "../data_structures/search_engine_data.hpp"
#include "../typedefs.h" #include "../typedefs.h"
#include <boost/assert.hpp> #include <boost/assert.hpp>

4
RoutingAlgorithms/ShortestPathRouting.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include "BasicRoutingInterface.h" #include "BasicRoutingInterface.h"
#include "../DataStructures/SearchEngineData.h" #include "../data_structures/search_engine_data.hpp"
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"
#include "../typedefs.h" #include "../typedefs.h"

10
Server/DataStructures/BaseDataFacade.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -30,10 +30,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Exposes all data access interfaces to the algorithms via base class ptr // Exposes all data access interfaces to the algorithms via base class ptr
#include "../../DataStructures/EdgeBasedNode.h" #include "../../data_structures/edge_based_node.hpp"
#include "../../DataStructures/ExternalMemoryNode.h" #include "../../data_structures/external_memory_node.hpp"
#include "../../DataStructures/phantom_node.hpp" #include "../../data_structures/phantom_node.hpp"
#include "../../DataStructures/TurnInstructions.h" #include "../../data_structures/turn_instructions.hpp"
#include "../../Util/integer_range.hpp" #include "../../Util/integer_range.hpp"
#include "../../Util/OSRMException.h" #include "../../Util/OSRMException.h"
#include "../../Util/StringUtil.h" #include "../../Util/StringUtil.h"

14
Server/DataStructures/InternalDataFacade.h
View File

@ -32,13 +32,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseDataFacade.h" #include "BaseDataFacade.h"
#include "../../DataStructures/OriginalEdgeData.h" #include "../../data_structures/original_edge_data.hpp"
#include "../../DataStructures/QueryNode.h" #include "../../data_structures/query_node.hpp"
#include "../../DataStructures/QueryEdge.h" #include "../../data_structures/query_edge.hpp"
#include "../../DataStructures/SharedMemoryVectorWrapper.h" #include "../../data_structures/shared_memory_vector_wrapper.hpp"
#include "../../DataStructures/StaticGraph.h" #include "../../data_structures/static_graph.hpp"
#include "../../DataStructures/StaticRTree.h" #include "../../data_structures/static_rtree.hpp"
#include "../../DataStructures/RangeTable.h" #include "../../data_structures/range_table.hpp"
#include "../../Util/BoostFileSystemFix.h" #include "../../Util/BoostFileSystemFix.h"
#include "../../Util/GraphLoader.h" #include "../../Util/GraphLoader.h"
#include "../../Util/simple_logger.hpp" #include "../../Util/simple_logger.hpp"

8
Server/DataStructures/SharedDataFacade.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -33,9 +33,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseDataFacade.h" #include "BaseDataFacade.h"
#include "SharedDataType.h" #include "SharedDataType.h"
#include "../../DataStructures/RangeTable.h" #include "../../data_structures/range_table.hpp"
#include "../../DataStructures/StaticGraph.h" #include "../../data_structures/static_graph.hpp"
#include "../../DataStructures/StaticRTree.h" #include "../../data_structures/static_rtree.hpp"
#include "../../Util/BoostFileSystemFix.h" #include "../../Util/BoostFileSystemFix.h"
#include "../../Util/make_unique.hpp" #include "../../Util/make_unique.hpp"
#include "../../Util/simple_logger.hpp" #include "../../Util/simple_logger.hpp"

2
Server/RequestHandler.cpp
View File

@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "APIGrammar.h" #include "APIGrammar.h"
#include "Http/Request.h" #include "Http/Request.h"
#include "../DataStructures/JSONContainer.h" #include "../data_structures/json_container.hpp"
#include "../Library/OSRM.h" #include "../Library/OSRM.h"
#include "../Util/json_renderer.hpp" #include "../Util/json_renderer.hpp"
#include "../Util/simple_logger.hpp" #include "../Util/simple_logger.hpp"

8
Tools/check-hsgr.cpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -24,9 +24,9 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../DataStructures/Percent.h" #include "../data_structures/percent.hpp"
#include "../DataStructures/QueryEdge.h" #include "../data_structures/query_edge.hpp"
#include "../DataStructures/StaticGraph.h" #include "../data_structures/static_graph.hpp"
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"
#include "../Util/GraphLoader.h" #include "../Util/GraphLoader.h"
#include "../Util/simple_logger.hpp" #include "../Util/simple_logger.hpp"

4
Tools/springclean.cpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <cstdio> #include <cstdio>
#include "../DataStructures/SharedMemoryFactory.h" #include "../data_structures/shared_memory_factory.hpp"
#include "../Server/DataStructures/SharedDataType.h" #include "../Server/DataStructures/SharedDataType.h"
#include "../Util/GitDescription.h" #include "../Util/GitDescription.h"
#include "../Util/simple_logger.hpp" #include "../Util/simple_logger.hpp"

2
UnitTests/Algorithms/DouglasPeuckerTest.cpp
View File

@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../../algorithms/douglas_peucker.hpp" #include "../../algorithms/douglas_peucker.hpp"
#include "../../DataStructures/segment_information.hpp" #include "../../data_structures/segment_information.hpp"
#include "../../Include/osrm/Coordinate.h" #include "../../Include/osrm/Coordinate.h"
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>

2
UnitTests/DataStructures/BinaryHeapTest.cpp → UnitTests/data_structures/BinaryHeapTest.cpp
View File

@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../../DataStructures/BinaryHeap.h" #include "../../data_structures/binary_heap.hpp"
#include "../../typedefs.h" #include "../../typedefs.h"
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>

2
UnitTests/DataStructures/RangeTableTest.cpp → UnitTests/data_structures/RangeTableTest.cpp
View File

@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../../DataStructures/RangeTable.h" #include "../../data_structures/range_table.hpp"
#include "../../typedefs.h" #include "../../typedefs.h"
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>

2
UnitTests/DataStructures/StaticGraphTest.cpp → UnitTests/data_structures/StaticGraphTest.cpp
View File

@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../../DataStructures/StaticGraph.h" #include "../../data_structures/static_graph.hpp"
#include "../../typedefs.h" #include "../../typedefs.h"
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>

6
UnitTests/DataStructures/StaticRTreeTest.cpp → UnitTests/data_structures/StaticRTreeTest.cpp
View File

@ -25,9 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../../DataStructures/StaticRTree.h" #include "../../data_structures/static_rtree.hpp"
#include "../../DataStructures/QueryNode.h" #include "../../data_structures/query_node.hpp"
#include "../../DataStructures/EdgeBasedNode.h" #include "../../data_structures/edge_based_node.hpp"
#include "../../Util/floating_point.hpp" #include "../../Util/floating_point.hpp"
#include "../../typedefs.h" #include "../../typedefs.h"

10
Util/GraphLoader.h
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -29,10 +29,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define GRAPHLOADER_H #define GRAPHLOADER_H
#include "OSRMException.h" #include "OSRMException.h"
#include "../DataStructures/ExternalMemoryNode.h" #include "../data_structures/external_memory_node.hpp"
#include "../DataStructures/ImportEdge.h" #include "../data_structures/import_edge.hpp"
#include "../DataStructures/QueryNode.h" #include "../data_structures/query_node.hpp"
#include "../DataStructures/Restriction.h" #include "../data_structures/restriction.hpp"
#include "../Util/simple_logger.hpp" #include "../Util/simple_logger.hpp"
#include "../Util/FingerPrint.h" #include "../Util/FingerPrint.h"
#include "../typedefs.h" #include "../typedefs.h"

0
Util/FingerPrint.cpp.in → Util/finger_print.cpp.in
View File

4
Util/json_renderer.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef JSON_RENDERER_HPP #ifndef JSON_RENDERER_HPP
#define JSON_RENDERER_HPP #define JSON_RENDERER_HPP
#include "../DataStructures/JSONContainer.h" #include "../data_structures/json_container.hpp"
#include "cast.hpp" #include "cast.hpp"
namespace JSON { namespace JSON {

4
Util/xml_renderer.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef XML_RENDERER_HPP #ifndef XML_RENDERER_HPP
#define XML_RENDERER_HPP #define XML_RENDERER_HPP
#include "../DataStructures/JSONContainer.h" #include "../data_structures/json_container.hpp"
#include "cast.hpp" #include "cast.hpp"
namespace JSON { namespace JSON {

2
algorithms/bfs_components.hpp
View File

@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define BFS_COMPONENTS_HPP_ #define BFS_COMPONENTS_HPP_
#include "../typedefs.h" #include "../typedefs.h"
#include "../DataStructures/restriction_map.hpp" #include "../data_structures/restriction_map.hpp"
#include <queue> #include <queue>
#include <unordered_set> #include <unordered_set>

4
algorithms/douglas_peucker.cpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "douglas_peucker.hpp" #include "douglas_peucker.hpp"
#include "../DataStructures/segment_information.hpp" #include "../data_structures/segment_information.hpp"
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>

2
algorithms/polyline_compressor.cpp
View File

@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "polyline_compressor.hpp" #include "polyline_compressor.hpp"
#include "../DataStructures/segment_information.hpp" #include "../data_structures/segment_information.hpp"
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>

2
algorithms/polyline_formatter.cpp
View File

@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "polyline_formatter.hpp" #include "polyline_formatter.hpp"
#include "polyline_compressor.hpp" #include "polyline_compressor.hpp"
#include "../DataStructures/segment_information.hpp" #include "../data_structures/segment_information.hpp"
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>

10
algorithms/polyline_formatter.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef POLYLINE_FORMATTER_H_ #ifndef POLYLINE_FORMATTER_HPP
#define POLYLINE_FORMATTER_H_ #define POLYLINE_FORMATTER_HPP
struct SegmentInformation; struct SegmentInformation;
#include "../DataStructures/JSONContainer.h" #include "../data_structures/json_container.hpp"
#include <string> #include <string>
#include <vector> #include <vector>
@ -42,4 +42,4 @@ struct PolylineFormatter
JSON::Array printUnencodedString(const std::vector<SegmentInformation> &polyline) const; JSON::Array printUnencodedString(const std::vector<SegmentInformation> &polyline) const;
}; };
#endif /* POLYLINE_FORMATTER_H_ */ #endif /* POLYLINE_FORMATTER_HPP */

22
algorithms/tiny_components.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,17 +25,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef STRONGLYCONNECTEDCOMPONENTS_H_ #ifndef TINY_COMPONENTS_HPP
#define STRONGLYCONNECTEDCOMPONENTS_H_ #define TINY_COMPONENTS_HPP
#include "../typedefs.h" #include "../typedefs.h"
#include "../DataStructures/DeallocatingVector.h" #include "../data_structures/deallocating_vector.hpp"
#include "../DataStructures/DynamicGraph.h" #include "../data_structures/dynamic_graph.hpp"
#include "../DataStructures/ImportEdge.h" #include "../data_structures/import_edge.hpp"
#include "../DataStructures/QueryNode.h" #include "../data_structures/query_node.hpp"
#include "../DataStructures/Percent.h" #include "../data_structures/percent.hpp"
#include "../DataStructures/Restriction.h" #include "../data_structures/restriction.hpp"
#include "../DataStructures/TurnInstructions.h" #include "../data_structures/turn_instructions.hpp"
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"
#include "../Util/OSRMException.h" #include "../Util/OSRMException.h"
@ -456,4 +456,4 @@ class TarjanSCC
} }
}; };
#endif /* STRONGLYCONNECTEDCOMPONENTS_H_ */ #endif /* TINY_COMPONENTS_HPP */

10
benchmarks/static_rtree.cpp
View File

@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../DataStructures/OriginalEdgeData.h" #include "../data_structures/original_edge_data.hpp"
#include "../DataStructures/QueryNode.h" #include "../data_structures/query_node.hpp"
#include "../DataStructures/SharedMemoryVectorWrapper.h" #include "../data_structures/shared_memory_vector_wrapper.hpp"
#include "../DataStructures/StaticRTree.h" #include "../data_structures/static_rtree.hpp"
#include "../data_structures/edge_based_node.hpp"
#include "../Util/BoostFileSystemFix.h" #include "../Util/BoostFileSystemFix.h"
#include "../DataStructures/EdgeBasedNode.h"
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>

4
cmake/FingerPrint-Config.cmake
View File

@ -3,8 +3,8 @@ if (EXISTS ${OLDFILE})
file(REMOVE_RECURSE ${OLDFILE}) file(REMOVE_RECURSE ${OLDFILE})
endif() endif()
file(MD5 ${SOURCE_DIR}/prepare.cpp MD5PREPARE) file(MD5 ${SOURCE_DIR}/prepare.cpp MD5PREPARE)
file(MD5 ${SOURCE_DIR}/DataStructures/StaticRTree.h MD5RTREE) file(MD5 ${SOURCE_DIR}/data_structures/static_rtree.hpp MD5RTREE)
file(MD5 ${SOURCE_DIR}/Util/GraphLoader.h MD5GRAPH) file(MD5 ${SOURCE_DIR}/Util/GraphLoader.h MD5GRAPH)
file(MD5 ${SOURCE_DIR}/Server/DataStructures/InternalDataFacade.h MD5OBJECTS) file(MD5 ${SOURCE_DIR}/Server/DataStructures/InternalDataFacade.h MD5OBJECTS)
CONFIGURE_FILE( ${SOURCE_DIR}/Util/FingerPrint.cpp.in ${SOURCE_DIR}/Util/FingerPrint.cpp ) CONFIGURE_FILE( ${SOURCE_DIR}/Util/finger_print.cpp.in ${SOURCE_DIR}/Util/finger_print.cpp )

14
contractor/contractor.hpp
View File

@ -28,13 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef CONTRACTOR_HPP #ifndef CONTRACTOR_HPP
#define CONTRACTOR_HPP #define CONTRACTOR_HPP
#include "../DataStructures/BinaryHeap.h" #include "../data_structures/binary_heap.hpp"
#include "../DataStructures/DeallocatingVector.h" #include "../data_structures/deallocating_vector.hpp"
#include "../DataStructures/DynamicGraph.h" #include "../data_structures/dynamic_graph.hpp"
#include "../DataStructures/Percent.h" #include "../data_structures/percent.hpp"
#include "../DataStructures/QueryEdge.h" #include "../data_structures/query_edge.hpp"
#include "../DataStructures/XORFastHash.h" #include "../data_structures/xor_fast_hash.hpp"
#include "../DataStructures/XORFastHashStorage.h" #include "../data_structures/xor_fast_hash_storage.hpp"
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"
#include "../Util/simple_logger.hpp" #include "../Util/simple_logger.hpp"
#include "../Util/StringUtil.h" #include "../Util/StringUtil.h"

2
contractor/edge_based_graph_factory.cpp
View File

@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "edge_based_graph_factory.hpp" #include "edge_based_graph_factory.hpp"
#include "../algorithms/bfs_components.hpp" #include "../algorithms/bfs_components.hpp"
#include "../DataStructures/Percent.h" #include "../data_structures/percent.hpp"
#include "../Util/compute_angle.hpp" #include "../Util/compute_angle.hpp"
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"
#include "../Util/lua_util.hpp" #include "../Util/lua_util.hpp"

14
contractor/edge_based_graph_factory.hpp
View File

@ -32,13 +32,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "geometry_compressor.hpp" #include "geometry_compressor.hpp"
#include "../typedefs.h" #include "../typedefs.h"
#include "../DataStructures/DeallocatingVector.h" #include "../data_structures/deallocating_vector.hpp"
#include "../DataStructures/EdgeBasedNode.h" #include "../data_structures/edge_based_node.hpp"
#include "../DataStructures/OriginalEdgeData.h" #include "../data_structures/original_edge_data.hpp"
#include "../DataStructures/QueryNode.h" #include "../data_structures/query_node.hpp"
#include "../DataStructures/TurnInstructions.h" #include "../data_structures/turn_instructions.hpp"
#include "../DataStructures/NodeBasedGraph.h" #include "../data_structures/node_based_graph.hpp"
#include "../DataStructures/restriction_map.hpp" #include "../data_structures/restriction_map.hpp"
#include <algorithm> #include <algorithm>
#include <iosfwd> #include <iosfwd>

6
contractor/processing_chain.cpp
View File

@ -30,9 +30,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "contractor.hpp" #include "contractor.hpp"
#include "../algorithms/crc32_processor.hpp" #include "../algorithms/crc32_processor.hpp"
#include "../DataStructures/DeallocatingVector.h" #include "../data_structures/deallocating_vector.hpp"
#include "../DataStructures/StaticRTree.h" #include "../data_structures/static_rtree.hpp"
#include "../DataStructures/restriction_map.hpp" #include "../data_structures/restriction_map.hpp"
#include "../Util/GitDescription.h" #include "../Util/GitDescription.h"
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"

38
contractor/processing_chain.hpp
View File

@ -1,9 +1,37 @@
#ifndef PREPARE_H /*
#define PREPARE_H
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
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 PROCESSING_CHAIN_HPP
#define PROCESSING_CHAIN_HPP
#include "edge_based_graph_factory.hpp" #include "edge_based_graph_factory.hpp"
#include "../DataStructures/QueryEdge.h" #include "../data_structures/query_edge.hpp"
#include "../DataStructures/StaticGraph.h" #include "../data_structures/static_graph.hpp"
class FingerPrint; class FingerPrint;
struct EdgeBasedNode; struct EdgeBasedNode;
struct lua_State; struct lua_State;
@ -64,4 +92,4 @@ class Prepare
std::string rtree_leafs_path; std::string rtree_leafs_path;
}; };
#endif // PREPARE_H #endif // PROCESSING_CHAIN_HPP

0
DataStructures/Coordinate.cpp → data_structures/Coordinate.cpp
View File

0
DataStructures/InputReaderFactory.h → data_structures/InputReaderFactory.h
View File

2
DataStructures/BinaryHeap.h → data_structures/binary_heap.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,

8
DataStructures/ConcurrentQueue.h → data_structures/concurrent_queue.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef CONCURRENT_QUEUE_H #ifndef CONCURRENT_QUEUE_HPP
#define CONCURRENT_QUEUE_H #define CONCURRENT_QUEUE_HPP
#include <boost/circular_buffer.hpp> #include <boost/circular_buffer.hpp>
#include <condition_variable> #include <condition_variable>
@ -80,4 +80,4 @@ template <typename Data> class ConcurrentQueue
std::condition_variable m_not_full; std::condition_variable m_not_full;
}; };
#endif // CONCURRENT_QUEUE_H #endif // CONCURRENT_QUEUE_HPP

0
DataStructures/DeallocatingVector.h → data_structures/deallocating_vector.hpp
View File

10
DataStructures/DynamicGraph.h → data_structures/dynamic_graph.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef DYNAMICGRAPH_H #ifndef DYNAMICGRAPH_HPP
#define DYNAMICGRAPH_H #define DYNAMICGRAPH_HPP
#include "DeallocatingVector.h" #include "deallocating_vector.hpp"
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"
#include <boost/assert.hpp> #include <boost/assert.hpp>
@ -292,4 +292,4 @@ template <typename EdgeDataT> class DynamicGraph
DeallocatingVector<Edge> edge_list; DeallocatingVector<Edge> edge_list;
}; };
#endif // DYNAMICGRAPH_H #endif // DYNAMICGRAPH_HPP

35
DataStructures/EdgeBasedNode.h → data_structures/edge_based_node.hpp
View File

@ -1,7 +1,34 @@
#ifndef EDGE_BASED_NODE_H /*
#define EDGE_BASED_NODE_H
#include "../DataStructures/TravelMode.h" Copyright (c) 2014, Project OSRM, Dennis Luxen, others
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 EDGE_BASED_NODE_HPP
#define EDGE_BASED_NODE_HPP
#include "../data_structures/travel_mode.hpp"
#include "../typedefs.h" #include "../typedefs.h"
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>
@ -95,4 +122,4 @@ struct EdgeBasedNode
TravelMode backward_travel_mode : 4; TravelMode backward_travel_mode : 4;
}; };
#endif //EDGE_BASED_NODE_H #endif //EDGE_BASED_NODE_HPP

2
DataStructures/ExternalMemoryNode.cpp → data_structures/external_memory_node.cpp
View File

@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "ExternalMemoryNode.h" #include "external_memory_node.hpp"
#include <limits> #include <limits>

10
DataStructures/ExternalMemoryNode.h → data_structures/external_memory_node.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef EXTERNAL_MEMORY_NODE_H__ #ifndef EXTERNAL_MEMORY_NODE_HPP_
#define EXTERNAL_MEMORY_NODE_H__ #define EXTERNAL_MEMORY_NODE_HPP_
#include "QueryNode.h" #include "query_node.hpp"
#include <string> #include <string>
@ -54,4 +54,4 @@ struct ExternalMemoryNodeSTXXLCompare
value_type min_value(); value_type min_value();
}; };
#endif /* EXTERNAL_MEMORY_NODE_H__ */ #endif /* EXTERNAL_MEMORY_NODE_HPP_ */

8
DataStructures/FixedPointNumber.h → data_structures/fixed_point_number.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef OSRM_FIXED_POINT_NUMBER_H #ifndef FIXED_POINT_NUMBER_HPP
#define OSRM_FIXED_POINT_NUMBER_H #define FIXED_POINT_NUMBER_HPP
#include <cmath> #include <cmath>
#include <cstdint> #include <cstdint>
@ -213,4 +213,4 @@ class FixedPointNumber
static_assert(4 == sizeof(FixedPointNumber<1>), "FP19 has wrong size != 4"); static_assert(4 == sizeof(FixedPointNumber<1>), "FP19 has wrong size != 4");
} }
#endif // OSRM_FIXED_POINT_NUMBER_H #endif // FIXED_POINT_NUMBER_HPP

4
DataStructures/HilbertValue.cpp → data_structures/hilbert_value.cpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "HilbertValue.h" #include "hilbert_value.hpp"
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>

8
DataStructures/HilbertValue.h → data_structures/hilbert_value.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef HILBERTVALUE_H_ #ifndef HILBERT_VALUE_HPP
#define HILBERTVALUE_H_ #define HILBERT_VALUE_HPP
#include <cstdint> #include <cstdint>
@ -46,4 +46,4 @@ class HilbertCode
inline void TransposeCoordinate(uint32_t *X) const; inline void TransposeCoordinate(uint32_t *X) const;
}; };
#endif /* HILBERTVALUE_H_ */ #endif /* HILBERT_VALUE_HPP */

2
DataStructures/ImportEdge.cpp → data_structures/import_edge.cpp
View File

@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "ImportEdge.h" #include "import_edge.hpp"
#include <boost/assert.hpp> #include <boost/assert.hpp>

8
DataStructures/ImportEdge.h → data_structures/import_edge.hpp
View File

@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef IMPORT_EDGE_H #ifndef IMPORT_EDGE_HPP
#define IMPORT_EDGE_H #define IMPORT_EDGE_HPP
#include "../DataStructures/TravelMode.h" #include "../data_structures/travel_mode.hpp"
#include "../typedefs.h" #include "../typedefs.h"
struct NodeBasedEdge struct NodeBasedEdge
@ -88,4 +88,4 @@ struct EdgeBasedEdge
using ImportEdge = NodeBasedEdge; using ImportEdge = NodeBasedEdge;
#endif /* IMPORT_EDGE_H */ #endif /* IMPORT_EDGE_HPP */

0
DataStructures/JSONContainer.h → data_structures/json_container.hpp
View File

8
DataStructures/LRUCache.h → data_structures/lru_cache.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef LRUCACHE_H #ifndef LRUCACHE_HPP
#define LRUCACHE_H #define LRUCACHE_HPP
#include <list> #include <list>
#include <unordered_map> #include <unordered_map>
@ -94,4 +94,4 @@ template <typename KeyT, typename ValueT> class LRUCache
} }
unsigned Size() const { return itemsInCache.size(); } unsigned Size() const { return itemsInCache.size(); }
}; };
#endif // LRUCACHE_H #endif // LRUCACHE_HPP

37
DataStructures/NodeBasedGraph.h → data_structures/node_based_graph.hpp
View File

@ -1,8 +1,35 @@
#ifndef NODE_BASED_GRAPH_H_ /*
#define NODE_BASED_GRAPH_H_
#include "DynamicGraph.h" Copyright (c) 2014, Project OSRM, Dennis Luxen, others
#include "ImportEdge.h" 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 NODE_BASED_GRAPH_HPP
#define NODE_BASED_GRAPH_HPP
#include "dynamic_graph.hpp"
#include "import_edge.hpp"
#include "../Util/simple_logger.hpp" #include "../Util/simple_logger.hpp"
#include <tbb/parallel_sort.h> #include <tbb/parallel_sort.h>
@ -241,4 +268,4 @@ SimpleNodeBasedDynamicGraphFromEdges(int number_of_nodes, std::vector<SimpleEdge
return graph; return graph;
} }
#endif // NODE_BASED_GRAPH_H_ #endif // NODE_BASED_GRAPH_HPP

8
DataStructures/NodeID.h → data_structures/node_id.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef NODE_ID_H__ #ifndef NODE_ID_HPP
#define NODE_ID_H__ #define NODE_ID_HPP
#include "../typedefs.h" #include "../typedefs.h"
@ -38,4 +38,4 @@ struct Cmp
value_type min_value() { return 0x0; } value_type min_value() { return 0x0; }
}; };
#endif // NODE_ID_H__ #endif // NODE_ID_HPP

12
DataStructures/OriginalEdgeData.h → data_structures/original_edge_data.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,11 +25,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef ORIGINAL_EDGE_DATA_H #ifndef ORIGINAL_EDGE_DATA_HPP
#define ORIGINAL_EDGE_DATA_H #define ORIGINAL_EDGE_DATA_HPP
#include "TurnInstructions.h" #include "travel_mode.hpp"
#include "../DataStructures/TravelMode.h" #include "turn_instructions.hpp"
#include "../typedefs.h" #include "../typedefs.h"
#include <limits> #include <limits>
@ -61,4 +61,4 @@ struct OriginalEdgeData
TravelMode travel_mode; TravelMode travel_mode;
}; };
#endif // ORIGINAL_EDGE_DATA_H #endif // ORIGINAL_EDGE_DATA_HPP

8
DataStructures/Percent.h → data_structures/percent.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef PERCENT_H #ifndef PERCENT_HPP
#define PERCENT_H #define PERCENT_HPP
#include <iostream> #include <iostream>
#include <atomic> #include <atomic>
@ -98,4 +98,4 @@ class Percent
} }
}; };
#endif // PERCENT_H #endif // PERCENT_HPP

0
DataStructures/phantom_node.cpp → data_structures/phantom_node.cpp
View File

2
DataStructures/phantom_node.hpp → data_structures/phantom_node.hpp
View File

@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define PHANTOM_NODES_H #define PHANTOM_NODES_H
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>
#include "../DataStructures/TravelMode.h" #include "../data_structures/travel_mode.hpp"
#include "../typedefs.h" #include "../typedefs.h"
#include <iostream> #include <iostream>

8
DataStructures/QueryEdge.h → data_structures/query_edge.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef QUERYEDGE_H_ #ifndef QUERYEDGE_HPP_
#define QUERYEDGE_H_ #define QUERYEDGE_HPP_
#include "../typedefs.h" #include "../typedefs.h"
@ -78,4 +78,4 @@ struct QueryEdge
} }
}; };
#endif /* QUERYEDGE_H_ */ #endif /* QUERYEDGE_HPP_ */

8
DataStructures/QueryNode.h → data_structures/query_node.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef QUERY_NODE_H #ifndef QUERY_NODE_HPP
#define QUERY_NODE_H #define QUERY_NODE_HPP
#include "../typedefs.h" #include "../typedefs.h"
@ -82,4 +82,4 @@ struct QueryNode
} }
}; };
#endif // QUERY_NODE_H #endif // QUERY_NODE_HPP

37
DataStructures/RangeTable.h → data_structures/range_table.hpp
View File

@ -1,9 +1,36 @@
#ifndef RANGE_TABLE_H_ /*
#define RANGE_TABLE_H_
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
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 RANGE_TABLE_HPP
#define RANGE_TABLE_HPP
#include "../Util/integer_range.hpp" #include "../Util/integer_range.hpp"
#include "SharedMemoryFactory.h" #include "shared_memory_factory.hpp"
#include "SharedMemoryVectorWrapper.h" #include "shared_memory_vector_wrapper.hpp"
#include <fstream> #include <fstream>
#include <vector> #include <vector>
@ -228,4 +255,4 @@ std::istream& operator>>(std::istream &in, RangeTable<BLOCK_SIZE, USE_SHARED_MEM
return in; return in;
} }
#endif //RANGE_TABLE_H_ #endif //RANGE_TABLE_HPP

14
DataStructures/RawRouteData.h → data_structures/raw_route_data.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef RAW_ROUTE_DATA_H #ifndef RAW_ROUTE_DATA_HPP
#define RAW_ROUTE_DATA_H #define RAW_ROUTE_DATA_HPP
#include "../DataStructures/phantom_node.hpp" #include "../data_structures/phantom_node.hpp"
#include "../DataStructures/TravelMode.h" #include "../data_structures/travel_mode.hpp"
#include "../DataStructures/TurnInstructions.h" #include "../data_structures/turn_instructions.hpp"
#include "../typedefs.h" #include "../typedefs.h"
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>
@ -87,4 +87,4 @@ struct RawRouteData
} }
}; };
#endif // RAW_ROUTE_DATA_H #endif // RAW_ROUTE_DATA_HPP

31
DataStructures/Rectangle.h → data_structures/rectangle.hpp
View File

@ -1,5 +1,32 @@
#ifndef RECTANGLE_H /*
#define RECTANGLE_H
Copyright (c) 2014, Project OSRM, Dennis Luxen, others
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 RECTANGLE_HPP
#define RECTANGLE_HPP
#include <boost/assert.hpp> #include <boost/assert.hpp>

8
DataStructures/Restriction.h → data_structures/restriction.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef RESTRICTION_H #ifndef RESTRICTION_HPP
#define RESTRICTION_H #define RESTRICTION_HPP
#include "../typedefs.h" #include "../typedefs.h"
@ -129,4 +129,4 @@ struct CmpRestrictionContainerByTo
value_type min_value() const { return InputRestrictionContainer::min_value(); } value_type min_value() const { return InputRestrictionContainer::min_value(); }
}; };
#endif // RESTRICTION_H #endif // RESTRICTION_HPP

1
DataStructures/restriction_map.cpp → data_structures/restriction_map.cpp
View File

@ -26,7 +26,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "restriction_map.hpp" #include "restriction_map.hpp"
#include "NodeBasedGraph.h"
bool RestrictionMap::IsViaNode(const NodeID node) const bool RestrictionMap::IsViaNode(const NodeID node) const
{ {

11
DataStructures/restriction_map.hpp → data_structures/restriction_map.hpp
View File

@ -25,14 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef RESTRICTION_MAP_H_ #ifndef RESTRICTION_MAP_HPP
#define RESTRICTION_MAP_H_ #define RESTRICTION_MAP_HPP
#include <memory> #include <memory>
#include "DynamicGraph.h" #include "node_based_graph.hpp"
#include "Restriction.h" #include "restriction.hpp"
#include "NodeBasedGraph.h"
#include "../Util/StdHashExtensions.h" #include "../Util/StdHashExtensions.h"
#include "../typedefs.h" #include "../typedefs.h"
@ -123,4 +122,4 @@ class RestrictionMap
std::unordered_set<NodeID> m_no_turn_via_node_set; std::unordered_set<NodeID> m_no_turn_via_node_set;
}; };
#endif //RESTRICTION_MAP_H_ #endif //RESTRICTION_MAP_HPP

0
DataStructures/RouteParameters.cpp → data_structures/route_parameters.cpp
View File

10
DataStructures/SearchEngine.h → data_structures/search_engine.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef SEARCHENGINE_H #ifndef SEARCH_ENGINE_HPP
#define SEARCHENGINE_H #define SEARCH_ENGINE_HPP
#include "SearchEngineData.h" #include "search_engine_data.hpp"
#include "../RoutingAlgorithms/AlternativePathRouting.h" #include "../RoutingAlgorithms/AlternativePathRouting.h"
#include "../RoutingAlgorithms/ManyToManyRouting.h" #include "../RoutingAlgorithms/ManyToManyRouting.h"
#include "../RoutingAlgorithms/ShortestPathRouting.h" #include "../RoutingAlgorithms/ShortestPathRouting.h"
@ -57,4 +57,4 @@ template <class DataFacadeT> class SearchEngine
~SearchEngine() {} ~SearchEngine() {}
}; };
#endif // SEARCHENGINE_H #endif // SEARCH_ENGINE_HPP

4
DataStructures/SearchEngineData.cpp → data_structures/search_engine_data.cpp
View File

@ -25,9 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "SearchEngineData.h" #include "search_engine_data.hpp"
#include "BinaryHeap.h" #include "binary_heap.hpp"
void SearchEngineData::InitializeOrClearFirstThreadLocalStorage(const unsigned number_of_nodes) void SearchEngineData::InitializeOrClearFirstThreadLocalStorage(const unsigned number_of_nodes)
{ {

10
DataStructures/SearchEngineData.h → data_structures/search_engine_data.hpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2014, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -25,13 +25,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef SEARCH_ENGINE_DATA_H #ifndef SEARCH_ENGINE_DATA_HPP
#define SEARCH_ENGINE_DATA_H #define SEARCH_ENGINE_DATA_HPP
#include <boost/thread/tss.hpp> #include <boost/thread/tss.hpp>
#include "../typedefs.h" #include "../typedefs.h"
#include "BinaryHeap.h" #include "binary_heap.hpp"
struct HeapData struct HeapData
{ {
@ -58,4 +58,4 @@ struct SearchEngineData
void InitializeOrClearThirdThreadLocalStorage(const unsigned number_of_nodes); void InitializeOrClearThirdThreadLocalStorage(const unsigned number_of_nodes);
}; };
#endif // SEARCH_ENGINE_DATA_H #endif // SEARCH_ENGINE_DATA_HPP

Some files were not shown because too many files have changed in this diff Show More