renamed: DataStructures/* -> data_structures/*

.gitignore

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

Algorithms/bfs_components.hpp

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

Algorithms/douglas_peucker.cpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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 "../DataStructures/segment_information.hpp"
+#include "../data_structures/segment_information.hpp"
 #include "../Util/integer_range.hpp"
 
 #include <osrm/Coordinate.h>

Algorithms/polyline_compressor.cpp

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

Algorithms/polyline_formatter.cpp

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

Algorithms/polyline_formatter.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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_
-#define POLYLINE_FORMATTER_H_
+#ifndef POLYLINE_FORMATTER_HPP
+#define POLYLINE_FORMATTER_HPP
 
 struct SegmentInformation;
 
-#include "../DataStructures/JSONContainer.h"
+#include "../data_structures/json_container.hpp"
 
 #include <string>
 #include <vector>
@@ -42,4 +42,4 @@ struct PolylineFormatter
     JSON::Array printUnencodedString(const std::vector<SegmentInformation> &polyline) const;
 };
 
-#endif /* POLYLINE_FORMATTER_H_ */
+#endif /* POLYLINE_FORMATTER_HPP */

Algorithms/tiny_components.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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_
-#define STRONGLYCONNECTEDCOMPONENTS_H_
+#ifndef TINY_COMPONENTS_HPP
+#define TINY_COMPONENTS_HPP
 
 #include "../typedefs.h"
-#include "../DataStructures/DeallocatingVector.h"
-#include "../DataStructures/DynamicGraph.h"
-#include "../DataStructures/ImportEdge.h"
-#include "../DataStructures/QueryNode.h"
-#include "../DataStructures/Percent.h"
-#include "../DataStructures/Restriction.h"
-#include "../DataStructures/TurnInstructions.h"
+#include "../data_structures/deallocating_vector.hpp"
+#include "../data_structures/dynamic_graph.hpp"
+#include "../data_structures/import_edge.hpp"
+#include "../data_structures/query_node.hpp"
+#include "../data_structures/percent.hpp"
+#include "../data_structures/restriction.hpp"
+#include "../data_structures/turn_instructions.hpp"
 
 #include "../Util/integer_range.hpp"
 #include "../Util/OSRMException.h"
@@ -456,4 +456,4 @@ class TarjanSCC
     }
 };
 
-#endif /* STRONGLYCONNECTEDCOMPONENTS_H_ */
+#endif /* TINY_COMPONENTS_HPP */

Benchmarks/static_rtree.cpp

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

CMakeLists.txt

@@ -33,15 +33,15 @@ OPTION(BUILD_TOOLS "Build OSRM tools" OFF)
 include_directories(${CMAKE_SOURCE_DIR}/Include/)
 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}
     -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FingerPrint-Config.cmake
   DEPENDS
-    ${CMAKE_SOURCE_DIR}/Util/FingerPrint.cpp.in
-  COMMENT "Configuring FingerPrint.cpp"
+    ${CMAKE_SOURCE_DIR}/Util/finger_print.cpp.in
+  COMMENT "Configuring finger_print.cpp"
   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(benchmarks DEPENDS rtree-bench)
 
@@ -52,27 +52,27 @@ configure_file(
   ${CMAKE_SOURCE_DIR}/Util/GitDescription.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(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})
 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})
 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 DescriptorGlob Descriptors/*.cpp)
-file(GLOB DatastructureGlob DataStructures/SearchEngineData.cpp DataStructures/RouteParameters.cpp Util/bearing.cpp)
-list(REMOVE_ITEM DatastructureGlob DataStructures/Coordinate.cpp)
-file(GLOB CoordinateGlob DataStructures/Coordinate.cpp)
+file(GLOB DatastructureGlob data_structures/search_engine_data.cpp data_structures/route_parameters.cpp Util/bearing.cpp)
+list(REMOVE_ITEM DatastructureGlob data_structures/Coordinate.cpp)
+file(GLOB CoordinateGlob data_structures/Coordinate.cpp)
 file(GLOB AlgorithmGlob algorithms/*.cpp)
 file(GLOB HttpGlob Server/Http/*.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)
 
 set(
@@ -85,7 +85,7 @@ set(
   ${HttpGlob}
 )
 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(OSRM ${OSRMSources} $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE>)
 add_dependencies(FINGERPRINT FingerPrintConfigure)

Contractor/contractor.hpp

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

Descriptors/BaseDescriptor.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
 #define BASE_DESCRIPTOR_H
 
-#include "../DataStructures/phantom_node.hpp"
-#include "../DataStructures/RawRouteData.h"
+#include "../data_structures/phantom_node.hpp"
+#include "../data_structures/raw_route_data.hpp"
 #include "../typedefs.h"
 
 #include <osrm/Reply.h>

Descriptors/DescriptionFactory.cpp

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

Descriptors/DescriptionFactory.h

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

Descriptors/GPXDescriptor.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
 
 #include "BaseDescriptor.h"
-#include "../DataStructures/JSONContainer.h"
+#include "../data_structures/json_container.hpp"
 #include "../Util/xml_renderer.hpp"
 
 #include <iostream>

Descriptors/JSONDescriptor.h

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

Extractor/ExtractionContainers.cpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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 "ExtractionWay.h"
 
-#include "../DataStructures/NodeID.h"
-#include "../DataStructures/RangeTable.h"
+#include "../data_structures/node_id.hpp"
+#include "../data_structures/range_table.hpp"
 
 #include "../Util/OSRMException.h"
 #include "../Util/simple_logger.hpp"

Extractor/ExtractionContainers.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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 "FirstAndLastSegmentOfWay.h"
-#include "../DataStructures/ExternalMemoryNode.h"
-#include "../DataStructures/Restriction.h"
+#include "../data_structures/external_memory_node.hpp"
+#include "../data_structures/restriction.hpp"
 #include "../Util/FingerPrint.h"
 
 #include <stxxl/vector>

Extractor/ExtractionNode.h

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

Extractor/ExtractionWay.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
 #define EXTRACTION_WAY_H
 
-#include "../DataStructures/TravelMode.h"
+#include "../data_structures/travel_mode.hpp"
 #include "../typedefs.h"
 
 #include <string>

Extractor/Extractor.cpp

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

Extractor/ExtractorCallbacks.cpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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 "ExtractionWay.h"
 
-#include "../DataStructures/ExternalMemoryNode.h"
-#include "../DataStructures/Restriction.h"
+#include "../data_structures/external_memory_node.hpp"
+#include "../data_structures/restriction.hpp"
 #include "../Util/container.hpp"
 #include "../Util/simple_logger.hpp"
 

Extractor/FirstAndLastSegmentOfWay.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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_
 #define EXTRACTORSTRUCTS_H_
 
-#include "../DataStructures/ExternalMemoryNode.h"
+#include "../data_structures/external_memory_node.hpp"
 #include "../typedefs.h"
 
 #include <limits>

Extractor/InternalExtractorEdge.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
 
 #include "../typedefs.h"
-#include "../DataStructures/TravelMode.h"
+#include "../data_structures/travel_mode.hpp"
 #include <osrm/Coordinate.h>
 
 #include <boost/assert.hpp>

Extractor/RestrictionParser.cpp

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

Extractor/RestrictionParser.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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_
 #define RESTRICTION_PARSER_H_
 
-#include "../DataStructures/Restriction.h"
+#include "../data_structures/restriction.hpp"
 
 #include <osmium/osm.hpp>
 #include <osmium/tags/regex_filter.hpp>

Extractor/ScriptingEnvironment.cpp

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

Library/OSRM_impl.cpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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/ServerPaths.h>
 
-#include "../DataStructures/QueryEdge.h"
 #include "../Plugins/DistanceTablePlugin.h"
 #include "../Plugins/HelloWorldPlugin.h"
 #include "../Plugins/LocatePlugin.h"

Library/OSRM_impl.h

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

Plugins/DistanceTablePlugin.h

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

Plugins/HelloWorldPlugin.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
 
 #include "BasePlugin.h"
-#include "../DataStructures/JSONContainer.h"
+#include "../data_structures/json_container.hpp"
 #include "../Util/cast.hpp"
 #include "../Util/json_renderer.hpp"
 

Plugins/LocatePlugin.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
 
 #include "BasePlugin.h"
-#include "../DataStructures/JSONContainer.h"
+#include "../data_structures/json_container.hpp"
 #include "../Util/json_renderer.hpp"
 #include "../Util/StringUtil.h"
 

Plugins/NearestPlugin.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
 
 #include "BasePlugin.h"
-#include "../DataStructures/JSONContainer.h"
-#include "../DataStructures/phantom_node.hpp"
+#include "../data_structures/json_container.hpp"
+#include "../data_structures/phantom_node.hpp"
 #include "../Util/integer_range.hpp"
 #include "../Util/json_renderer.hpp"
 

Plugins/TimestampPlugin.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
 
 #include "BasePlugin.h"
-#include "../DataStructures/JSONContainer.h"
+#include "../data_structures/json_container.hpp"
 #include "../Util/json_renderer.hpp"
 
 #include <string>

Plugins/ViaRoutePlugin.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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 "../algorithms/object_encoder.hpp"
-#include "../DataStructures/SearchEngine.h"
+#include "../data_structures/search_engine.hpp"
 #include "../Descriptors/BaseDescriptor.h"
 #include "../Descriptors/GPXDescriptor.h"
 #include "../Descriptors/JSONDescriptor.h"

RoutingAlgorithms/AlternativePathRouting.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
 
 #include "BasicRoutingInterface.h"
+#include "../data_structures/search_engine_data.hpp"
 #include "../Util/integer_range.hpp"
-#include "../DataStructures/SearchEngineData.h"
 #include "../Util/container.hpp"
 
 #include <boost/assert.hpp>

RoutingAlgorithms/BasicRoutingInterface.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
 #define BASIC_ROUTING_INTERFACE_H
 
-#include "../DataStructures/RawRouteData.h"
-#include "../DataStructures/SearchEngineData.h"
-#include "../DataStructures/TurnInstructions.h"
+#include "../data_structures/raw_route_data.hpp"
+#include "../data_structures/search_engine_data.hpp"
+#include "../data_structures/turn_instructions.hpp"
 // #include "../Util/simple_logger.hpp.h"
 
 #include <boost/assert.hpp>

RoutingAlgorithms/ManyToManyRouting.h

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

RoutingAlgorithms/ShortestPathRouting.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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 "BasicRoutingInterface.h"
-#include "../DataStructures/SearchEngineData.h"
+#include "../data_structures/search_engine_data.hpp"
 #include "../Util/integer_range.hpp"
 #include "../typedefs.h"
 

Server/DataStructures/BaseDataFacade.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
 
-#include "../../DataStructures/EdgeBasedNode.h"
-#include "../../DataStructures/ExternalMemoryNode.h"
-#include "../../DataStructures/phantom_node.hpp"
-#include "../../DataStructures/TurnInstructions.h"
+#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/OSRMException.h"
 #include "../../Util/StringUtil.h"

Server/DataStructures/InternalDataFacade.h

@@ -32,13 +32,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseDataFacade.h"
 
-#include "../../DataStructures/OriginalEdgeData.h"
-#include "../../DataStructures/QueryNode.h"
-#include "../../DataStructures/QueryEdge.h"
-#include "../../DataStructures/SharedMemoryVectorWrapper.h"
-#include "../../DataStructures/StaticGraph.h"
-#include "../../DataStructures/StaticRTree.h"
-#include "../../DataStructures/RangeTable.h"
+#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/BoostFileSystemFix.h"
 #include "../../Util/GraphLoader.h"
 #include "../../Util/simple_logger.hpp"

Server/DataStructures/SharedDataFacade.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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 "SharedDataType.h"
 
-#include "../../DataStructures/RangeTable.h"
-#include "../../DataStructures/StaticGraph.h"
-#include "../../DataStructures/StaticRTree.h"
+#include "../../data_structures/range_table.hpp"
+#include "../../data_structures/static_graph.hpp"
+#include "../../data_structures/static_rtree.hpp"
 #include "../../Util/BoostFileSystemFix.h"
 #include "../../Util/make_unique.hpp"
 #include "../../Util/simple_logger.hpp"

Server/RequestHandler.cpp

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

Tools/check-hsgr.cpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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.
 
 */
-#include "../DataStructures/Percent.h"
-#include "../DataStructures/QueryEdge.h"
-#include "../DataStructures/StaticGraph.h"
+#include "../data_structures/percent.hpp"
+#include "../data_structures/query_edge.hpp"
+#include "../data_structures/static_graph.hpp"
 #include "../Util/integer_range.hpp"
 #include "../Util/GraphLoader.h"
 #include "../Util/simple_logger.hpp"

Tools/springclean.cpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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 "../DataStructures/SharedMemoryFactory.h"
+#include "../data_structures/shared_memory_factory.hpp"
 #include "../Server/DataStructures/SharedDataType.h"
 #include "../Util/GitDescription.h"
 #include "../Util/simple_logger.hpp"

UnitTests/Algorithms/DouglasPeuckerTest.cpp

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

UnitTests/data_structures/BinaryHeapTest.cpp

@@ -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 <boost/test/unit_test.hpp>

UnitTests/data_structures/RangeTableTest.cpp

@@ -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 <boost/test/unit_test.hpp>

UnitTests/data_structures/StaticGraphTest.cpp

@@ -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 <boost/test/unit_test.hpp>

UnitTests/data_structures/StaticRTreeTest.cpp

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

Util/GraphLoader.h

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
 
 #include "OSRMException.h"
