From 3bd27ae8c5b217eeed5c1fd726435efd9b1875a6 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Thu, 19 Feb 2015 09:19:51 +0100 Subject: [PATCH] change copyright line from personal names to project --- Gemfile | 2 +- LICENCE.TXT | 2 +- algorithms/bfs_components.hpp | 8 +- algorithms/crc32_processor.hpp | 2 +- algorithms/douglas_peucker.cpp | 2 +- algorithms/douglas_peucker.hpp | 5 +- algorithms/object_encoder.hpp | 2 +- algorithms/polyline_compressor.cpp | 2 +- algorithms/polyline_compressor.hpp | 2 +- algorithms/polyline_formatter.cpp | 2 +- algorithms/polyline_formatter.hpp | 2 +- algorithms/route_name_extraction.hpp | 51 ++++++------ algorithms/tiny_components.hpp | 2 +- benchmarks/static_rtree.cpp | 2 +- data_structures/binary_heap.hpp | 2 +- data_structures/concurrent_queue.hpp | 16 ++-- data_structures/coordinate.cpp | 2 +- data_structures/coordinate_calculation.cpp | 2 +- data_structures/coordinate_calculation.hpp | 2 +- data_structures/deallocating_vector.hpp | 2 +- data_structures/dynamic_graph.hpp | 2 +- data_structures/edge_based_node.hpp | 2 +- data_structures/external_memory_node.cpp | 9 +-- data_structures/external_memory_node.hpp | 2 +- data_structures/fixed_point_number.hpp | 2 +- data_structures/hilbert_value.cpp | 2 +- data_structures/hilbert_value.hpp | 2 +- data_structures/import_edge.cpp | 6 +- data_structures/import_edge.hpp | 2 +- data_structures/internal_route_result.hpp | 17 ++-- data_structures/lru_cache.hpp | 2 +- data_structures/node_based_graph.hpp | 2 +- data_structures/node_id.hpp | 2 +- data_structures/original_edge_data.hpp | 7 +- data_structures/percent.hpp | 4 +- data_structures/phantom_node.cpp | 2 +- data_structures/phantom_node.hpp | 2 +- data_structures/query_edge.hpp | 2 +- data_structures/query_node.hpp | 4 +- data_structures/range_table.hpp | 2 +- data_structures/rectangle.hpp | 2 +- data_structures/restriction.hpp | 8 +- data_structures/restriction_map.cpp | 77 +++++++++---------- data_structures/restriction_map.hpp | 2 +- data_structures/route_parameters.cpp | 6 +- data_structures/search_engine.hpp | 5 +- data_structures/search_engine_data.cpp | 2 +- data_structures/search_engine_data.hpp | 2 +- data_structures/segment_information.hpp | 2 +- data_structures/shared_memory_factory.hpp | 2 +- .../shared_memory_vector_wrapper.hpp | 6 +- data_structures/static_graph.hpp | 2 +- data_structures/static_kdtree.hpp | 6 +- data_structures/static_rtree.hpp | 2 +- data_structures/travel_mode.hpp | 5 +- data_structures/tribool.hpp | 2 +- data_structures/turn_instructions.hpp | 29 +++++-- data_structures/upper_bound.hpp | 2 +- data_structures/xor_fast_hash.hpp | 2 +- data_structures/xor_fast_hash_storage.hpp | 2 +- datastore.cpp | 3 +- descriptors/description_factory.cpp | 2 +- descriptors/description_factory.hpp | 2 +- descriptors/descriptor_base.hpp | 2 +- descriptors/gpx_descriptor.hpp | 2 +- descriptors/json_descriptor.hpp | 2 +- extract.cpp | 2 +- extractor/extraction_containers.cpp | 2 +- extractor/extraction_containers.hpp | 2 +- extractor/extraction_helper_functions.hpp | 2 +- extractor/extraction_node.hpp | 2 +- extractor/extraction_way.hpp | 2 +- extractor/extractor.cpp | 2 +- extractor/extractor.hpp | 2 +- extractor/extractor_callbacks.cpp | 2 +- extractor/extractor_callbacks.hpp | 2 +- extractor/extractor_options.cpp | 2 +- extractor/extractor_options.hpp | 2 +- extractor/first_and_last_segment_of_way.hpp | 2 +- extractor/internal_extractor_edge.hpp | 2 +- extractor/restriction_parser.cpp | 2 +- extractor/restriction_parser.hpp | 2 +- extractor/scripting_environment.cpp | 2 +- extractor/scripting_environment.hpp | 2 +- include/osrm/coordinate.hpp | 2 +- include/osrm/json_container.hpp | 2 +- include/osrm/libosrm_config.hpp | 2 +- include/osrm/route_parameters.hpp | 2 +- include/osrm/server_paths.hpp | 2 +- library/osrm.hpp | 2 +- library/osrm_impl.cpp | 2 +- library/osrm_impl.hpp | 2 +- plugins/distance_table.hpp | 2 +- plugins/hello_world.hpp | 2 +- plugins/locate.hpp | 2 +- plugins/nearest.hpp | 2 +- plugins/plugin_base.hpp | 2 +- plugins/timestamp.hpp | 2 +- plugins/viaroute.hpp | 2 +- prepare.cpp | 2 +- routed.cpp | 2 +- routing_algorithms/alternative_path.hpp | 2 +- routing_algorithms/many_to_many.hpp | 20 +++-- routing_algorithms/routing_base.hpp | 2 +- routing_algorithms/shortest_path.hpp | 2 +- server/api_grammar.hpp | 2 +- server/connection.cpp | 4 +- server/connection.hpp | 2 +- server/data_structures/datafacade_base.hpp | 2 +- .../data_structures/internal_datafacade.hpp | 2 +- server/data_structures/shared_barriers.hpp | 2 +- server/data_structures/shared_datafacade.hpp | 2 +- server/data_structures/shared_datatype.hpp | 2 +- server/http/compression_type.hpp | 2 +- server/http/header.hpp | 2 +- server/http/reply.cpp | 2 +- server/http/reply.hpp | 2 +- server/http/request.hpp | 2 +- server/request_handler.cpp | 2 +- server/request_handler.hpp | 2 +- server/request_parser.cpp | 2 +- server/request_parser.hpp | 2 +- server/server.hpp | 2 +- tools/check-hsgr.cpp | 2 +- tools/components.cpp | 2 +- tools/io-benchmark.cpp | 2 +- tools/simpleclient.cpp | 2 +- tools/springclean.cpp | 2 +- tools/unlock_all_mutexes.cpp | 2 +- unit_tests/algorithm_tests.cpp | 3 +- unit_tests/algorithms/douglas_peucker.cpp | 33 ++++---- unit_tests/data_structures/binary_heap.cpp | 2 +- unit_tests/data_structures/coordinate.cpp | 2 +- unit_tests/data_structures/range_table.cpp | 7 +- unit_tests/data_structures/static_graph.cpp | 2 +- unit_tests/data_structures/static_rtree.cpp | 2 +- unit_tests/datastructure_tests.cpp | 2 +- util/bearing.cpp | 2 +- util/bearing.hpp | 2 +- util/boost_filesystem_2_fix.hpp | 2 +- util/cast.hpp | 2 +- util/compute_angle.cpp | 2 +- util/compute_angle.hpp | 2 +- util/container.hpp | 2 +- util/datastore_options.hpp | 2 +- util/fingerprint.hpp | 2 +- util/floating_point.hpp | 2 +- util/git_sha.cpp.in | 2 +- util/git_sha.hpp | 2 +- util/graph_loader.hpp | 2 +- util/ini_file.hpp | 2 +- util/integer_range.hpp | 2 +- util/iterator_range.hpp | 2 +- util/json_renderer.hpp | 2 +- util/lua_util.hpp | 2 +- util/make_unique.hpp | 2 +- util/mercator.cpp | 2 +- util/mercator.hpp | 2 +- util/osrm_exception.cpp | 2 +- util/osrm_exception.hpp | 2 +- util/routed_options.hpp | 2 +- util/simple_logger.cpp | 11 ++- util/simple_logger.hpp | 2 +- util/std_hash.hpp | 2 +- util/string_util.hpp | 2 +- util/timing_util.hpp | 2 +- util/trigonometry_table.hpp | 2 +- util/xml_renderer.hpp | 2 +- 168 files changed, 314 insertions(+), 322 deletions(-) diff --git a/Gemfile b/Gemfile index 114808e49..31d044bd6 100644 --- a/Gemfile +++ b/Gemfile @@ -4,4 +4,4 @@ gem "cucumber" gem "rake" gem "osmlib-base" gem "sys-proctable" -gem "rspec-expectations" \ No newline at end of file +gem "rspec-expectations" diff --git a/LICENCE.TXT b/LICENCE.TXT index 28fe97b35..c77e5cd1b 100644 --- a/LICENCE.TXT +++ b/LICENCE.TXT @@ -1,4 +1,4 @@ -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/algorithms/bfs_components.hpp b/algorithms/bfs_components.hpp index 57be63553..b3f536401 100644 --- a/algorithms/bfs_components.hpp +++ b/algorithms/bfs_components.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -95,8 +95,8 @@ template class BFSComponentExplorer * Explores the current component that starts at node using BFS. */ unsigned ExploreComponent(std::queue> &bfs_queue, - NodeID node, - unsigned current_component) + NodeID node, + unsigned current_component) { /* Graphical representation of variables: @@ -118,7 +118,7 @@ template class BFSComponentExplorer std::pair current_queue_item = bfs_queue.front(); bfs_queue.pop(); - const NodeID v = current_queue_item.first; // current node + const NodeID v = current_queue_item.first; // current node const NodeID u = current_queue_item.second; // parent // increment size counter of current component ++current_component_size; diff --git a/algorithms/crc32_processor.hpp b/algorithms/crc32_processor.hpp index 2a9d6ad6b..b9444e7b6 100644 --- a/algorithms/crc32_processor.hpp +++ b/algorithms/crc32_processor.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/algorithms/douglas_peucker.cpp b/algorithms/douglas_peucker.cpp index e94912482..fa7d7826b 100644 --- a/algorithms/douglas_peucker.cpp +++ b/algorithms/douglas_peucker.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/algorithms/douglas_peucker.hpp b/algorithms/douglas_peucker.hpp index 7c5f8c1e8..da02982f3 100644 --- a/algorithms/douglas_peucker.hpp +++ b/algorithms/douglas_peucker.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -35,7 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include - /* This class object computes the bitvector of indicating generalized input * points according to the (Ramer-)Douglas-Peucker algorithm. * @@ -43,7 +42,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * bit indicating if the points is present in the generalization. * Note: points may also be pre-selected*/ -static const std::array DOUGLAS_PEUCKER_THRESHOLDS {{ +static const std::array DOUGLAS_PEUCKER_THRESHOLDS{{ 512440, // z0 256720, // z1 122560, // z2 diff --git a/algorithms/object_encoder.hpp b/algorithms/object_encoder.hpp index c7f6f1fab..e880496a2 100644 --- a/algorithms/object_encoder.hpp +++ b/algorithms/object_encoder.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/algorithms/polyline_compressor.cpp b/algorithms/polyline_compressor.cpp index 7886de91c..6310a2ec9 100644 --- a/algorithms/polyline_compressor.cpp +++ b/algorithms/polyline_compressor.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/algorithms/polyline_compressor.hpp b/algorithms/polyline_compressor.hpp index 8bff4a040..933ac7afa 100644 --- a/algorithms/polyline_compressor.hpp +++ b/algorithms/polyline_compressor.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/algorithms/polyline_formatter.cpp b/algorithms/polyline_formatter.cpp index b5dad6c78..670a6121f 100644 --- a/algorithms/polyline_formatter.cpp +++ b/algorithms/polyline_formatter.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/algorithms/polyline_formatter.hpp b/algorithms/polyline_formatter.hpp index 181a0cf15..68cc70293 100644 --- a/algorithms/polyline_formatter.hpp +++ b/algorithms/polyline_formatter.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/algorithms/route_name_extraction.hpp b/algorithms/route_name_extraction.hpp index 519452f98..8275de099 100644 --- a/algorithms/route_name_extraction.hpp +++ b/algorithms/route_name_extraction.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -54,7 +54,8 @@ template struct ExtractRouteNames for (const SegmentT &segment : segment_list) { - if (segment.name_id != blocked_name_id && segment.length > result_segment.length && segment.name_id != 0) + if (segment.name_id != blocked_name_id && segment.length > result_segment.length && + segment.name_id != 0) { result_segment = segment; } @@ -73,9 +74,13 @@ template struct ExtractRouteNames SegmentT alternative_segment_1, alternative_segment_2; auto length_comperator = [](const SegmentT &a, const SegmentT &b) - { return a.length > b.length; }; + { + return a.length > b.length; + }; auto name_id_comperator = [](const SegmentT &a, const SegmentT &b) - { return a.name_id < b.name_id; }; + { + return a.name_id < b.name_id; + }; if (shortest_path_segments.empty()) { @@ -87,8 +92,7 @@ template struct ExtractRouteNames shortest_segment_1 = shortest_path_segments[0]; if (!alternative_path_segments.empty()) { - std::sort(alternative_path_segments.begin(), - alternative_path_segments.end(), + std::sort(alternative_path_segments.begin(), alternative_path_segments.end(), length_comperator); // also pick the longest segment for the alternative path @@ -99,16 +103,13 @@ template struct ExtractRouteNames // alternative std::vector shortest_path_set_difference(shortest_path_segments.size()); std::sort(shortest_path_segments.begin(), shortest_path_segments.end(), name_id_comperator); - std::sort(alternative_path_segments.begin(), alternative_path_segments.end(), name_id_comperator); - std::set_difference(shortest_path_segments.begin(), - shortest_path_segments.end(), - alternative_path_segments.begin(), - alternative_path_segments.end(), - shortest_path_set_difference.begin(), - name_id_comperator); + std::sort(alternative_path_segments.begin(), alternative_path_segments.end(), + name_id_comperator); + std::set_difference(shortest_path_segments.begin(), shortest_path_segments.end(), + alternative_path_segments.begin(), alternative_path_segments.end(), + shortest_path_set_difference.begin(), name_id_comperator); - std::sort(shortest_path_set_difference.begin(), - shortest_path_set_difference.end(), + std::sort(shortest_path_set_difference.begin(), shortest_path_set_difference.end(), length_comperator); shortest_segment_2 = PickNextLongestSegment(shortest_path_set_difference, shortest_segment_1.name_id); @@ -116,29 +117,23 @@ template struct ExtractRouteNames // compute the set difference (for alternative path) depending on names between shortest and // alternative // vectors are still sorted, no need to do again - BOOST_ASSERT(std::is_sorted(shortest_path_segments.begin(), - shortest_path_segments.end(), + BOOST_ASSERT(std::is_sorted(shortest_path_segments.begin(), shortest_path_segments.end(), name_id_comperator)); BOOST_ASSERT(std::is_sorted(alternative_path_segments.begin(), - alternative_path_segments.end(), - name_id_comperator)); + alternative_path_segments.end(), name_id_comperator)); std::vector alternative_path_set_difference(alternative_path_segments.size()); - std::set_difference(alternative_path_segments.begin(), - alternative_path_segments.end(), - shortest_path_segments.begin(), - shortest_path_segments.end(), - alternative_path_set_difference.begin(), - name_id_comperator); + std::set_difference(alternative_path_segments.begin(), alternative_path_segments.end(), + shortest_path_segments.begin(), shortest_path_segments.end(), + alternative_path_set_difference.begin(), name_id_comperator); - std::sort(alternative_path_set_difference.begin(), - alternative_path_set_difference.end(), + std::sort(alternative_path_set_difference.begin(), alternative_path_set_difference.end(), length_comperator); if (!alternative_path_segments.empty()) { alternative_segment_2 = PickNextLongestSegment(alternative_path_set_difference, - alternative_segment_1.name_id); + alternative_segment_1.name_id); } // move the segments into the order in which they occur. diff --git a/algorithms/tiny_components.hpp b/algorithms/tiny_components.hpp index b595ac427..f3ca3c412 100644 --- a/algorithms/tiny_components.hpp +++ b/algorithms/tiny_components.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/benchmarks/static_rtree.cpp b/benchmarks/static_rtree.cpp index 7d2ae9f55..9d883311b 100644 --- a/benchmarks/static_rtree.cpp +++ b/benchmarks/static_rtree.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/binary_heap.hpp b/data_structures/binary_heap.hpp index 3a2796d7c..a23a6b0f5 100644 --- a/data_structures/binary_heap.hpp +++ b/data_structures/binary_heap.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/concurrent_queue.hpp b/data_structures/concurrent_queue.hpp index b3d4e1a2a..7341a8cc4 100644 --- a/data_structures/concurrent_queue.hpp +++ b/data_structures/concurrent_queue.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -40,9 +40,10 @@ template class ConcurrentQueue inline void push(const Data &data) { std::unique_lock lock(m_mutex); - m_not_full.wait(lock, - [this] - { return m_internal_queue.size() < m_internal_queue.capacity(); }); + m_not_full.wait(lock, [this] + { + return m_internal_queue.size() < m_internal_queue.capacity(); + }); m_internal_queue.push_back(data); m_not_empty.notify_one(); } @@ -52,9 +53,10 @@ template class ConcurrentQueue inline void wait_and_pop(Data &popped_value) { std::unique_lock lock(m_mutex); - m_not_empty.wait(lock, - [this] - { return !m_internal_queue.empty(); }); + m_not_empty.wait(lock, [this] + { + return !m_internal_queue.empty(); + }); popped_value = m_internal_queue.front(); m_internal_queue.pop_front(); m_not_full.notify_one(); diff --git a/data_structures/coordinate.cpp b/data_structures/coordinate.cpp index 29151cf4c..df3abe44a 100644 --- a/data_structures/coordinate.cpp +++ b/data_structures/coordinate.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/coordinate_calculation.cpp b/data_structures/coordinate_calculation.cpp index 69e2ead17..0c44989b4 100644 --- a/data_structures/coordinate_calculation.cpp +++ b/data_structures/coordinate_calculation.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/coordinate_calculation.hpp b/data_structures/coordinate_calculation.hpp index 9dbaa646b..73183dfa4 100644 --- a/data_structures/coordinate_calculation.hpp +++ b/data_structures/coordinate_calculation.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/deallocating_vector.hpp b/data_structures/deallocating_vector.hpp index 968528f3c..de5a24d85 100644 --- a/data_structures/deallocating_vector.hpp +++ b/data_structures/deallocating_vector.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/dynamic_graph.hpp b/data_structures/dynamic_graph.hpp index abaa05717..498f94a7c 100644 --- a/data_structures/dynamic_graph.hpp +++ b/data_structures/dynamic_graph.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/edge_based_node.hpp b/data_structures/edge_based_node.hpp index b5bc7b176..72a585a13 100644 --- a/data_structures/edge_based_node.hpp +++ b/data_structures/edge_based_node.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/external_memory_node.cpp b/data_structures/external_memory_node.cpp index 3ede2c5a0..72b8198f9 100644 --- a/data_structures/external_memory_node.cpp +++ b/data_structures/external_memory_node.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -45,11 +45,8 @@ ExternalMemoryNode ExternalMemoryNode::min_value() ExternalMemoryNode ExternalMemoryNode::max_value() { - return ExternalMemoryNode(std::numeric_limits::max(), - std::numeric_limits::max(), - std::numeric_limits::max(), - false, - false); + return ExternalMemoryNode(std::numeric_limits::max(), std::numeric_limits::max(), + std::numeric_limits::max(), false, false); } bool ExternalMemoryNodeSTXXLCompare::operator()(const ExternalMemoryNode &left, diff --git a/data_structures/external_memory_node.hpp b/data_structures/external_memory_node.hpp index 4ac6b9237..83b88e759 100644 --- a/data_structures/external_memory_node.hpp +++ b/data_structures/external_memory_node.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/fixed_point_number.hpp b/data_structures/fixed_point_number.hpp index eab685026..c7ed257e5 100644 --- a/data_structures/fixed_point_number.hpp +++ b/data_structures/fixed_point_number.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/hilbert_value.cpp b/data_structures/hilbert_value.cpp index 8487fac11..c09773118 100644 --- a/data_structures/hilbert_value.cpp +++ b/data_structures/hilbert_value.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/hilbert_value.hpp b/data_structures/hilbert_value.hpp index e1940296e..7b8bffa93 100644 --- a/data_structures/hilbert_value.hpp +++ b/data_structures/hilbert_value.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/import_edge.cpp b/data_structures/import_edge.cpp index 098adb32a..f41b066b1 100644 --- a/data_structures/import_edge.cpp +++ b/data_structures/import_edge.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -58,8 +58,8 @@ NodeBasedEdge::NodeBasedEdge(NodeID source, bool access_restricted, TravelMode travel_mode, bool is_split) - : source(source), target(target), name_id(name_id), weight(weight), - forward(forward), backward(backward), roundabout(roundabout), in_tiny_cc(in_tiny_cc), + : source(source), target(target), name_id(name_id), weight(weight), forward(forward), + backward(backward), roundabout(roundabout), in_tiny_cc(in_tiny_cc), access_restricted(access_restricted), is_split(is_split), travel_mode(travel_mode) { } diff --git a/data_structures/import_edge.hpp b/data_structures/import_edge.hpp index f9004d45a..f422de116 100644 --- a/data_structures/import_edge.hpp +++ b/data_structures/import_edge.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/internal_route_result.hpp b/data_structures/internal_route_result.hpp index 629e50d8a..068b63a80 100644 --- a/data_structures/internal_route_result.hpp +++ b/data_structures/internal_route_result.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -40,10 +40,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. struct PathData { PathData() - : node(SPECIAL_NODEID), name_id(INVALID_EDGE_WEIGHT), - segment_duration(INVALID_EDGE_WEIGHT), - turn_instruction(TurnInstruction::NoTurn), - travel_mode(TRAVEL_MODE_INACCESSIBLE) + : node(SPECIAL_NODEID), name_id(INVALID_EDGE_WEIGHT), segment_duration(INVALID_EDGE_WEIGHT), + turn_instruction(TurnInstruction::NoTurn), travel_mode(TRAVEL_MODE_INACCESSIBLE) { } @@ -52,8 +50,8 @@ struct PathData TurnInstruction turn_instruction, EdgeWeight segment_duration, TravelMode travel_mode) - : node(node), name_id(name_id), segment_duration(segment_duration), turn_instruction(turn_instruction), - travel_mode(travel_mode) + : node(node), name_id(name_id), segment_duration(segment_duration), + turn_instruction(turn_instruction), travel_mode(travel_mode) { } NodeID node; @@ -80,9 +78,8 @@ struct InternalRouteResult return (leg != unpacked_path_segments.size() - 1); } - InternalRouteResult() : - shortest_path_length(INVALID_EDGE_WEIGHT), - alternative_path_length(INVALID_EDGE_WEIGHT) + InternalRouteResult() + : shortest_path_length(INVALID_EDGE_WEIGHT), alternative_path_length(INVALID_EDGE_WEIGHT) { } }; diff --git a/data_structures/lru_cache.hpp b/data_structures/lru_cache.hpp index b7296eeb6..155ab1ef4 100644 --- a/data_structures/lru_cache.hpp +++ b/data_structures/lru_cache.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/node_based_graph.hpp b/data_structures/node_based_graph.hpp index 82eb59bd5..54e07a7ec 100644 --- a/data_structures/node_based_graph.hpp +++ b/data_structures/node_based_graph.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/node_id.hpp b/data_structures/node_id.hpp index 4f0780965..4d6fff0b2 100644 --- a/data_structures/node_id.hpp +++ b/data_structures/node_id.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/original_edge_data.hpp b/data_structures/original_edge_data.hpp index b4fdfd97f..cbbc1b276 100644 --- a/data_structures/original_edge_data.hpp +++ b/data_structures/original_edge_data.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -48,9 +48,8 @@ struct OriginalEdgeData OriginalEdgeData() : via_node(std::numeric_limits::max()), - name_id(std::numeric_limits::max()), - turn_instruction(TurnInstruction::NoTurn), compressed_geometry(false), - travel_mode(TRAVEL_MODE_INACCESSIBLE) + name_id(std::numeric_limits::max()), turn_instruction(TurnInstruction::NoTurn), + compressed_geometry(false), travel_mode(TRAVEL_MODE_INACCESSIBLE) { } diff --git a/data_structures/percent.hpp b/data_structures/percent.hpp index 0c4e15246..392417e76 100644 --- a/data_structures/percent.hpp +++ b/data_structures/percent.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -36,7 +36,7 @@ class Percent public: explicit Percent(unsigned max_value, unsigned step = 5) { reinit(max_value, step); } - // Reinitializes + // Reinitializes void reinit(unsigned max_value, unsigned step = 5) { m_max_value = max_value; diff --git a/data_structures/phantom_node.cpp b/data_structures/phantom_node.cpp index 9a0988564..eba6492cd 100644 --- a/data_structures/phantom_node.cpp +++ b/data_structures/phantom_node.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/phantom_node.hpp b/data_structures/phantom_node.hpp index d22cb9504..b048eb7f2 100644 --- a/data_structures/phantom_node.hpp +++ b/data_structures/phantom_node.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/query_edge.hpp b/data_structures/query_edge.hpp index 84a7f1591..0d51aac3f 100644 --- a/data_structures/query_edge.hpp +++ b/data_structures/query_edge.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/query_node.hpp b/data_structures/query_node.hpp index 18808fd95..f3e990476 100644 --- a/data_structures/query_node.hpp +++ b/data_structures/query_node.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -39,7 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. struct QueryNode { using key_type = NodeID; // type of NodeID - using value_type = int; // type of lat,lons + using value_type = int; // type of lat,lons explicit QueryNode(int lat, int lon, NodeID node_id) : lat(lat), lon(lon), node_id(node_id) {} QueryNode() diff --git a/data_structures/range_table.hpp b/data_structures/range_table.hpp index ec0167231..4662f06c0 100644 --- a/data_structures/range_table.hpp +++ b/data_structures/range_table.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/rectangle.hpp b/data_structures/rectangle.hpp index c36074dbd..55720a37d 100644 --- a/data_structures/rectangle.hpp +++ b/data_structures/rectangle.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/restriction.hpp b/data_structures/restriction.hpp index ed38dc639..f278bd8d2 100644 --- a/data_structures/restriction.hpp +++ b/data_structures/restriction.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -108,8 +108,7 @@ struct InputRestrictionContainer struct CmpRestrictionContainerByFrom { typedef InputRestrictionContainer value_type; - bool operator()(const InputRestrictionContainer &a, - const InputRestrictionContainer &b) const + bool operator()(const InputRestrictionContainer &a, const InputRestrictionContainer &b) const { return a.restriction.from.way < b.restriction.from.way; } @@ -120,8 +119,7 @@ struct CmpRestrictionContainerByFrom struct CmpRestrictionContainerByTo { typedef InputRestrictionContainer value_type; - bool operator()(const InputRestrictionContainer &a, - const InputRestrictionContainer &b) const + bool operator()(const InputRestrictionContainer &a, const InputRestrictionContainer &b) const { return a.restriction.to.way < b.restriction.to.way; } diff --git a/data_structures/restriction_map.cpp b/data_structures/restriction_map.cpp index 0f230f819..017ee3251 100644 --- a/data_structures/restriction_map.cpp +++ b/data_structures/restriction_map.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -27,54 +27,51 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "restriction_map.hpp" -RestrictionMap::RestrictionMap(const std::vector &restriction_list) - : m_count(0) +RestrictionMap::RestrictionMap(const std::vector &restriction_list) : m_count(0) +{ + // decompose restriction consisting of a start, via and end node into a + // a pair of starting edge and a list of all end nodes + for (auto &restriction : restriction_list) { - // decompose restriction consisting of a start, via and end node into a - // a pair of starting edge and a list of all end nodes - for (auto &restriction : restriction_list) + m_restriction_start_nodes.insert(restriction.from.node); + m_no_turn_via_node_set.insert(restriction.via.node); + + RestrictionSource restriction_source = {restriction.from.node, restriction.via.node}; + + std::size_t index; + auto restriction_iter = m_restriction_map.find(restriction_source); + if (restriction_iter == m_restriction_map.end()) { - m_restriction_start_nodes.insert(restriction.from.node); - m_no_turn_via_node_set.insert(restriction.via.node); - - RestrictionSource restriction_source = {restriction.from.node, restriction.via.node}; - - std::size_t index; - auto restriction_iter = m_restriction_map.find(restriction_source); - if (restriction_iter == m_restriction_map.end()) - { - index = m_restriction_bucket_list.size(); - m_restriction_bucket_list.resize(index + 1); - m_restriction_map.emplace(restriction_source, index); - } - else - { - index = restriction_iter->second; - // Map already contains an is_only_*-restriction - if (m_restriction_bucket_list.at(index).begin()->is_only) - { - continue; - } - else if (restriction.flags.is_only) - { - // We are going to insert an is_only_*-restriction. There can be only one. - m_count -= m_restriction_bucket_list.at(index).size(); - m_restriction_bucket_list.at(index).clear(); - } - } - ++m_count; - m_restriction_bucket_list.at(index) - .emplace_back(restriction.to.node, restriction.flags.is_only); + index = m_restriction_bucket_list.size(); + m_restriction_bucket_list.resize(index + 1); + m_restriction_map.emplace(restriction_source, index); } + else + { + index = restriction_iter->second; + // Map already contains an is_only_*-restriction + if (m_restriction_bucket_list.at(index).begin()->is_only) + { + continue; + } + else if (restriction.flags.is_only) + { + // We are going to insert an is_only_*-restriction. There can be only one. + m_count -= m_restriction_bucket_list.at(index).size(); + m_restriction_bucket_list.at(index).clear(); + } + } + ++m_count; + m_restriction_bucket_list.at(index) + .emplace_back(restriction.to.node, restriction.flags.is_only); } - +} bool RestrictionMap::IsViaNode(const NodeID node) const { return m_no_turn_via_node_set.find(node) != m_no_turn_via_node_set.end(); } - // Replaces start edge (v, w) with (u, w). Only start node changes. void RestrictionMap::FixupStartingTurnRestriction(const NodeID node_u, const NodeID node_v, @@ -156,7 +153,7 @@ bool RestrictionMap::CheckIfTurnIsRestricted(const NodeID node_u, for (const RestrictionTarget &restriction_target : bucket) { if (node_w == restriction_target.target_node && // target found - !restriction_target.is_only) // and not an only_-restr. + !restriction_target.is_only) // and not an only_-restr. { return true; } diff --git a/data_structures/restriction_map.hpp b/data_structures/restriction_map.hpp index a11b987f2..27a6698db 100644 --- a/data_structures/restriction_map.hpp +++ b/data_structures/restriction_map.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/route_parameters.cpp b/data_structures/route_parameters.cpp index fa54ad6b2..5f6d37f90 100644 --- a/data_structures/route_parameters.cpp +++ b/data_structures/route_parameters.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -108,8 +108,8 @@ void RouteParameters::setGeometryFlag(const bool flag) { geometry = flag; } void RouteParameters::setCompressionFlag(const bool flag) { compression = flag; } -void -RouteParameters::addCoordinate(const boost::fusion::vector &transmitted_coordinates) +void RouteParameters::addCoordinate( + const boost::fusion::vector &transmitted_coordinates) { coordinates.emplace_back( static_cast(COORDINATE_PRECISION * boost::fusion::at_c<0>(transmitted_coordinates)), diff --git a/data_structures/search_engine.hpp b/data_structures/search_engine.hpp index 0b2b888dc..24e550767 100644 --- a/data_structures/search_engine.hpp +++ b/data_structures/search_engine.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -51,7 +51,8 @@ template class SearchEngine alternative_path(facade, engine_working_data), distance_table(facade, engine_working_data) { static_assert(!std::is_pointer::value, "don't instantiate with ptr type"); - static_assert(std::is_object::value, "don't instantiate with void, function, or reference"); + static_assert(std::is_object::value, + "don't instantiate with void, function, or reference"); } ~SearchEngine() {} diff --git a/data_structures/search_engine_data.cpp b/data_structures/search_engine_data.cpp index 810762acd..fbdbc06ce 100644 --- a/data_structures/search_engine_data.cpp +++ b/data_structures/search_engine_data.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/search_engine_data.hpp b/data_structures/search_engine_data.hpp index 6c2efb1d6..82ee706c7 100644 --- a/data_structures/search_engine_data.hpp +++ b/data_structures/search_engine_data.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/segment_information.hpp b/data_structures/segment_information.hpp index 5729380cc..7118a320e 100644 --- a/data_structures/segment_information.hpp +++ b/data_structures/segment_information.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/shared_memory_factory.hpp b/data_structures/shared_memory_factory.hpp index 56e458ff1..58fed9bb3 100644 --- a/data_structures/shared_memory_factory.hpp +++ b/data_structures/shared_memory_factory.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/shared_memory_vector_wrapper.hpp b/data_structures/shared_memory_vector_wrapper.hpp index d508e5f56..dc51cff0d 100644 --- a/data_structures/shared_memory_vector_wrapper.hpp +++ b/data_structures/shared_memory_vector_wrapper.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -147,8 +147,8 @@ template <> class SharedMemoryWrapper template struct ShM { using vector = typename std::conditional, - std::vector>::type; + SharedMemoryWrapper, + std::vector>::type; }; #endif // SHARED_MEMORY_VECTOR_WRAPPER_HPP diff --git a/data_structures/static_graph.hpp b/data_structures/static_graph.hpp index 1358027f7..2a5f6481e 100644 --- a/data_structures/static_graph.hpp +++ b/data_structures/static_graph.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/static_kdtree.hpp b/data_structures/static_kdtree.hpp index b173d3a02..1e65dc844 100644 --- a/data_structures/static_kdtree.hpp +++ b/data_structures/static_kdtree.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -138,8 +138,8 @@ class StaticKDTree continue; Iterator middle = tree.left + (tree.right - tree.left) / 2; - std::nth_element( - kdtree + tree.left, kdtree + middle, kdtree + tree.right, Less(tree.dimension)); + std::nth_element(kdtree + tree.left, kdtree + middle, kdtree + tree.right, + Less(tree.dimension)); s.push(Tree(tree.left, middle, (tree.dimension + 1) % k)); s.push(Tree(middle + 1, tree.right, (tree.dimension + 1) % k)); } diff --git a/data_structures/static_rtree.hpp b/data_structures/static_rtree.hpp index 87766cbb8..a0ce38a1e 100644 --- a/data_structures/static_rtree.hpp +++ b/data_structures/static_rtree.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/travel_mode.hpp b/data_structures/travel_mode.hpp index 345ec90e3..2bbe46317 100644 --- a/data_structures/travel_mode.hpp +++ b/data_structures/travel_mode.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -28,7 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef TRAVEL_MODE_HPP #define TRAVEL_MODE_HPP -namespace { +namespace +{ using TravelMode = unsigned char; static const TravelMode TRAVEL_MODE_INACCESSIBLE = 0; static const TravelMode TRAVEL_MODE_DEFAULT = 1; diff --git a/data_structures/tribool.hpp b/data_structures/tribool.hpp index 446bf31ea..2d4b6108d 100644 --- a/data_structures/tribool.hpp +++ b/data_structures/tribool.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/turn_instructions.hpp b/data_structures/turn_instructions.hpp index 4b36658b3..1ca065f68 100644 --- a/data_structures/turn_instructions.hpp +++ b/data_structures/turn_instructions.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -30,10 +30,24 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. enum class TurnInstruction : unsigned char { - NoTurn = 0, GoStraight, TurnSlightRight, TurnRight, TurnSharpRight, UTurn, - TurnSharpLeft, TurnLeft, TurnSlightLeft, ReachViaLocation, HeadOn, EnterRoundAbout, - LeaveRoundAbout, StayOnRoundAbout, StartAtEndOfStreet, ReachedYourDestination, - EnterAgainstAllowedDirection, LeaveAgainstAllowedDirection, + NoTurn = 0, + GoStraight, + TurnSlightRight, + TurnRight, + TurnSharpRight, + UTurn, + TurnSharpLeft, + TurnLeft, + TurnSlightLeft, + ReachViaLocation, + HeadOn, + EnterRoundAbout, + LeaveRoundAbout, + StayOnRoundAbout, + StartAtEndOfStreet, + ReachedYourDestination, + EnterAgainstAllowedDirection, + LeaveAgainstAllowedDirection, InverseAccessRestrictionFlag = 127, AccessRestrictionFlag = 128, AccessRestrictionPenalty = 129 @@ -42,7 +56,7 @@ enum class TurnInstruction : unsigned char struct TurnInstructionsClass { TurnInstructionsClass() = delete; - TurnInstructionsClass(const TurnInstructionsClass&) = delete; + TurnInstructionsClass(const TurnInstructionsClass &) = delete; static inline TurnInstruction GetTurnDirectionOfInstruction(const double angle) { @@ -79,7 +93,8 @@ struct TurnInstructionsClass static inline bool TurnIsNecessary(const TurnInstruction turn_instruction) { - if (TurnInstruction::NoTurn == turn_instruction || TurnInstruction::StayOnRoundAbout == turn_instruction) + if (TurnInstruction::NoTurn == turn_instruction || + TurnInstruction::StayOnRoundAbout == turn_instruction) { return false; } diff --git a/data_structures/upper_bound.hpp b/data_structures/upper_bound.hpp index 1fc77de38..80695f2c5 100644 --- a/data_structures/upper_bound.hpp +++ b/data_structures/upper_bound.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/xor_fast_hash.hpp b/data_structures/xor_fast_hash.hpp index 9e952193d..3af5ab1db 100644 --- a/data_structures/xor_fast_hash.hpp +++ b/data_structures/xor_fast_hash.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/data_structures/xor_fast_hash_storage.hpp b/data_structures/xor_fast_hash_storage.hpp index 3da95e7c2..ff65717a3 100644 --- a/data_structures/xor_fast_hash_storage.hpp +++ b/data_structures/xor_fast_hash_storage.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/datastore.cpp b/datastore.cpp index 77d933fda..3c032a2a9 100644 --- a/datastore.cpp +++ b/datastore.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -61,7 +61,6 @@ using QueryGraph = StaticGraph; #include - #include #include diff --git a/descriptors/description_factory.cpp b/descriptors/description_factory.cpp index 4d9918759..e4665622f 100644 --- a/descriptors/description_factory.cpp +++ b/descriptors/description_factory.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/descriptors/description_factory.hpp b/descriptors/description_factory.hpp index 7f975e030..985f9c1c5 100644 --- a/descriptors/description_factory.hpp +++ b/descriptors/description_factory.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/descriptors/descriptor_base.hpp b/descriptors/descriptor_base.hpp index 0526047fe..70d8f1c04 100644 --- a/descriptors/descriptor_base.hpp +++ b/descriptors/descriptor_base.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/descriptors/gpx_descriptor.hpp b/descriptors/gpx_descriptor.hpp index deda9c52f..fb4c5b9de 100644 --- a/descriptors/gpx_descriptor.hpp +++ b/descriptors/gpx_descriptor.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/descriptors/json_descriptor.hpp b/descriptors/json_descriptor.hpp index 7e731691e..35dd9c91e 100644 --- a/descriptors/json_descriptor.hpp +++ b/descriptors/json_descriptor.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extract.cpp b/extract.cpp index cb953a566..a14762983 100644 --- a/extract.cpp +++ b/extract.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/extraction_containers.cpp b/extractor/extraction_containers.cpp index e40959d62..8c484eb81 100644 --- a/extractor/extraction_containers.cpp +++ b/extractor/extraction_containers.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/extraction_containers.hpp b/extractor/extraction_containers.hpp index ec5b620ea..12d88a26c 100644 --- a/extractor/extraction_containers.hpp +++ b/extractor/extraction_containers.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/extraction_helper_functions.hpp b/extractor/extraction_helper_functions.hpp index ef840212b..c56c3b7e5 100644 --- a/extractor/extraction_helper_functions.hpp +++ b/extractor/extraction_helper_functions.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/extraction_node.hpp b/extractor/extraction_node.hpp index 7fd7d7ca9..e821d6ffa 100644 --- a/extractor/extraction_node.hpp +++ b/extractor/extraction_node.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/extraction_way.hpp b/extractor/extraction_way.hpp index 97133b3af..d47de20b0 100644 --- a/extractor/extraction_way.hpp +++ b/extractor/extraction_way.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/extractor.cpp b/extractor/extractor.cpp index b7d84156c..0581e4e5c 100644 --- a/extractor/extractor.cpp +++ b/extractor/extractor.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/extractor.hpp b/extractor/extractor.hpp index c06968c55..8ea56c3cb 100644 --- a/extractor/extractor.hpp +++ b/extractor/extractor.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/extractor_callbacks.cpp b/extractor/extractor_callbacks.cpp index 2770cd918..224468b06 100644 --- a/extractor/extractor_callbacks.cpp +++ b/extractor/extractor_callbacks.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/extractor_callbacks.hpp b/extractor/extractor_callbacks.hpp index 0bb30104b..8eab0182b 100644 --- a/extractor/extractor_callbacks.hpp +++ b/extractor/extractor_callbacks.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/extractor_options.cpp b/extractor/extractor_options.cpp index 12ac458fc..9ae5cd4c1 100644 --- a/extractor/extractor_options.cpp +++ b/extractor/extractor_options.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/extractor_options.hpp b/extractor/extractor_options.hpp index 4c5e2b696..5712ea01a 100644 --- a/extractor/extractor_options.hpp +++ b/extractor/extractor_options.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/first_and_last_segment_of_way.hpp b/extractor/first_and_last_segment_of_way.hpp index 8e8ad7276..3a26be7ce 100644 --- a/extractor/first_and_last_segment_of_way.hpp +++ b/extractor/first_and_last_segment_of_way.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/internal_extractor_edge.hpp b/extractor/internal_extractor_edge.hpp index 2760f7256..27e1af146 100644 --- a/extractor/internal_extractor_edge.hpp +++ b/extractor/internal_extractor_edge.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/restriction_parser.cpp b/extractor/restriction_parser.cpp index de73dda5f..ea9cad27a 100644 --- a/extractor/restriction_parser.cpp +++ b/extractor/restriction_parser.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/restriction_parser.hpp b/extractor/restriction_parser.hpp index 8347de306..0a632d83e 100644 --- a/extractor/restriction_parser.hpp +++ b/extractor/restriction_parser.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/scripting_environment.cpp b/extractor/scripting_environment.cpp index 0cc073a39..2b34b8047 100644 --- a/extractor/scripting_environment.cpp +++ b/extractor/scripting_environment.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/extractor/scripting_environment.hpp b/extractor/scripting_environment.hpp index 8cc862a6a..be05103c8 100644 --- a/extractor/scripting_environment.hpp +++ b/extractor/scripting_environment.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/include/osrm/coordinate.hpp b/include/osrm/coordinate.hpp index 546515d49..6318465e1 100644 --- a/include/osrm/coordinate.hpp +++ b/include/osrm/coordinate.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/include/osrm/json_container.hpp b/include/osrm/json_container.hpp index 4ec164965..40f39b825 100644 --- a/include/osrm/json_container.hpp +++ b/include/osrm/json_container.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/include/osrm/libosrm_config.hpp b/include/osrm/libosrm_config.hpp index 2f0edaf35..777a0ccb9 100644 --- a/include/osrm/libosrm_config.hpp +++ b/include/osrm/libosrm_config.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/include/osrm/route_parameters.hpp b/include/osrm/route_parameters.hpp index 0a450d571..ca3c4bdcb 100644 --- a/include/osrm/route_parameters.hpp +++ b/include/osrm/route_parameters.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/include/osrm/server_paths.hpp b/include/osrm/server_paths.hpp index 52b60c7c4..60553a632 100644 --- a/include/osrm/server_paths.hpp +++ b/include/osrm/server_paths.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/library/osrm.hpp b/library/osrm.hpp index dd7ffd749..27acb4039 100644 --- a/library/osrm.hpp +++ b/library/osrm.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/library/osrm_impl.cpp b/library/osrm_impl.cpp index 0aec3f15c..71ea1fb1d 100644 --- a/library/osrm_impl.cpp +++ b/library/osrm_impl.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/library/osrm_impl.hpp b/library/osrm_impl.hpp index 3f235f6ec..a736c042f 100644 --- a/library/osrm_impl.hpp +++ b/library/osrm_impl.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/plugins/distance_table.hpp b/plugins/distance_table.hpp index d4dfdc322..d7a980419 100644 --- a/plugins/distance_table.hpp +++ b/plugins/distance_table.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/plugins/hello_world.hpp b/plugins/hello_world.hpp index 269441715..faf5b1048 100644 --- a/plugins/hello_world.hpp +++ b/plugins/hello_world.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/plugins/locate.hpp b/plugins/locate.hpp index 397bde649..144765ad8 100644 --- a/plugins/locate.hpp +++ b/plugins/locate.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/plugins/nearest.hpp b/plugins/nearest.hpp index fc4e98046..81aa01e9c 100644 --- a/plugins/nearest.hpp +++ b/plugins/nearest.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/plugins/plugin_base.hpp b/plugins/plugin_base.hpp index 9b839016c..b20525643 100644 --- a/plugins/plugin_base.hpp +++ b/plugins/plugin_base.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/plugins/timestamp.hpp b/plugins/timestamp.hpp index 59a8f56f9..8a5d208b7 100644 --- a/plugins/timestamp.hpp +++ b/plugins/timestamp.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/plugins/viaroute.hpp b/plugins/viaroute.hpp index dd5edee57..335bda1af 100644 --- a/plugins/viaroute.hpp +++ b/plugins/viaroute.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/prepare.cpp b/prepare.cpp index 2fbe6ba70..af10df035 100644 --- a/prepare.cpp +++ b/prepare.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/routed.cpp b/routed.cpp index a5ba4906d..ce5691715 100644 --- a/routed.cpp +++ b/routed.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/routing_algorithms/alternative_path.hpp b/routing_algorithms/alternative_path.hpp index 5bbc1e067..7dd15b533 100644 --- a/routing_algorithms/alternative_path.hpp +++ b/routing_algorithms/alternative_path.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/routing_algorithms/many_to_many.hpp b/routing_algorithms/many_to_many.hpp index f1e996096..48bea0250 100644 --- a/routing_algorithms/many_to_many.hpp +++ b/routing_algorithms/many_to_many.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -39,7 +39,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -template class ManyToManyRouting final : public BasicRoutingInterface +template +class ManyToManyRouting final : public BasicRoutingInterface { using super = BasicRoutingInterface; using QueryHeap = SearchEngineData::QueryHeap; @@ -64,8 +65,8 @@ template class ManyToManyRouting final : public BasicRouting ~ManyToManyRouting() {} - std::shared_ptr> operator()(const PhantomNodeArray &phantom_nodes_array) - const + std::shared_ptr> + operator()(const PhantomNodeArray &phantom_nodes_array) const { const auto number_of_locations = phantom_nodes_array.size(); std::shared_ptr> result_table = @@ -134,11 +135,8 @@ template class ManyToManyRouting final : public BasicRouting // explore search space while (!query_heap.Empty()) { - ForwardRoutingStep(source_id, - number_of_locations, - query_heap, - search_space_with_buckets, - result_table); + ForwardRoutingStep(source_id, number_of_locations, query_heap, + search_space_with_buckets, result_table); } ++source_id; @@ -237,8 +235,8 @@ template class ManyToManyRouting final : public BasicRouting // Stalling template - inline bool StallAtNode(const NodeID node, const EdgeWeight distance, QueryHeap &query_heap) - const + inline bool + StallAtNode(const NodeID node, const EdgeWeight distance, QueryHeap &query_heap) const { for (auto edge : super::facade->GetAdjacentEdgeRange(node)) { diff --git a/routing_algorithms/routing_base.hpp b/routing_algorithms/routing_base.hpp index 89e152f12..714d903cd 100644 --- a/routing_algorithms/routing_base.hpp +++ b/routing_algorithms/routing_base.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/routing_algorithms/shortest_path.hpp b/routing_algorithms/shortest_path.hpp index 6b6f98277..bd2084008 100644 --- a/routing_algorithms/shortest_path.hpp +++ b/routing_algorithms/shortest_path.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/api_grammar.hpp b/server/api_grammar.hpp index 0697e21c8..fecbb92cc 100644 --- a/server/api_grammar.hpp +++ b/server/api_grammar.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/connection.cpp b/server/connection.cpp index 9d8b7a76e..41b653e82 100644 --- a/server/connection.cpp +++ b/server/connection.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -69,7 +69,7 @@ void Connection::handle_read(const boost::system::error_code &error, std::size_t osrm::tribool result; std::tie(result, compression_type) = request_parser.parse(current_request, incoming_data_buffer.data(), - incoming_data_buffer.data() + bytes_transferred); + incoming_data_buffer.data() + bytes_transferred); // the request has been parsed if (result == osrm::tribool::yes) diff --git a/server/connection.hpp b/server/connection.hpp index 119289080..9228a18a0 100644 --- a/server/connection.hpp +++ b/server/connection.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/data_structures/datafacade_base.hpp b/server/data_structures/datafacade_base.hpp index deff7c6ab..977f818a4 100644 --- a/server/data_structures/datafacade_base.hpp +++ b/server/data_structures/datafacade_base.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/data_structures/internal_datafacade.hpp b/server/data_structures/internal_datafacade.hpp index 93b261e83..3c8a57c68 100644 --- a/server/data_structures/internal_datafacade.hpp +++ b/server/data_structures/internal_datafacade.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/data_structures/shared_barriers.hpp b/server/data_structures/shared_barriers.hpp index 2d7de7e74..e6f1234ca 100644 --- a/server/data_structures/shared_barriers.hpp +++ b/server/data_structures/shared_barriers.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/data_structures/shared_datafacade.hpp b/server/data_structures/shared_datafacade.hpp index 4944d320f..468db30e2 100644 --- a/server/data_structures/shared_datafacade.hpp +++ b/server/data_structures/shared_datafacade.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/data_structures/shared_datatype.hpp b/server/data_structures/shared_datatype.hpp index f4cc6ca1c..326157389 100644 --- a/server/data_structures/shared_datatype.hpp +++ b/server/data_structures/shared_datatype.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/http/compression_type.hpp b/server/http/compression_type.hpp index 49163adab..f0dc692fa 100644 --- a/server/http/compression_type.hpp +++ b/server/http/compression_type.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/http/header.hpp b/server/http/header.hpp index 7996be439..08d2476b1 100644 --- a/server/http/header.hpp +++ b/server/http/header.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/http/reply.cpp b/server/http/reply.cpp index 2642e2be2..036d1ae05 100644 --- a/server/http/reply.cpp +++ b/server/http/reply.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/http/reply.hpp b/server/http/reply.hpp index a4b6cb69b..733818c2c 100644 --- a/server/http/reply.hpp +++ b/server/http/reply.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/http/request.hpp b/server/http/request.hpp index 0ad622580..c487fba65 100644 --- a/server/http/request.hpp +++ b/server/http/request.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/request_handler.cpp b/server/request_handler.cpp index 25637c3ad..7e99d025f 100644 --- a/server/request_handler.cpp +++ b/server/request_handler.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/request_handler.hpp b/server/request_handler.hpp index 1965a79c0..b4019db7d 100644 --- a/server/request_handler.hpp +++ b/server/request_handler.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/request_parser.cpp b/server/request_parser.cpp index ff9e0d42d..584dcbeeb 100644 --- a/server/request_parser.cpp +++ b/server/request_parser.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/request_parser.hpp b/server/request_parser.hpp index 045db8d17..2b6bf6944 100644 --- a/server/request_parser.hpp +++ b/server/request_parser.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/server/server.hpp b/server/server.hpp index 46a87d23a..0ec316379 100644 --- a/server/server.hpp +++ b/server/server.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/tools/check-hsgr.cpp b/tools/check-hsgr.cpp index be2f973c7..2418a473f 100644 --- a/tools/check-hsgr.cpp +++ b/tools/check-hsgr.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/tools/components.cpp b/tools/components.cpp index 41e7a59ca..85cfd88bd 100644 --- a/tools/components.cpp +++ b/tools/components.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/tools/io-benchmark.cpp b/tools/io-benchmark.cpp index 277bd2ad1..ae76327e2 100644 --- a/tools/io-benchmark.cpp +++ b/tools/io-benchmark.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/tools/simpleclient.cpp b/tools/simpleclient.cpp index 0235b6bdb..40407ced2 100644 --- a/tools/simpleclient.cpp +++ b/tools/simpleclient.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/tools/springclean.cpp b/tools/springclean.cpp index cb4559c1c..2d8910621 100644 --- a/tools/springclean.cpp +++ b/tools/springclean.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/tools/unlock_all_mutexes.cpp b/tools/unlock_all_mutexes.cpp index 9a279ee1e..299aa61f5 100644 --- a/tools/unlock_all_mutexes.cpp +++ b/tools/unlock_all_mutexes.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/unit_tests/algorithm_tests.cpp b/unit_tests/algorithm_tests.cpp index 216a713e4..0a9f3fdff 100644 --- a/unit_tests/algorithm_tests.cpp +++ b/unit_tests/algorithm_tests.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -32,4 +32,3 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* * This file will contain an automatically generated main function. */ - diff --git a/unit_tests/algorithms/douglas_peucker.cpp b/unit_tests/algorithms/douglas_peucker.cpp index 93e2aee8e..9654e4da3 100644 --- a/unit_tests/algorithms/douglas_peucker.cpp +++ b/unit_tests/algorithms/douglas_peucker.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -40,8 +40,8 @@ BOOST_AUTO_TEST_SUITE(douglas_peucker) SegmentInformation getTestInfo(int lat, int lon, bool necessary) { - return SegmentInformation(FixedPointCoordinate(lat, lon), - 0, 0, 0, TurnInstruction::HeadOn, necessary, false, 0); + return SegmentInformation(FixedPointCoordinate(lat, lon), 0, 0, 0, TurnInstruction::HeadOn, + necessary, false, 0); } BOOST_AUTO_TEST_CASE(all_necessary_test) @@ -53,17 +53,15 @@ BOOST_AUTO_TEST_CASE(all_necessary_test) * / \ * x x */ - std::vector info = { - getTestInfo(5, 5, true), - getTestInfo(6, 6, true), - getTestInfo(10, 10, true), - getTestInfo(5, 15, true) - }; + std::vector info = {getTestInfo(5, 5, true), + getTestInfo(6, 6, true), + getTestInfo(10, 10, true), + getTestInfo(5, 15, true)}; DouglasPeucker dp; for (unsigned z = 0; z < DOUGLAS_PEUCKER_THRESHOLDS.size(); z++) { dp.Run(info, z); - for (const auto& i : info) + for (const auto &i : info) { BOOST_CHECK_EQUAL(i.necessary, true); } @@ -83,17 +81,14 @@ BOOST_AUTO_TEST_CASE(remove_second_node_test) * x */ std::vector info = { - getTestInfo(5 * COORDINATE_PRECISION, - 5 * COORDINATE_PRECISION, true), - getTestInfo(5 * COORDINATE_PRECISION, - 5 * COORDINATE_PRECISION + DOUGLAS_PEUCKER_THRESHOLDS[z], false), - getTestInfo(10 * COORDINATE_PRECISION, - 10 * COORDINATE_PRECISION, false), + getTestInfo(5 * COORDINATE_PRECISION, 5 * COORDINATE_PRECISION, true), + getTestInfo(5 * COORDINATE_PRECISION, + 5 * COORDINATE_PRECISION + DOUGLAS_PEUCKER_THRESHOLDS[z], false), + getTestInfo(10 * COORDINATE_PRECISION, 10 * COORDINATE_PRECISION, false), getTestInfo(10 * COORDINATE_PRECISION, 10 + COORDINATE_PRECISION + DOUGLAS_PEUCKER_THRESHOLDS[z] * 2, false), - getTestInfo(5 * COORDINATE_PRECISION, - 15 * COORDINATE_PRECISION, false), - getTestInfo(5 * COORDINATE_PRECISION + DOUGLAS_PEUCKER_THRESHOLDS[z], + getTestInfo(5 * COORDINATE_PRECISION, 15 * COORDINATE_PRECISION, false), + getTestInfo(5 * COORDINATE_PRECISION + DOUGLAS_PEUCKER_THRESHOLDS[z], 15 * COORDINATE_PRECISION, true), }; BOOST_TEST_MESSAGE("Threshold (" << z << "): " << DOUGLAS_PEUCKER_THRESHOLDS[z]); diff --git a/unit_tests/data_structures/binary_heap.cpp b/unit_tests/data_structures/binary_heap.cpp index 9cfdae260..d039710c0 100644 --- a/unit_tests/data_structures/binary_heap.cpp +++ b/unit_tests/data_structures/binary_heap.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/unit_tests/data_structures/coordinate.cpp b/unit_tests/data_structures/coordinate.cpp index b371368be..6e891563a 100644 --- a/unit_tests/data_structures/coordinate.cpp +++ b/unit_tests/data_structures/coordinate.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/unit_tests/data_structures/range_table.cpp b/unit_tests/data_structures/range_table.cpp index 9c925328a..ec3b724ad 100644 --- a/unit_tests/data_structures/range_table.cpp +++ b/unit_tests/data_structures/range_table.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -52,8 +52,9 @@ void ConstructionTest(std::vector lengths, std::vector offse } } -void -ComputeLengthsOffsets(std::vector &lengths, std::vector &offsets, unsigned num) +void ComputeLengthsOffsets(std::vector &lengths, + std::vector &offsets, + unsigned num) { lengths.resize(num); offsets.resize(num + 1); diff --git a/unit_tests/data_structures/static_graph.cpp b/unit_tests/data_structures/static_graph.cpp index 4f82f8e7b..4b68b254d 100644 --- a/unit_tests/data_structures/static_graph.cpp +++ b/unit_tests/data_structures/static_graph.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/unit_tests/data_structures/static_rtree.cpp b/unit_tests/data_structures/static_rtree.cpp index 44912a6f6..42bc71898 100644 --- a/unit_tests/data_structures/static_rtree.cpp +++ b/unit_tests/data_structures/static_rtree.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/unit_tests/datastructure_tests.cpp b/unit_tests/datastructure_tests.cpp index ab39d8df2..850d61910 100644 --- a/unit_tests/datastructure_tests.cpp +++ b/unit_tests/datastructure_tests.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/bearing.cpp b/util/bearing.cpp index 92c47e6b8..df238277a 100644 --- a/util/bearing.cpp +++ b/util/bearing.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/bearing.hpp b/util/bearing.hpp index 0066e9e02..b8a79ee97 100644 --- a/util/bearing.hpp +++ b/util/bearing.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/boost_filesystem_2_fix.hpp b/util/boost_filesystem_2_fix.hpp index aeab380b2..2e41abd6a 100644 --- a/util/boost_filesystem_2_fix.hpp +++ b/util/boost_filesystem_2_fix.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/cast.hpp b/util/cast.hpp index e28b9ff84..c031e22b6 100644 --- a/util/cast.hpp +++ b/util/cast.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/compute_angle.cpp b/util/compute_angle.cpp index e83b67b75..86be5634b 100644 --- a/util/compute_angle.cpp +++ b/util/compute_angle.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/compute_angle.hpp b/util/compute_angle.hpp index 73682bceb..477e43689 100644 --- a/util/compute_angle.hpp +++ b/util/compute_angle.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/container.hpp b/util/container.hpp index 41c8821f8..c1f3bc77b 100644 --- a/util/container.hpp +++ b/util/container.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/datastore_options.hpp b/util/datastore_options.hpp index 1992860b5..76edc7827 100644 --- a/util/datastore_options.hpp +++ b/util/datastore_options.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/fingerprint.hpp b/util/fingerprint.hpp index 494a877ab..82eb1364a 100644 --- a/util/fingerprint.hpp +++ b/util/fingerprint.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/floating_point.hpp b/util/floating_point.hpp index 5c4810279..13f2d3bc4 100644 --- a/util/floating_point.hpp +++ b/util/floating_point.hpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/git_sha.cpp.in b/util/git_sha.cpp.in index 5b19337e9..e3686da19 100644 --- a/util/git_sha.cpp.in +++ b/util/git_sha.cpp.in @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/git_sha.hpp b/util/git_sha.hpp index 9e55deff3..b0a9a7ca3 100644 --- a/util/git_sha.hpp +++ b/util/git_sha.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/graph_loader.hpp b/util/graph_loader.hpp index b85f89109..0dfd72aef 100644 --- a/util/graph_loader.hpp +++ b/util/graph_loader.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/ini_file.hpp b/util/ini_file.hpp index 20616257a..b42f9aef8 100644 --- a/util/ini_file.hpp +++ b/util/ini_file.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/integer_range.hpp b/util/integer_range.hpp index 030b2fa63..ea98b1312 100644 --- a/util/integer_range.hpp +++ b/util/integer_range.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013,2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2013,2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/iterator_range.hpp b/util/iterator_range.hpp index a057d7c92..d5224c983 100644 --- a/util/iterator_range.hpp +++ b/util/iterator_range.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/json_renderer.hpp b/util/json_renderer.hpp index 143066cb7..00212a8b7 100644 --- a/util/json_renderer.hpp +++ b/util/json_renderer.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/lua_util.hpp b/util/lua_util.hpp index f367949da..af6277c59 100644 --- a/util/lua_util.hpp +++ b/util/lua_util.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/make_unique.hpp b/util/make_unique.hpp index e670ffd4d..83e230194 100644 --- a/util/make_unique.hpp +++ b/util/make_unique.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2013, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/mercator.cpp b/util/mercator.cpp index ddd80685d..298257630 100644 --- a/util/mercator.cpp +++ b/util/mercator.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/mercator.hpp b/util/mercator.hpp index 2929db2f9..462c73e23 100644 --- a/util/mercator.hpp +++ b/util/mercator.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/osrm_exception.cpp b/util/osrm_exception.cpp index e6b7986e3..9738b8e36 100644 --- a/util/osrm_exception.cpp +++ b/util/osrm_exception.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/osrm_exception.hpp b/util/osrm_exception.hpp index ac5044a79..e9a01381e 100644 --- a/util/osrm_exception.hpp +++ b/util/osrm_exception.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/routed_options.hpp b/util/routed_options.hpp index 74e79b070..322737d6d 100644 --- a/util/routed_options.hpp +++ b/util/routed_options.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/simple_logger.cpp b/util/simple_logger.cpp index 238e0b57d..e3f4f8ed0 100644 --- a/util/simple_logger.cpp +++ b/util/simple_logger.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -33,11 +33,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #else #include #endif -#include -#include -#include -#include - +#include +#include +#include +#include namespace { diff --git a/util/simple_logger.hpp b/util/simple_logger.hpp index f4dfc0b02..df61a9deb 100644 --- a/util/simple_logger.hpp +++ b/util/simple_logger.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/std_hash.hpp b/util/std_hash.hpp index 8b4af3dd8..9e78fcce4 100644 --- a/util/std_hash.hpp +++ b/util/std_hash.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/string_util.hpp b/util/string_util.hpp index 92fac59c7..46b6a5a64 100644 --- a/util/string_util.hpp +++ b/util/string_util.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/timing_util.hpp b/util/timing_util.hpp index 2279bd083..c0c59c8a6 100644 --- a/util/timing_util.hpp +++ b/util/timing_util.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/trigonometry_table.hpp b/util/trigonometry_table.hpp index ebcf7ba4d..234a94e56 100644 --- a/util/trigonometry_table.hpp +++ b/util/trigonometry_table.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2015, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/util/xml_renderer.hpp b/util/xml_renderer.hpp index 5783ab133..4ef1e5dc0 100644 --- a/util/xml_renderer.hpp +++ b/util/xml_renderer.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2014, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification,