From 58de37e822b2d88da8dcb7ea3081235fe1e665f8 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Fri, 28 Nov 2014 12:13:18 +0100 Subject: [PATCH] renamed: DataStructures/* -> data_structures/* --- .gitignore | 2 +- Algorithms/bfs_components.hpp | 2 +- Algorithms/douglas_peucker.cpp | 4 +- Algorithms/polyline_compressor.cpp | 2 +- Algorithms/polyline_formatter.cpp | 2 +- Algorithms/polyline_formatter.hpp | 10 ++--- Algorithms/tiny_components.hpp | 22 +++++------ Benchmarks/static_rtree.cpp | 10 ++--- CMakeLists.txt | 24 ++++++------ Contractor/contractor.hpp | 14 +++---- Descriptors/BaseDescriptor.h | 6 +-- Descriptors/DescriptionFactory.cpp | 4 +- Descriptors/DescriptionFactory.h | 8 ++-- Descriptors/GPXDescriptor.h | 4 +- Descriptors/JSONDescriptor.h | 6 +-- Extractor/ExtractionContainers.cpp | 6 +-- Extractor/ExtractionContainers.h | 6 +-- Extractor/ExtractionNode.h | 2 +- Extractor/ExtractionWay.h | 4 +- Extractor/Extractor.cpp | 1 - Extractor/ExtractorCallbacks.cpp | 6 +-- Extractor/FirstAndLastSegmentOfWay.h | 4 +- Extractor/InternalExtractorEdge.h | 4 +- Extractor/RestrictionParser.cpp | 2 +- Extractor/RestrictionParser.h | 4 +- Extractor/ScriptingEnvironment.cpp | 2 +- Library/OSRM_impl.cpp | 3 +- Library/OSRM_impl.h | 2 +- Plugins/DistanceTablePlugin.h | 6 +-- Plugins/HelloWorldPlugin.h | 4 +- Plugins/LocatePlugin.h | 4 +- Plugins/NearestPlugin.h | 6 +-- Plugins/TimestampPlugin.h | 4 +- Plugins/ViaRoutePlugin.h | 4 +- RoutingAlgorithms/AlternativePathRouting.h | 4 +- RoutingAlgorithms/BasicRoutingInterface.h | 8 ++-- RoutingAlgorithms/ManyToManyRouting.h | 2 +- RoutingAlgorithms/ShortestPathRouting.h | 4 +- Server/DataStructures/BaseDataFacade.h | 10 ++--- Server/DataStructures/InternalDataFacade.h | 14 +++---- Server/DataStructures/SharedDataFacade.h | 8 ++-- Server/RequestHandler.cpp | 2 +- Tools/check-hsgr.cpp | 8 ++-- Tools/springclean.cpp | 4 +- UnitTests/Algorithms/DouglasPeuckerTest.cpp | 2 +- .../BinaryHeapTest.cpp | 2 +- .../RangeTableTest.cpp | 2 +- .../StaticGraphTest.cpp | 2 +- .../StaticRTreeTest.cpp | 6 +-- Util/GraphLoader.h | 10 ++--- ...FingerPrint.cpp.in => finger_print.cpp.in} | 0 Util/json_renderer.hpp | 4 +- Util/xml_renderer.hpp | 4 +- algorithms/bfs_components.hpp | 2 +- algorithms/douglas_peucker.cpp | 4 +- algorithms/polyline_compressor.cpp | 2 +- algorithms/polyline_formatter.cpp | 2 +- algorithms/polyline_formatter.hpp | 10 ++--- algorithms/tiny_components.hpp | 22 +++++------ benchmarks/static_rtree.cpp | 10 ++--- cmake/FingerPrint-Config.cmake | 4 +- contractor/contractor.hpp | 14 +++---- contractor/edge_based_graph_factory.cpp | 2 +- contractor/edge_based_graph_factory.hpp | 14 +++---- contractor/processing_chain.cpp | 6 +-- contractor/processing_chain.hpp | 38 ++++++++++++++++--- .../Coordinate.cpp | 0 .../InputReaderFactory.h | 0 .../binary_heap.hpp | 2 +- .../concurrent_queue.hpp | 8 ++-- .../deallocating_vector.hpp | 0 .../dynamic_graph.hpp | 10 ++--- .../edge_based_node.hpp | 35 +++++++++++++++-- .../external_memory_node.cpp | 2 +- .../external_memory_node.hpp | 10 ++--- .../fixed_point_number.hpp | 8 ++-- .../hilbert_value.cpp | 4 +- .../hilbert_value.hpp | 8 ++-- .../import_edge.cpp | 2 +- .../import_edge.hpp | 8 ++-- .../json_container.hpp | 0 .../lru_cache.hpp | 8 ++-- .../node_based_graph.hpp | 37 +++++++++++++++--- .../NodeID.h => data_structures/node_id.hpp | 8 ++-- .../original_edge_data.hpp | 12 +++--- .../Percent.h => data_structures/percent.hpp | 8 ++-- .../phantom_node.cpp | 0 .../phantom_node.hpp | 2 +- .../query_edge.hpp | 8 ++-- .../query_node.hpp | 8 ++-- .../range_table.hpp | 37 +++++++++++++++--- .../raw_route_data.hpp | 14 +++---- .../rectangle.hpp | 31 ++++++++++++++- .../restriction.hpp | 8 ++-- .../restriction_map.cpp | 1 - .../restriction_map.hpp | 11 +++--- .../route_parameters.cpp | 0 .../search_engine.hpp | 10 ++--- .../search_engine_data.cpp | 4 +- .../search_engine_data.hpp | 10 ++--- .../segment_information.hpp | 6 +-- .../shared_memory_factory.hpp | 8 ++-- .../shared_memory_vector_wrapper.hpp | 8 ++-- .../static_graph.hpp | 12 +++--- .../static_kdtree.hpp | 6 +-- .../static_rtree.hpp | 20 +++++----- .../travel_mode.hpp | 11 +++--- .../turn_instructions.hpp | 8 ++-- .../xor_fast_hash.hpp | 6 +-- .../xor_fast_hash_storage.hpp | 8 ++-- datastore.cpp | 18 ++++----- 111 files changed, 489 insertions(+), 356 deletions(-) rename UnitTests/{DataStructures => data_structures}/BinaryHeapTest.cpp (99%) rename UnitTests/{DataStructures => data_structures}/RangeTableTest.cpp (98%) rename UnitTests/{DataStructures => data_structures}/StaticGraphTest.cpp (99%) rename UnitTests/{DataStructures => data_structures}/StaticRTreeTest.cpp (99%) rename Util/{FingerPrint.cpp.in => finger_print.cpp.in} (100%) rename {DataStructures => data_structures}/Coordinate.cpp (100%) rename {DataStructures => data_structures}/InputReaderFactory.h (100%) rename DataStructures/BinaryHeap.h => data_structures/binary_heap.hpp (99%) rename DataStructures/ConcurrentQueue.h => data_structures/concurrent_queue.hpp (95%) rename DataStructures/DeallocatingVector.h => data_structures/deallocating_vector.hpp (100%) rename DataStructures/DynamicGraph.h => data_structures/dynamic_graph.hpp (98%) rename DataStructures/EdgeBasedNode.h => data_structures/edge_based_node.hpp (69%) rename DataStructures/ExternalMemoryNode.cpp => data_structures/external_memory_node.cpp (98%) rename DataStructures/ExternalMemoryNode.h => data_structures/external_memory_node.hpp (90%) rename DataStructures/FixedPointNumber.h => data_structures/fixed_point_number.hpp (98%) rename DataStructures/HilbertValue.cpp => data_structures/hilbert_value.cpp (97%) rename DataStructures/HilbertValue.h => data_structures/hilbert_value.hpp (92%) rename DataStructures/ImportEdge.cpp => data_structures/import_edge.cpp (99%) rename DataStructures/ImportEdge.h => data_structures/import_edge.hpp (95%) rename DataStructures/JSONContainer.h => data_structures/json_container.hpp (100%) rename DataStructures/LRUCache.h => data_structures/lru_cache.hpp (96%) rename DataStructures/NodeBasedGraph.h => data_structures/node_based_graph.hpp (85%) rename DataStructures/NodeID.h => data_structures/node_id.hpp (92%) rename DataStructures/OriginalEdgeData.h => data_structures/original_edge_data.hpp (91%) rename DataStructures/Percent.h => data_structures/percent.hpp (96%) rename {DataStructures => data_structures}/phantom_node.cpp (100%) rename {DataStructures => data_structures}/phantom_node.hpp (98%) rename DataStructures/QueryEdge.h => data_structures/query_edge.hpp (95%) rename DataStructures/QueryNode.h => data_structures/query_node.hpp (95%) rename DataStructures/RangeTable.h => data_structures/range_table.hpp (83%) rename DataStructures/RawRouteData.h => data_structures/raw_route_data.hpp (90%) rename DataStructures/Rectangle.h => data_structures/rectangle.hpp (83%) rename DataStructures/Restriction.h => data_structures/restriction.hpp (96%) rename {DataStructures => data_structures}/restriction_map.cpp (99%) rename {DataStructures => data_structures}/restriction_map.hpp (96%) rename DataStructures/RouteParameters.cpp => data_structures/route_parameters.cpp (100%) rename DataStructures/SearchEngine.h => data_structures/search_engine.hpp (92%) rename DataStructures/SearchEngineData.cpp => data_structures/search_engine_data.cpp (97%) rename DataStructures/SearchEngineData.h => data_structures/search_engine_data.hpp (92%) rename {DataStructures => data_structures}/segment_information.hpp (95%) rename DataStructures/SharedMemoryFactory.h => data_structures/shared_memory_factory.hpp (98%) rename DataStructures/SharedMemoryVectorWrapper.h => data_structures/shared_memory_vector_wrapper.hpp (96%) rename DataStructures/StaticGraph.h => data_structures/static_graph.hpp (97%) rename DataStructures/StaticKDTree.h => data_structures/static_kdtree.hpp (98%) rename DataStructures/StaticRTree.h => data_structures/static_rtree.hpp (99%) rename DataStructures/TravelMode.h => data_structures/travel_mode.hpp (90%) rename DataStructures/TurnInstructions.h => data_structures/turn_instructions.hpp (95%) rename DataStructures/XORFastHash.h => data_structures/xor_fast_hash.hpp (97%) rename DataStructures/XORFastHashStorage.h => data_structures/xor_fast_hash_storage.hpp (95%) diff --git a/.gitignore b/.gitignore index 9b500cb1a..7128e2efa 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,7 @@ Thumbs.db # build related files # ####################### /build/ -/Util/FingerPrint.cpp +/Util/finger_print.cpp /Util/GitDescription.cpp /cmake/postinst diff --git a/Algorithms/bfs_components.hpp b/Algorithms/bfs_components.hpp index b48016af4..bdcbd5e43 100644 --- a/Algorithms/bfs_components.hpp +++ b/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 #include diff --git a/Algorithms/douglas_peucker.cpp b/Algorithms/douglas_peucker.cpp index d64e22189..362f0a5a8 100644 --- a/Algorithms/douglas_peucker.cpp +++ b/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 diff --git a/Algorithms/polyline_compressor.cpp b/Algorithms/polyline_compressor.cpp index 061103d3d..2f2972b15 100644 --- a/Algorithms/polyline_compressor.cpp +++ b/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 diff --git a/Algorithms/polyline_formatter.cpp b/Algorithms/polyline_formatter.cpp index fd638c6a4..d72496ad6 100644 --- a/Algorithms/polyline_formatter.cpp +++ b/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 diff --git a/Algorithms/polyline_formatter.hpp b/Algorithms/polyline_formatter.hpp index f2bd6591f..1d4744d0a 100644 --- a/Algorithms/polyline_formatter.hpp +++ b/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 #include @@ -42,4 +42,4 @@ struct PolylineFormatter JSON::Array printUnencodedString(const std::vector &polyline) const; }; -#endif /* POLYLINE_FORMATTER_H_ */ +#endif /* POLYLINE_FORMATTER_HPP */ diff --git a/Algorithms/tiny_components.hpp b/Algorithms/tiny_components.hpp index 8e7b8f018..c7e93f1e5 100644 --- a/Algorithms/tiny_components.hpp +++ b/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 */ diff --git a/Benchmarks/static_rtree.cpp b/Benchmarks/static_rtree.cpp index 72ba3f2ef..3d5c5f891 100644 --- a/Benchmarks/static_rtree.cpp +++ b/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 diff --git a/CMakeLists.txt b/CMakeLists.txt index a474b7692..8afec5277 100644 --- a/CMakeLists.txt +++ b/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} $ $ $ $ $) -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} $ $ $ $ $) 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} $ $ $ $ $) add_dependencies(FINGERPRINT FingerPrintConfigure) diff --git a/Contractor/contractor.hpp b/Contractor/contractor.hpp index 257dae656..7457a98fe 100644 --- a/Contractor/contractor.hpp +++ b/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" diff --git a/Descriptors/BaseDescriptor.h b/Descriptors/BaseDescriptor.h index c793bbda1..37098ed08 100644 --- a/Descriptors/BaseDescriptor.h +++ b/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 diff --git a/Descriptors/DescriptionFactory.cpp b/Descriptors/DescriptionFactory.cpp index 77498b34e..e18c4d485 100644 --- a/Descriptors/DescriptionFactory.cpp +++ b/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); } diff --git a/Descriptors/DescriptionFactory.h b/Descriptors/DescriptionFactory.h index e808ed7f2..7043cc5c9 100644 --- a/Descriptors/DescriptionFactory.h +++ b/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 diff --git a/Descriptors/GPXDescriptor.h b/Descriptors/GPXDescriptor.h index 341fb3899..6c2d6c8cd 100644 --- a/Descriptors/GPXDescriptor.h +++ b/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 diff --git a/Descriptors/JSONDescriptor.h b/Descriptors/JSONDescriptor.h index 53980ee47..ee3663c93 100644 --- a/Descriptors/JSONDescriptor.h +++ b/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" diff --git a/Extractor/ExtractionContainers.cpp b/Extractor/ExtractionContainers.cpp index 4137c4642..466df324b 100644 --- a/Extractor/ExtractionContainers.cpp +++ b/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" diff --git a/Extractor/ExtractionContainers.h b/Extractor/ExtractionContainers.h index f09fcc522..b96cbb8c7 100644 --- a/Extractor/ExtractionContainers.h +++ b/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 diff --git a/Extractor/ExtractionNode.h b/Extractor/ExtractionNode.h index 799455102..3f9e38e99 100644 --- a/Extractor/ExtractionNode.h +++ b/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, diff --git a/Extractor/ExtractionWay.h b/Extractor/ExtractionWay.h index 2e64ba6e2..8e509942a 100644 --- a/Extractor/ExtractionWay.h +++ b/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 diff --git a/Extractor/Extractor.cpp b/Extractor/Extractor.cpp index f90c8cbf1..c22210f7e 100644 --- a/Extractor/Extractor.cpp +++ b/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" diff --git a/Extractor/ExtractorCallbacks.cpp b/Extractor/ExtractorCallbacks.cpp index 5f398dc8a..f2e955c13 100644 --- a/Extractor/ExtractorCallbacks.cpp +++ b/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" diff --git a/Extractor/FirstAndLastSegmentOfWay.h b/Extractor/FirstAndLastSegmentOfWay.h index a1be23e08..f8fcd2d33 100644 --- a/Extractor/FirstAndLastSegmentOfWay.h +++ b/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 diff --git a/Extractor/InternalExtractorEdge.h b/Extractor/InternalExtractorEdge.h index 848b24fb3..113817460 100644 --- a/Extractor/InternalExtractorEdge.h +++ b/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 #include diff --git a/Extractor/RestrictionParser.cpp b/Extractor/RestrictionParser.cpp index fa7c607f3..8199c480b 100644 --- a/Extractor/RestrictionParser.cpp +++ b/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" diff --git a/Extractor/RestrictionParser.h b/Extractor/RestrictionParser.h index 197484db9..c7c7b6045 100644 --- a/Extractor/RestrictionParser.h +++ b/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 #include diff --git a/Extractor/ScriptingEnvironment.cpp b/Extractor/ScriptingEnvironment.cpp index 40bee478e..0f192f511 100644 --- a/Extractor/ScriptingEnvironment.cpp +++ b/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" diff --git a/Library/OSRM_impl.cpp b/Library/OSRM_impl.cpp index 44547cd42..bfd7f803a 100644 --- a/Library/OSRM_impl.cpp +++ b/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 #include -#include "../DataStructures/QueryEdge.h" #include "../Plugins/DistanceTablePlugin.h" #include "../Plugins/HelloWorldPlugin.h" #include "../Plugins/LocatePlugin.h" diff --git a/Library/OSRM_impl.h b/Library/OSRM_impl.h index a4af62cb6..e8b47df56 100644 --- a/Library/OSRM_impl.h +++ b/Library/OSRM_impl.h @@ -34,7 +34,7 @@ struct RouteParameters; #include -#include "../DataStructures/QueryEdge.h" +#include "../data_structures/query_edge.hpp" #include #include diff --git a/Plugins/DistanceTablePlugin.h b/Plugins/DistanceTablePlugin.h index a8db574c2..d06cd5305 100644 --- a/Plugins/DistanceTablePlugin.h +++ b/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" diff --git a/Plugins/HelloWorldPlugin.h b/Plugins/HelloWorldPlugin.h index 1a610fd68..6bf742b12 100644 --- a/Plugins/HelloWorldPlugin.h +++ b/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" diff --git a/Plugins/LocatePlugin.h b/Plugins/LocatePlugin.h index a4e030251..75c43e275 100644 --- a/Plugins/LocatePlugin.h +++ b/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" diff --git a/Plugins/NearestPlugin.h b/Plugins/NearestPlugin.h index 11d291b55..73849c376 100644 --- a/Plugins/NearestPlugin.h +++ b/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" diff --git a/Plugins/TimestampPlugin.h b/Plugins/TimestampPlugin.h index 07cffca5e..8de4bdf1e 100644 --- a/Plugins/TimestampPlugin.h +++ b/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 diff --git a/Plugins/ViaRoutePlugin.h b/Plugins/ViaRoutePlugin.h index f4e087036..387835c9b 100644 --- a/Plugins/ViaRoutePlugin.h +++ b/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" diff --git a/RoutingAlgorithms/AlternativePathRouting.h b/RoutingAlgorithms/AlternativePathRouting.h index 5d9cb1395..22ae4f596 100644 --- a/RoutingAlgorithms/AlternativePathRouting.h +++ b/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 diff --git a/RoutingAlgorithms/BasicRoutingInterface.h b/RoutingAlgorithms/BasicRoutingInterface.h index 72f1155e5..a75f6afec 100644 --- a/RoutingAlgorithms/BasicRoutingInterface.h +++ b/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 diff --git a/RoutingAlgorithms/ManyToManyRouting.h b/RoutingAlgorithms/ManyToManyRouting.h index facd0a24f..70f792a95 100644 --- a/RoutingAlgorithms/ManyToManyRouting.h +++ b/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 diff --git a/RoutingAlgorithms/ShortestPathRouting.h b/RoutingAlgorithms/ShortestPathRouting.h index 05d391ad1..c6ec26592 100644 --- a/RoutingAlgorithms/ShortestPathRouting.h +++ b/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 #include "BasicRoutingInterface.h" -#include "../DataStructures/SearchEngineData.h" +#include "../data_structures/search_engine_data.hpp" #include "../Util/integer_range.hpp" #include "../typedefs.h" diff --git a/Server/DataStructures/BaseDataFacade.h b/Server/DataStructures/BaseDataFacade.h index 04dc77d0e..a51ca0fe4 100644 --- a/Server/DataStructures/BaseDataFacade.h +++ b/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" diff --git a/Server/DataStructures/InternalDataFacade.h b/Server/DataStructures/InternalDataFacade.h index 9f2019e32..f0fa7f42a 100644 --- a/Server/DataStructures/InternalDataFacade.h +++ b/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" diff --git a/Server/DataStructures/SharedDataFacade.h b/Server/DataStructures/SharedDataFacade.h index 1195dcb74..a7f9e821e 100644 --- a/Server/DataStructures/SharedDataFacade.h +++ b/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" diff --git a/Server/RequestHandler.cpp b/Server/RequestHandler.cpp index bb2c5d8e1..f8ad568f1 100644 --- a/Server/RequestHandler.cpp +++ b/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" diff --git a/Tools/check-hsgr.cpp b/Tools/check-hsgr.cpp index 1f7d2ca0f..f3de6d487 100644 --- a/Tools/check-hsgr.cpp +++ b/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" diff --git a/Tools/springclean.cpp b/Tools/springclean.cpp index f528d3da3..b67e69521 100644 --- a/Tools/springclean.cpp +++ b/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 -#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" diff --git a/UnitTests/Algorithms/DouglasPeuckerTest.cpp b/UnitTests/Algorithms/DouglasPeuckerTest.cpp index bde9bb1ab..27818e596 100644 --- a/UnitTests/Algorithms/DouglasPeuckerTest.cpp +++ b/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 diff --git a/UnitTests/DataStructures/BinaryHeapTest.cpp b/UnitTests/data_structures/BinaryHeapTest.cpp similarity index 99% rename from UnitTests/DataStructures/BinaryHeapTest.cpp rename to UnitTests/data_structures/BinaryHeapTest.cpp index 3474bbae0..9cfdae260 100644 --- a/UnitTests/DataStructures/BinaryHeapTest.cpp +++ b/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 diff --git a/UnitTests/DataStructures/RangeTableTest.cpp b/UnitTests/data_structures/RangeTableTest.cpp similarity index 98% rename from UnitTests/DataStructures/RangeTableTest.cpp rename to UnitTests/data_structures/RangeTableTest.cpp index ba048ccb4..9c925328a 100644 --- a/UnitTests/DataStructures/RangeTableTest.cpp +++ b/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 diff --git a/UnitTests/DataStructures/StaticGraphTest.cpp b/UnitTests/data_structures/StaticGraphTest.cpp similarity index 99% rename from UnitTests/DataStructures/StaticGraphTest.cpp rename to UnitTests/data_structures/StaticGraphTest.cpp index 811d9d9cc..4f82f8e7b 100644 --- a/UnitTests/DataStructures/StaticGraphTest.cpp +++ b/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 diff --git a/UnitTests/DataStructures/StaticRTreeTest.cpp b/UnitTests/data_structures/StaticRTreeTest.cpp similarity index 99% rename from UnitTests/DataStructures/StaticRTreeTest.cpp rename to UnitTests/data_structures/StaticRTreeTest.cpp index 254b08b0d..9654fb874 100644 --- a/UnitTests/DataStructures/StaticRTreeTest.cpp +++ b/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" diff --git a/Util/GraphLoader.h b/Util/GraphLoader.h index 44c466cc9..64ac5ec4a 100644 --- a/Util/GraphLoader.h +++ b/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" diff --git a/Util/FingerPrint.cpp.in b/Util/finger_print.cpp.in similarity index 100% rename from Util/FingerPrint.cpp.in rename to Util/finger_print.cpp.in diff --git a/Util/json_renderer.hpp b/Util/json_renderer.hpp index fa35bbf95..dd6089c8e 100644 --- a/Util/json_renderer.hpp +++ b/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 { diff --git a/Util/xml_renderer.hpp b/Util/xml_renderer.hpp index 6308a46a1..46e050115 100644 --- a/Util/xml_renderer.hpp +++ b/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 { diff --git a/algorithms/bfs_components.hpp b/algorithms/bfs_components.hpp index b48016af4..bdcbd5e43 100644 --- a/algorithms/bfs_components.hpp +++ b/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 #include diff --git a/algorithms/douglas_peucker.cpp b/algorithms/douglas_peucker.cpp index d64e22189..362f0a5a8 100644 --- a/algorithms/douglas_peucker.cpp +++ b/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 diff --git a/algorithms/polyline_compressor.cpp b/algorithms/polyline_compressor.cpp index 061103d3d..2f2972b15 100644 --- a/algorithms/polyline_compressor.cpp +++ b/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 diff --git a/algorithms/polyline_formatter.cpp b/algorithms/polyline_formatter.cpp index fd638c6a4..d72496ad6 100644 --- a/algorithms/polyline_formatter.cpp +++ b/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 diff --git a/algorithms/polyline_formatter.hpp b/algorithms/polyline_formatter.hpp index f2bd6591f..1d4744d0a 100644 --- a/algorithms/polyline_formatter.hpp +++ b/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 #include @@ -42,4 +42,4 @@ struct PolylineFormatter JSON::Array printUnencodedString(const std::vector &polyline) const; }; -#endif /* POLYLINE_FORMATTER_H_ */ +#endif /* POLYLINE_FORMATTER_HPP */ diff --git a/algorithms/tiny_components.hpp b/algorithms/tiny_components.hpp index 8e7b8f018..c7e93f1e5 100644 --- a/algorithms/tiny_components.hpp +++ b/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 */ diff --git a/benchmarks/static_rtree.cpp b/benchmarks/static_rtree.cpp index 72ba3f2ef..3d5c5f891 100644 --- a/benchmarks/static_rtree.cpp +++ b/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 diff --git a/cmake/FingerPrint-Config.cmake b/cmake/FingerPrint-Config.cmake index 7b45d5cfc..46df88a47 100644 --- a/cmake/FingerPrint-Config.cmake +++ b/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 ) diff --git a/contractor/contractor.hpp b/contractor/contractor.hpp index 257dae656..7457a98fe 100644 --- a/contractor/contractor.hpp +++ b/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" diff --git a/contractor/edge_based_graph_factory.cpp b/contractor/edge_based_graph_factory.cpp index 5915780b8..c9c911f8f 100644 --- a/contractor/edge_based_graph_factory.cpp +++ b/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" diff --git a/contractor/edge_based_graph_factory.hpp b/contractor/edge_based_graph_factory.hpp index 16f1b68b2..d811be56f 100644 --- a/contractor/edge_based_graph_factory.hpp +++ b/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 #include diff --git a/contractor/processing_chain.cpp b/contractor/processing_chain.cpp index 2f0accec4..8da5805c4 100644 --- a/contractor/processing_chain.cpp +++ b/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" diff --git a/contractor/processing_chain.hpp b/contractor/processing_chain.hpp index 3594bc17a..933213a4c 100644 --- a/contractor/processing_chain.hpp +++ b/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 diff --git a/DataStructures/Coordinate.cpp b/data_structures/Coordinate.cpp similarity index 100% rename from DataStructures/Coordinate.cpp rename to data_structures/Coordinate.cpp diff --git a/DataStructures/InputReaderFactory.h b/data_structures/InputReaderFactory.h similarity index 100% rename from DataStructures/InputReaderFactory.h rename to data_structures/InputReaderFactory.h diff --git a/DataStructures/BinaryHeap.h b/data_structures/binary_heap.hpp similarity index 99% rename from DataStructures/BinaryHeap.h rename to data_structures/binary_heap.hpp index 24a65cbf0..049f12fca 100644 --- a/DataStructures/BinaryHeap.h +++ b/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, diff --git a/DataStructures/ConcurrentQueue.h b/data_structures/concurrent_queue.hpp similarity index 95% rename from DataStructures/ConcurrentQueue.h rename to data_structures/concurrent_queue.hpp index a61503a6d..b3d4e1a2a 100644 --- a/DataStructures/ConcurrentQueue.h +++ b/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 #include @@ -80,4 +80,4 @@ template class ConcurrentQueue std::condition_variable m_not_full; }; -#endif // CONCURRENT_QUEUE_H +#endif // CONCURRENT_QUEUE_HPP diff --git a/DataStructures/DeallocatingVector.h b/data_structures/deallocating_vector.hpp similarity index 100% rename from DataStructures/DeallocatingVector.h rename to data_structures/deallocating_vector.hpp diff --git a/DataStructures/DynamicGraph.h b/data_structures/dynamic_graph.hpp similarity index 98% rename from DataStructures/DynamicGraph.h rename to data_structures/dynamic_graph.hpp index d9917407b..7244d1e9c 100644 --- a/DataStructures/DynamicGraph.h +++ b/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 @@ -292,4 +292,4 @@ template class DynamicGraph DeallocatingVector edge_list; }; -#endif // DYNAMICGRAPH_H +#endif // DYNAMICGRAPH_HPP diff --git a/DataStructures/EdgeBasedNode.h b/data_structures/edge_based_node.hpp similarity index 69% rename from DataStructures/EdgeBasedNode.h rename to data_structures/edge_based_node.hpp index e2ac9acab..1ec7cf5f2 100644 --- a/DataStructures/EdgeBasedNode.h +++ b/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 @@ -95,4 +122,4 @@ struct EdgeBasedNode TravelMode backward_travel_mode : 4; }; -#endif //EDGE_BASED_NODE_H +#endif //EDGE_BASED_NODE_HPP diff --git a/DataStructures/ExternalMemoryNode.cpp b/data_structures/external_memory_node.cpp similarity index 98% rename from DataStructures/ExternalMemoryNode.cpp rename to data_structures/external_memory_node.cpp index 5f22220fb..cd6271b1c 100644 --- a/DataStructures/ExternalMemoryNode.cpp +++ b/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 diff --git a/DataStructures/ExternalMemoryNode.h b/data_structures/external_memory_node.hpp similarity index 90% rename from DataStructures/ExternalMemoryNode.h rename to data_structures/external_memory_node.hpp index c65b40a1f..f88a23e7b 100644 --- a/DataStructures/ExternalMemoryNode.h +++ b/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 @@ -54,4 +54,4 @@ struct ExternalMemoryNodeSTXXLCompare value_type min_value(); }; -#endif /* EXTERNAL_MEMORY_NODE_H__ */ +#endif /* EXTERNAL_MEMORY_NODE_HPP_ */ diff --git a/DataStructures/FixedPointNumber.h b/data_structures/fixed_point_number.hpp similarity index 98% rename from DataStructures/FixedPointNumber.h rename to data_structures/fixed_point_number.hpp index 77de365aa..eab685026 100644 --- a/DataStructures/FixedPointNumber.h +++ b/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 #include @@ -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 diff --git a/DataStructures/HilbertValue.cpp b/data_structures/hilbert_value.cpp similarity index 97% rename from DataStructures/HilbertValue.cpp rename to data_structures/hilbert_value.cpp index 9cb88c79f..216b7c553 100644 --- a/DataStructures/HilbertValue.cpp +++ b/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 diff --git a/DataStructures/HilbertValue.h b/data_structures/hilbert_value.hpp similarity index 92% rename from DataStructures/HilbertValue.h rename to data_structures/hilbert_value.hpp index 9de23724f..e1940296e 100644 --- a/DataStructures/HilbertValue.h +++ b/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 @@ -46,4 +46,4 @@ class HilbertCode inline void TransposeCoordinate(uint32_t *X) const; }; -#endif /* HILBERTVALUE_H_ */ +#endif /* HILBERT_VALUE_HPP */ diff --git a/DataStructures/ImportEdge.cpp b/data_structures/import_edge.cpp similarity index 99% rename from DataStructures/ImportEdge.cpp rename to data_structures/import_edge.cpp index b59d6149c..55f5f161e 100644 --- a/DataStructures/ImportEdge.cpp +++ b/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 diff --git a/DataStructures/ImportEdge.h b/data_structures/import_edge.hpp similarity index 95% rename from DataStructures/ImportEdge.h rename to data_structures/import_edge.hpp index 4ccbee6d9..f9004d45a 100644 --- a/DataStructures/ImportEdge.h +++ b/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 */ diff --git a/DataStructures/JSONContainer.h b/data_structures/json_container.hpp similarity index 100% rename from DataStructures/JSONContainer.h rename to data_structures/json_container.hpp diff --git a/DataStructures/LRUCache.h b/data_structures/lru_cache.hpp similarity index 96% rename from DataStructures/LRUCache.h rename to data_structures/lru_cache.hpp index 75b9139d7..cdbeb389c 100644 --- a/DataStructures/LRUCache.h +++ b/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 #include @@ -94,4 +94,4 @@ template class LRUCache } unsigned Size() const { return itemsInCache.size(); } }; -#endif // LRUCACHE_H +#endif // LRUCACHE_HPP diff --git a/DataStructures/NodeBasedGraph.h b/data_structures/node_based_graph.hpp similarity index 85% rename from DataStructures/NodeBasedGraph.h rename to data_structures/node_based_graph.hpp index cceb4a078..8fe7b7550 100644 --- a/DataStructures/NodeBasedGraph.h +++ b/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 @@ -241,4 +268,4 @@ SimpleNodeBasedDynamicGraphFromEdges(int number_of_nodes, std::vector @@ -61,4 +61,4 @@ struct OriginalEdgeData TravelMode travel_mode; }; -#endif // ORIGINAL_EDGE_DATA_H +#endif // ORIGINAL_EDGE_DATA_HPP diff --git a/DataStructures/Percent.h b/data_structures/percent.hpp similarity index 96% rename from DataStructures/Percent.h rename to data_structures/percent.hpp index f201fc808..da44ef3ba 100644 --- a/DataStructures/Percent.h +++ b/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 #include @@ -98,4 +98,4 @@ class Percent } }; -#endif // PERCENT_H +#endif // PERCENT_HPP diff --git a/DataStructures/phantom_node.cpp b/data_structures/phantom_node.cpp similarity index 100% rename from DataStructures/phantom_node.cpp rename to data_structures/phantom_node.cpp diff --git a/DataStructures/phantom_node.hpp b/data_structures/phantom_node.hpp similarity index 98% rename from DataStructures/phantom_node.hpp rename to data_structures/phantom_node.hpp index 64d36d0a3..a85000074 100644 --- a/DataStructures/phantom_node.hpp +++ b/data_structures/phantom_node.hpp @@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define PHANTOM_NODES_H #include -#include "../DataStructures/TravelMode.h" +#include "../data_structures/travel_mode.hpp" #include "../typedefs.h" #include diff --git a/DataStructures/QueryEdge.h b/data_structures/query_edge.hpp similarity index 95% rename from DataStructures/QueryEdge.h rename to data_structures/query_edge.hpp index c9c71962c..84a7f1591 100644 --- a/DataStructures/QueryEdge.h +++ b/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_ */ diff --git a/DataStructures/QueryNode.h b/data_structures/query_node.hpp similarity index 95% rename from DataStructures/QueryNode.h rename to data_structures/query_node.hpp index 0d9c6ad9c..48bf2edf0 100644 --- a/DataStructures/QueryNode.h +++ b/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 diff --git a/DataStructures/RangeTable.h b/data_structures/range_table.hpp similarity index 83% rename from DataStructures/RangeTable.h rename to data_structures/range_table.hpp index 0c235b4ed..eef268b9d 100644 --- a/DataStructures/RangeTable.h +++ b/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 #include @@ -228,4 +255,4 @@ std::istream& operator>>(std::istream &in, RangeTable @@ -87,4 +87,4 @@ struct RawRouteData } }; -#endif // RAW_ROUTE_DATA_H +#endif // RAW_ROUTE_DATA_HPP diff --git a/DataStructures/Rectangle.h b/data_structures/rectangle.hpp similarity index 83% rename from DataStructures/Rectangle.h rename to data_structures/rectangle.hpp index 7cbd31504..2f6815cac 100644 --- a/DataStructures/Rectangle.h +++ b/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 diff --git a/DataStructures/Restriction.h b/data_structures/restriction.hpp similarity index 96% rename from DataStructures/Restriction.h rename to data_structures/restriction.hpp index c1cfc119f..5f6e9b0f5 100644 --- a/DataStructures/Restriction.h +++ b/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 diff --git a/DataStructures/restriction_map.cpp b/data_structures/restriction_map.cpp similarity index 99% rename from DataStructures/restriction_map.cpp rename to data_structures/restriction_map.cpp index 62e162cfd..5d414b6ae 100644 --- a/DataStructures/restriction_map.cpp +++ b/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 { diff --git a/DataStructures/restriction_map.hpp b/data_structures/restriction_map.hpp similarity index 96% rename from DataStructures/restriction_map.hpp rename to data_structures/restriction_map.hpp index 4b2cf53e1..6f72105ef 100644 --- a/DataStructures/restriction_map.hpp +++ b/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 -#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 m_no_turn_via_node_set; }; -#endif //RESTRICTION_MAP_H_ +#endif //RESTRICTION_MAP_HPP diff --git a/DataStructures/RouteParameters.cpp b/data_structures/route_parameters.cpp similarity index 100% rename from DataStructures/RouteParameters.cpp rename to data_structures/route_parameters.cpp diff --git a/DataStructures/SearchEngine.h b/data_structures/search_engine.hpp similarity index 92% rename from DataStructures/SearchEngine.h rename to data_structures/search_engine.hpp index 58f5e774d..0bdb443f4 100644 --- a/DataStructures/SearchEngine.h +++ b/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 SearchEngine ~SearchEngine() {} }; -#endif // SEARCHENGINE_H +#endif // SEARCH_ENGINE_HPP diff --git a/DataStructures/SearchEngineData.cpp b/data_structures/search_engine_data.cpp similarity index 97% rename from DataStructures/SearchEngineData.cpp rename to data_structures/search_engine_data.cpp index a5e4bfcd8..810762acd 100644 --- a/DataStructures/SearchEngineData.cpp +++ b/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) { diff --git a/DataStructures/SearchEngineData.h b/data_structures/search_engine_data.hpp similarity index 92% rename from DataStructures/SearchEngineData.h rename to data_structures/search_engine_data.hpp index d5bfb53f9..6c2efb1d6 100644 --- a/DataStructures/SearchEngineData.h +++ b/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 #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 diff --git a/DataStructures/segment_information.hpp b/data_structures/segment_information.hpp similarity index 95% rename from DataStructures/segment_information.hpp rename to data_structures/segment_information.hpp index 6e8d68397..dd1fc574b 100644 --- a/DataStructures/segment_information.hpp +++ b/data_structures/segment_information.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,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef SEGMENT_INFORMATION_H #define SEGMENT_INFORMATION_H -#include "TurnInstructions.h" +#include "turn_instructions.hpp" -#include "../DataStructures/TravelMode.h" +#include "../data_structures/travel_mode.hpp" #include "../typedefs.h" #include diff --git a/DataStructures/SharedMemoryFactory.h b/data_structures/shared_memory_factory.hpp similarity index 98% rename from DataStructures/SharedMemoryFactory.h rename to data_structures/shared_memory_factory.hpp index 0b1f0e1c5..583c2f409 100644 --- a/DataStructures/SharedMemoryFactory.h +++ b/data_structures/shared_memory_factory.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 SHARED_MEMORY_FACTORY_H -#define SHARED_MEMORY_FACTORY_H +#ifndef SHARED_MEMORY_FACTORY_HPP +#define SHARED_MEMORY_FACTORY_HPP #include "../Util/OSRMException.h" #include "../Util/simple_logger.hpp" @@ -368,4 +368,4 @@ template class SharedMemoryFactory_tmpl using SharedMemoryFactory = SharedMemoryFactory_tmpl<>; -#endif /* SHARED_MEMORY_POINTER_FACTORY_H */ +#endif // SHARED_MEMORY_FACTORY_HPP diff --git a/DataStructures/SharedMemoryVectorWrapper.h b/data_structures/shared_memory_vector_wrapper.hpp similarity index 96% rename from DataStructures/SharedMemoryVectorWrapper.h rename to data_structures/shared_memory_vector_wrapper.hpp index bcc30a7f2..d508e5f56 100644 --- a/DataStructures/SharedMemoryVectorWrapper.h +++ b/data_structures/shared_memory_vector_wrapper.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 SHARED_MEMORY_VECTOR_WRAPPER_H -#define SHARED_MEMORY_VECTOR_WRAPPER_H +#ifndef SHARED_MEMORY_VECTOR_WRAPPER_HPP +#define SHARED_MEMORY_VECTOR_WRAPPER_HPP #include @@ -151,4 +151,4 @@ template struct ShM std::vector>::type; }; -#endif // SHARED_MEMORY_VECTOR_WRAPPER_H +#endif // SHARED_MEMORY_VECTOR_WRAPPER_HPP diff --git a/DataStructures/StaticGraph.h b/data_structures/static_graph.hpp similarity index 97% rename from DataStructures/StaticGraph.h rename to data_structures/static_graph.hpp index d57d0b2ee..a0f748636 100644 --- a/DataStructures/StaticGraph.h +++ b/data_structures/static_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,11 +25,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef STATIC_GRAPH_H -#define STATIC_GRAPH_H +#ifndef STATIC_GRAPH_HPP +#define STATIC_GRAPH_HPP -#include "Percent.h" -#include "SharedMemoryVectorWrapper.h" +#include "percent.hpp" +#include "shared_memory_vector_wrapper.hpp" #include "../Util/integer_range.hpp" #include "../typedefs.h" @@ -201,4 +201,4 @@ template class StaticGraph typename ShM::vector edge_array; }; -#endif // STATIC_GRAPH_H +#endif // STATIC_GRAPH_HPP diff --git a/DataStructures/StaticKDTree.h b/data_structures/static_kdtree.hpp similarity index 98% rename from DataStructures/StaticKDTree.h rename to data_structures/static_kdtree.hpp index 4e9388447..b173d3a02 100644 --- a/DataStructures/StaticKDTree.h +++ b/data_structures/static_kdtree.hpp @@ -27,8 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // KD Tree coded by Christian Vetter, Monav Project -#ifndef STATICKDTREE_H_INCLUDED -#define STATICKDTREE_H_INCLUDED +#ifndef STATICKDTREE_HPP +#define STATICKDTREE_HPP #include #include @@ -257,4 +257,4 @@ class StaticKDTree }; } -#endif // STATICKDTREE_H_INCLUDED +#endif // STATICKDTREE_HPP diff --git a/DataStructures/StaticRTree.h b/data_structures/static_rtree.hpp similarity index 99% rename from DataStructures/StaticRTree.h rename to data_structures/static_rtree.hpp index be16ef148..be38dcce2 100644 --- a/DataStructures/StaticRTree.h +++ b/data_structures/static_rtree.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,16 +25,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef STATICRTREE_H -#define STATICRTREE_H +#ifndef STATIC_RTREE_HPP +#define STATIC_RTREE_HPP -#include "DeallocatingVector.h" -#include "HilbertValue.h" +#include "deallocating_vector.hpp" +#include "hilbert_value.hpp" #include "phantom_node.hpp" -#include "QueryNode.h" -#include "Rectangle.h" -#include "SharedMemoryFactory.h" -#include "SharedMemoryVectorWrapper.h" +#include "query_node.hpp" +#include "rectangle.hpp" +#include "shared_memory_factory.hpp" +#include "shared_memory_vector_wrapper.hpp" #include "../Util/floating_point.hpp" #include "../Util/MercatorUtil.h" @@ -1241,4 +1241,4 @@ class StaticRTree //[2] "Nearest Neighbor Queries", N. Roussopulos et al; 1995; DOI: 10.1145/223784.223794 //[3] "Distance Browsing in Spatial Databases"; G. Hjaltason, H. Samet; 1999; ACM Trans. DB Sys // Vol.24 No.2, pp.265-318 -#endif // STATICRTREE_H +#endif // STATIC_RTREE_HPP diff --git a/DataStructures/TravelMode.h b/data_structures/travel_mode.hpp similarity index 90% rename from DataStructures/TravelMode.h rename to data_structures/travel_mode.hpp index 7ccc24d21..345ec90e3 100644 --- a/DataStructures/TravelMode.h +++ b/data_structures/travel_mode.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,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TRAVEL_MODE_H -#define TRAVEL_MODE_H +#ifndef TRAVEL_MODE_HPP +#define TRAVEL_MODE_HPP +namespace { using TravelMode = unsigned char; static const TravelMode TRAVEL_MODE_INACCESSIBLE = 0; static const TravelMode TRAVEL_MODE_DEFAULT = 1; - -#endif /* TRAVEL_MODE_H */ +} +#endif /* TRAVEL_MODE_HPP */ diff --git a/DataStructures/TurnInstructions.h b/data_structures/turn_instructions.hpp similarity index 95% rename from DataStructures/TurnInstructions.h rename to data_structures/turn_instructions.hpp index 611b574dd..4b36658b3 100644 --- a/DataStructures/TurnInstructions.h +++ b/data_structures/turn_instructions.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 TURN_INSTRUCTIONS_H -#define TURN_INSTRUCTIONS_H +#ifndef TURN_INSTRUCTIONS_HPP +#define TURN_INSTRUCTIONS_HPP enum class TurnInstruction : unsigned char { @@ -87,4 +87,4 @@ struct TurnInstructionsClass } }; -#endif /* TURN_INSTRUCTIONS_H */ +#endif /* TURN_INSTRUCTIONS_HPP */ diff --git a/DataStructures/XORFastHash.h b/data_structures/xor_fast_hash.hpp similarity index 97% rename from DataStructures/XORFastHash.h rename to data_structures/xor_fast_hash.hpp index aba6ef40a..1f6dc29bb 100644 --- a/DataStructures/XORFastHash.h +++ b/data_structures/xor_fast_hash.hpp @@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef XOR_FAST_HASH_H -#define XOR_FAST_HASH_H +#ifndef XOR_FAST_HASH_HPP +#define XOR_FAST_HASH_HPP #include #include @@ -112,4 +112,4 @@ class XORMiniHash } }; -#endif // XOR_FAST_HASH_H +#endif // XOR_FAST_HASH_HPP diff --git a/DataStructures/XORFastHashStorage.h b/data_structures/xor_fast_hash_storage.hpp similarity index 95% rename from DataStructures/XORFastHashStorage.h rename to data_structures/xor_fast_hash_storage.hpp index 18de3c52c..1d84260c2 100644 --- a/DataStructures/XORFastHashStorage.h +++ b/data_structures/xor_fast_hash_storage.hpp @@ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef XOR_FAST_HASH_STORAGE_H -#define XOR_FAST_HASH_STORAGE_H +#ifndef XOR_FAST_HASH_STORAGE_HPP +#define XOR_FAST_HASH_STORAGE_HPP -#include "XORFastHash.h" +#include "xor_fast_hash.hpp" #include #include @@ -86,4 +86,4 @@ template class XORFastHashStorage unsigned current_timestamp; }; -#endif // XOR_FAST_HASH_STORAGE_H +#endif // XOR_FAST_HASH_STORAGE_HPP diff --git a/datastore.cpp b/datastore.cpp index 7a376b4ff..c7f0769e3 100644 --- a/datastore.cpp +++ b/datastore.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,14 +25,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "DataStructures/OriginalEdgeData.h" -#include "DataStructures/RangeTable.h" -#include "DataStructures/QueryEdge.h" -#include "DataStructures/SharedMemoryFactory.h" -#include "DataStructures/SharedMemoryVectorWrapper.h" -#include "DataStructures/StaticGraph.h" -#include "DataStructures/StaticRTree.h" -#include "DataStructures/TurnInstructions.h" +#include "data_structures/original_edge_data.hpp" +#include "data_structures/range_table.hpp" +#include "data_structures/query_edge.hpp" +#include "data_structures/shared_memory_factory.hpp" +#include "data_structures/shared_memory_vector_wrapper.hpp" +#include "data_structures/static_graph.hpp" +#include "data_structures/static_rtree.hpp" +#include "data_structures/turn_instructions.hpp" #include "Server/DataStructures/BaseDataFacade.h" #include "Server/DataStructures/SharedDataType.h" #include "Server/DataStructures/SharedBarriers.h"