-#include "../DataStructures/ExternalMemoryNode.h"
-#include "../DataStructures/ImportEdge.h"
-#include "../DataStructures/QueryNode.h"
-#include "../DataStructures/Restriction.h"
+#include "../data_structures/external_memory_node.hpp"
+#include "../data_structures/import_edge.hpp"
+#include "../data_structures/query_node.hpp"
+#include "../data_structures/restriction.hpp"
 #include "../Util/simple_logger.hpp"
 #include "../Util/FingerPrint.h"
 #include "../typedefs.h"

Util/json_renderer.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
 #define JSON_RENDERER_HPP
 
-#include "../DataStructures/JSONContainer.h"
+#include "../data_structures/json_container.hpp"
 #include "cast.hpp"
 
 namespace JSON {

Util/xml_renderer.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
 #define XML_RENDERER_HPP
 
-#include "../DataStructures/JSONContainer.h"
+#include "../data_structures/json_container.hpp"
 #include "cast.hpp"
 
 namespace JSON {

algorithms/bfs_components.hpp

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

algorithms/douglas_peucker.cpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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 "../DataStructures/segment_information.hpp"
+#include "../data_structures/segment_information.hpp"
 #include "../Util/integer_range.hpp"
 
 #include <osrm/Coordinate.h>

algorithms/polyline_compressor.cpp

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

algorithms/polyline_formatter.cpp

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

algorithms/polyline_formatter.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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_
-#define POLYLINE_FORMATTER_H_
+#ifndef POLYLINE_FORMATTER_HPP
+#define POLYLINE_FORMATTER_HPP
 
 struct SegmentInformation;
 
-#include "../DataStructures/JSONContainer.h"
+#include "../data_structures/json_container.hpp"
 
 #include <string>
 #include <vector>
@@ -42,4 +42,4 @@ struct PolylineFormatter
     JSON::Array printUnencodedString(const std::vector<SegmentInformation> &polyline) const;
 };
 
-#endif /* POLYLINE_FORMATTER_H_ */
+#endif /* POLYLINE_FORMATTER_HPP */

algorithms/tiny_components.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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_
-#define STRONGLYCONNECTEDCOMPONENTS_H_
+#ifndef TINY_COMPONENTS_HPP
+#define TINY_COMPONENTS_HPP
 
 #include "../typedefs.h"
-#include "../DataStructures/DeallocatingVector.h"
-#include "../DataStructures/DynamicGraph.h"
-#include "../DataStructures/ImportEdge.h"
-#include "../DataStructures/QueryNode.h"
-#include "../DataStructures/Percent.h"
-#include "../DataStructures/Restriction.h"
-#include "../DataStructures/TurnInstructions.h"
+#include "../data_structures/deallocating_vector.hpp"
+#include "../data_structures/dynamic_graph.hpp"
+#include "../data_structures/import_edge.hpp"
+#include "../data_structures/query_node.hpp"
+#include "../data_structures/percent.hpp"
+#include "../data_structures/restriction.hpp"
+#include "../data_structures/turn_instructions.hpp"
 
 #include "../Util/integer_range.hpp"
 #include "../Util/OSRMException.h"
@@ -456,4 +456,4 @@ class TarjanSCC
     }
 };
 
