From 5e2462e061d28b6a415790e0a8cc6182f64e4353 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Thu, 27 Nov 2014 18:38:21 +0100 Subject: [PATCH] renamed: DataStructures/RestrictionMap.cpp -> DataStructures/restriction_map.cpp renamed: DataStructures/RestrictionMap.h -> DataStructures/restriction_map.hpp --- Algorithms/bfs_components.hpp | 29 ++++++++++++++++++- CMakeLists.txt | 2 +- Contractor/EdgeBasedGraphFactory.h | 4 +-- Contractor/Prepare.cpp | 2 +- ...RestrictionMap.cpp => restriction_map.cpp} | 4 +-- .../{RestrictionMap.h => restriction_map.hpp} | 2 +- Util/lua_util.hpp | 2 +- 7 files changed, 36 insertions(+), 9 deletions(-) rename DataStructures/{RestrictionMap.cpp => restriction_map.cpp} (98%) rename DataStructures/{RestrictionMap.h => restriction_map.hpp} (98%) diff --git a/Algorithms/bfs_components.hpp b/Algorithms/bfs_components.hpp index d0914ac36..b48016af4 100644 --- a/Algorithms/bfs_components.hpp +++ b/Algorithms/bfs_components.hpp @@ -1,8 +1,35 @@ +/* + +Copyright (c) 2014, Project OSRM, Dennis Luxen, others +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list +of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ + #ifndef BFS_COMPONENTS_HPP_ #define BFS_COMPONENTS_HPP_ #include "../typedefs.h" -#include "../DataStructures/RestrictionMap.h" +#include "../DataStructures/restriction_map.hpp" #include #include diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f847b606..ea726321f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ add_library(PHANTOMNODE OBJECT DataStructures/phantom_node.cpp) set(ExtractorSources extractor.cpp ${ExtractorGlob}) add_executable(osrm-extract ${ExtractorSources} $ $ $ $ $) -file(GLOB PrepareGlob Contractor/*.cpp DataStructures/HilbertValue.cpp DataStructures/RestrictionMap.cpp Util/compute_angle.cpp) +file(GLOB PrepareGlob Contractor/*.cpp DataStructures/HilbertValue.cpp DataStructures/restriction_map.cpp Util/compute_angle.cpp) set(PrepareSources prepare.cpp ${PrepareGlob}) add_executable(osrm-prepare ${PrepareSources} $ $ $ $ $) diff --git a/Contractor/EdgeBasedGraphFactory.h b/Contractor/EdgeBasedGraphFactory.h index 1893df58c..eafea3148 100644 --- a/Contractor/EdgeBasedGraphFactory.h +++ b/Contractor/EdgeBasedGraphFactory.h @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM, Dennis Luxen, others All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../DataStructures/QueryNode.h" #include "../DataStructures/TurnInstructions.h" #include "../DataStructures/NodeBasedGraph.h" -#include "../DataStructures/RestrictionMap.h" +#include "../DataStructures/restriction_map.hpp" #include "GeometryCompressor.h" #include diff --git a/Contractor/Prepare.cpp b/Contractor/Prepare.cpp index cc55548c0..c356aac30 100644 --- a/Contractor/Prepare.cpp +++ b/Contractor/Prepare.cpp @@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../Algorithms/crc32_processor.hpp" #include "../DataStructures/DeallocatingVector.h" #include "../DataStructures/StaticRTree.h" -#include "../DataStructures/RestrictionMap.h" +#include "../DataStructures/restriction_map.hpp" #include "../Util/GitDescription.h" #include "../Util/integer_range.hpp" diff --git a/DataStructures/RestrictionMap.cpp b/DataStructures/restriction_map.cpp similarity index 98% rename from DataStructures/RestrictionMap.cpp rename to DataStructures/restriction_map.cpp index 7f61ead01..62e162cfd 100644 --- a/DataStructures/RestrictionMap.cpp +++ b/DataStructures/restriction_map.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM, Dennis Luxen, others All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "RestrictionMap.h" +#include "restriction_map.hpp" #include "NodeBasedGraph.h" bool RestrictionMap::IsViaNode(const NodeID node) const diff --git a/DataStructures/RestrictionMap.h b/DataStructures/restriction_map.hpp similarity index 98% rename from DataStructures/RestrictionMap.h rename to DataStructures/restriction_map.hpp index 3945a3982..4b2cf53e1 100644 --- a/DataStructures/RestrictionMap.h +++ b/DataStructures/restriction_map.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM, Dennis Luxen, others All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Util/lua_util.hpp b/Util/lua_util.hpp index da8a70c11..f367949da 100644 --- a/Util/lua_util.hpp +++ b/Util/lua_util.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2014, Project OSRM, Dennis Luxen, others All rights reserved. Redistribution and use in source and binary forms, with or without modification,