-#endif /* STRONGLYCONNECTEDCOMPONENTS_H_ */
+#endif /* TINY_COMPONENTS_HPP */

benchmarks/static_rtree.cpp

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

cmake/FingerPrint-Config.cmake

@@ -3,8 +3,8 @@ if (EXISTS ${OLDFILE})
 	file(REMOVE_RECURSE ${OLDFILE})
 endif()
 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}/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 )

contractor/contractor.hpp

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

contractor/edge_based_graph_factory.cpp

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

contractor/edge_based_graph_factory.hpp

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

contractor/processing_chain.cpp

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

contractor/processing_chain.hpp

@@ -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 "../DataStructures/QueryEdge.h"
-#include "../DataStructures/StaticGraph.h"
+#include "../data_structures/query_edge.hpp"
+#include "../data_structures/static_graph.hpp"
+
 class FingerPrint;
 struct EdgeBasedNode;
 struct lua_State;
@@ -64,4 +92,4 @@ class Prepare
     std::string rtree_leafs_path;
 };
 
-#endif // PREPARE_H
+#endif // PROCESSING_CHAIN_HPP

data_structures/binary_heap.hpp

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

data_structures/concurrent_queue.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
-#define CONCURRENT_QUEUE_H
+#ifndef CONCURRENT_QUEUE_HPP
+#define CONCURRENT_QUEUE_HPP
 
 #include <boost/circular_buffer.hpp>
 #include <condition_variable>
@@ -80,4 +80,4 @@ template <typename Data> class ConcurrentQueue
     std::condition_variable m_not_full;
 };
 
-#endif // CONCURRENT_QUEUE_H
+#endif // CONCURRENT_QUEUE_HPP

data_structures/dynamic_graph.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
-#define DYNAMICGRAPH_H
+#ifndef DYNAMICGRAPH_HPP
+#define DYNAMICGRAPH_HPP
 
-#include "DeallocatingVector.h"
+#include "deallocating_vector.hpp"
 #include "../Util/integer_range.hpp"
 
 #include <boost/assert.hpp>
@@ -292,4 +292,4 @@ template <typename EdgeDataT> class DynamicGraph
     DeallocatingVector<Edge> edge_list;
 };
 
-#endif // DYNAMICGRAPH_H
+#endif // DYNAMICGRAPH_HPP

data_structures/edge_based_node.hpp

@@ -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 <osrm/Coordinate.h>
@@ -95,4 +122,4 @@ struct EdgeBasedNode
     TravelMode backward_travel_mode : 4;
 };
 
-#endif //EDGE_BASED_NODE_H
+#endif //EDGE_BASED_NODE_HPP

data_structures/external_memory_node.cpp

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

data_structures/external_memory_node.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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__
-#define EXTERNAL_MEMORY_NODE_H__
+#ifndef EXTERNAL_MEMORY_NODE_HPP_
+#define EXTERNAL_MEMORY_NODE_HPP_
 
-#include "QueryNode.h"
+#include "query_node.hpp"
 
 #include <string>
 
@@ -54,4 +54,4 @@ struct ExternalMemoryNodeSTXXLCompare
     value_type min_value();
 };
 
-#endif /* EXTERNAL_MEMORY_NODE_H__ */
+#endif /* EXTERNAL_MEMORY_NODE_HPP_ */

data_structures/fixed_point_number.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
-#define OSRM_FIXED_POINT_NUMBER_H
+#ifndef FIXED_POINT_NUMBER_HPP
+#define FIXED_POINT_NUMBER_HPP
 
 #include <cmath>
 #include <cstdint>
@@ -213,4 +213,4 @@ class FixedPointNumber
 
 static_assert(4 == sizeof(FixedPointNumber<1>), "FP19 has wrong size != 4");
 }
-#endif // OSRM_FIXED_POINT_NUMBER_H
+#endif // FIXED_POINT_NUMBER_HPP

data_structures/hilbert_value.cpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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>
 

data_structures/hilbert_value.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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_
-#define HILBERTVALUE_H_
+#ifndef HILBERT_VALUE_HPP
+#define HILBERT_VALUE_HPP
 
 #include <cstdint>
 
@@ -46,4 +46,4 @@ class HilbertCode
     inline void TransposeCoordinate(uint32_t *X) const;
 };
 
-#endif /* HILBERTVALUE_H_ */
+#endif /* HILBERT_VALUE_HPP */

data_structures/import_edge.cpp

@@ -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>
 

data_structures/import_edge.hpp

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

data_structures/lru_cache.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
-#define LRUCACHE_H
+#ifndef LRUCACHE_HPP
+#define LRUCACHE_HPP
 
 #include <list>
 #include <unordered_map>
@@ -94,4 +94,4 @@ template <typename KeyT, typename ValueT> class LRUCache
     }
     unsigned Size() const { return itemsInCache.size(); }
 };
-#endif // LRUCACHE_H
+#endif // LRUCACHE_HPP

data_structures/node_based_graph.hpp

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

data_structures/node_id.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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__
-#define NODE_ID_H__
+#ifndef NODE_ID_HPP
+#define NODE_ID_HPP
 
 #include "../typedefs.h"
 
@@ -38,4 +38,4 @@ struct Cmp
     value_type min_value() { return 0x0; }
 };
 
-#endif // NODE_ID_H__
+#endif // NODE_ID_HPP

data_structures/original_edge_data.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
-#define ORIGINAL_EDGE_DATA_H
+#ifndef ORIGINAL_EDGE_DATA_HPP
+#define ORIGINAL_EDGE_DATA_HPP
 
-#include "TurnInstructions.h"
-#include "../DataStructures/TravelMode.h"
+#include "travel_mode.hpp"
+#include "turn_instructions.hpp"
 #include "../typedefs.h"
 
 #include <limits>
@@ -61,4 +61,4 @@ struct OriginalEdgeData
     TravelMode travel_mode;
 };
 
-#endif // ORIGINAL_EDGE_DATA_H
+#endif // ORIGINAL_EDGE_DATA_HPP

data_structures/percent.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
-#define PERCENT_H
+#ifndef PERCENT_HPP
+#define PERCENT_HPP
 
 #include <iostream>
 #include <atomic>
@@ -98,4 +98,4 @@ class Percent
     }
 };
 
-#endif // PERCENT_H
+#endif // PERCENT_HPP

data_structures/phantom_node.hpp

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

data_structures/query_edge.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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_
-#define QUERYEDGE_H_
+#ifndef QUERYEDGE_HPP_
+#define QUERYEDGE_HPP_
 
 #include "../typedefs.h"
 
@@ -78,4 +78,4 @@ struct QueryEdge
     }
 };
 
-#endif /* QUERYEDGE_H_ */
+#endif /* QUERYEDGE_HPP_ */

data_structures/query_node.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
-#define QUERY_NODE_H
+#ifndef QUERY_NODE_HPP
+#define QUERY_NODE_HPP
 
 #include "../typedefs.h"
 
@@ -82,4 +82,4 @@ struct QueryNode
     }
 };
 
-#endif // QUERY_NODE_H
+#endif // QUERY_NODE_HPP

data_structures/range_table.hpp

@@ -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 "SharedMemoryFactory.h"
-#include "SharedMemoryVectorWrapper.h"
+#include "shared_memory_factory.hpp"
+#include "shared_memory_vector_wrapper.hpp"
 
 #include <fstream>
 #include <vector>
@@ -228,4 +255,4 @@ std::istream& operator>>(std::istream &in, RangeTable<BLOCK_SIZE, USE_SHARED_MEM
     return in;
 }
 
-#endif //RANGE_TABLE_H_
+#endif //RANGE_TABLE_HPP

data_structures/raw_route_data.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
-#define RAW_ROUTE_DATA_H
+#ifndef RAW_ROUTE_DATA_HPP
+#define RAW_ROUTE_DATA_HPP
 
-#include "../DataStructures/phantom_node.hpp"
-#include "../DataStructures/TravelMode.h"
-#include "../DataStructures/TurnInstructions.h"
+#include "../data_structures/phantom_node.hpp"
+#include "../data_structures/travel_mode.hpp"
+#include "../data_structures/turn_instructions.hpp"
 #include "../typedefs.h"
 
 #include <osrm/Coordinate.h>
@@ -87,4 +87,4 @@ struct RawRouteData
     }
 };
 
-#endif // RAW_ROUTE_DATA_H
+#endif // RAW_ROUTE_DATA_HPP

data_structures/rectangle.hpp

@@ -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>
 

data_structures/restriction.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
-#define RESTRICTION_H
+#ifndef RESTRICTION_HPP
+#define RESTRICTION_HPP
 
 #include "../typedefs.h"
 
@@ -129,4 +129,4 @@ struct CmpRestrictionContainerByTo
     value_type min_value() const { return InputRestrictionContainer::min_value(); }
 };
 
-#endif // RESTRICTION_H
+#endif // RESTRICTION_HPP

data_structures/restriction_map.cpp

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

data_structures/restriction_map.hpp

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

data_structures/search_engine.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
-#define SEARCHENGINE_H
+#ifndef SEARCH_ENGINE_HPP
+#define SEARCH_ENGINE_HPP
 
-#include "SearchEngineData.h"
+#include "search_engine_data.hpp"
 #include "../RoutingAlgorithms/AlternativePathRouting.h"
 #include "../RoutingAlgorithms/ManyToManyRouting.h"
 #include "../RoutingAlgorithms/ShortestPathRouting.h"
@@ -57,4 +57,4 @@ template <class DataFacadeT> class SearchEngine
     ~SearchEngine() {}
 };
 
-#endif // SEARCHENGINE_H
+#endif // SEARCH_ENGINE_HPP

data_structures/search_engine_data.cpp

@@ -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)
 {

data_structures/search_engine_data.hpp

@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 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
-#define SEARCH_ENGINE_DATA_H
+#ifndef SEARCH_ENGINE_DATA_HPP
+#define SEARCH_ENGINE_DATA_HPP
 
 #include <boost/thread/tss.hpp>
 
 #include "../typedefs.h"
-#include "BinaryHeap.h"
+#include "binary_heap.hpp"
 
 struct HeapData
 {
@@ -58,4 +58,4 @@ struct SearchEngineData
     void InitializeOrClearThirdThreadLocalStorage(const unsigned number_of_nodes);
 };
 
-#endif // SEARCH_ENGINE_DATA_H
+#endif // SEARCH_ENGINE_DATA_HPP