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

lint corrections

Browse Source 
- fix license header
- let shared_ptr autodestruct as it's shared
- rename fences to resemble file names
- reorder includes into lexicographic order
This commit is contained in:
Dennis Luxen 2015-02-26 18:50:18 +01:00 committed by Patrick Niklaus
parent 2115a67d24
commit a2c88b607f
2 changed files with 60 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
plugins/map_matching.hpp
View File

@ -1,39 +1,46 @@
/* /*
open source routing machine
Copyright (C) Dennis Luxen, others 2010
This program is free software; you can redistribute it and/or modify Copyright (c) 2015, Project OSRM contributors
it under the terms of the GNU AFFERO General Public License as published by All rights reserved.
the Free Software Foundation; either version 3 of the License, or
any later version.
This program is distributed in the hope that it will be useful, Redistribution and use in source and binary forms, with or without modification,
but WITHOUT ANY WARRANTY; without even the implied warranty of are permitted provided that the following conditions are met:
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU Affero General Public License Redistributions of source code must retain the above copyright notice, this list
along with this program; if not, write to the Free Software of conditions and the following disclaimer.
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Redistributions in binary form must reproduce the above copyright notice, this
or see http://www.gnu.org/licenses/agpl.txt. list of conditions and the following disclaimer in the documentation and/or
*/ other materials provided with the distribution.
#ifndef MAP_MATCHING_PLUGIN_H THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
#define MAP_MATCHING_PLUGIN_H 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 MAP_MATCHING_HPP
#define MAP_MATCHING_HPP
#include "plugin_base.hpp" #include "plugin_base.hpp"
#include "../algorithms/bayes_classifier.hpp" #include "../algorithms/bayes_classifier.hpp"
#include "../algorithms/object_encoder.hpp" #include "../algorithms/object_encoder.hpp"
#include "../util/integer_range.hpp"
#include "../data_structures/search_engine.hpp" #include "../data_structures/search_engine.hpp"
#include "../routing_algorithms/map_matching.hpp"
#include "../util/compute_angle.hpp"
#include "../util/simple_logger.hpp"
#include "../util/string_util.hpp"
#include "../descriptors/descriptor_base.hpp" #include "../descriptors/descriptor_base.hpp"
#include "../descriptors/gpx_descriptor.hpp" #include "../descriptors/gpx_descriptor.hpp"
#include "../descriptors/json_descriptor.hpp" #include "../descriptors/json_descriptor.hpp"
#include "../routing_algorithms/map_matching.hpp"
#include "../util/compute_angle.hpp"
#include "../util/integer_range.hpp"
#include "../util/simple_logger.hpp"
#include "../util/string_util.hpp"
#include <cstdlib> #include <cstdlib>
@ -65,7 +72,7 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
search_engine_ptr = std::make_shared<SearchEngine<DataFacadeT>>(facade); search_engine_ptr = std::make_shared<SearchEngine<DataFacadeT>>(facade);
} }
virtual ~MapMatchingPlugin() { search_engine_ptr.reset(); } virtual ~MapMatchingPlugin() { }
const std::string GetDescriptor() const final { return descriptor_string; } const std::string GetDescriptor() const final { return descriptor_string; }
@ -287,4 +294,4 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
ClassifierT classifier; ClassifierT classifier;
}; };
#endif /* MAP_MATCHING_PLUGIN_H */ #endif /* MAP_MATCHING_HPP */

49
routing_algorithms/map_matching.hpp
View File

@ -1,40 +1,47 @@
/* /*
open source routing machine
Copyright (C) Dennis Luxen, others 2010
This program is free software; you can redistribute it and/or modify Copyright (c) 2015, Project OSRM contributors
it under the terms of the GNU AFFERO General Public License as published by All rights reserved.
the Free Software Foundation; either version 3 of the License, or
any later version.
This program is distributed in the hope that it will be useful, Redistribution and use in source and binary forms, with or without modification,
but WITHOUT ANY WARRANTY; without even the implied warranty of are permitted provided that the following conditions are met:
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU Affero General Public License Redistributions of source code must retain the above copyright notice, this list
along with this program; if not, write to the Free Software of conditions and the following disclaimer.
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Redistributions in binary form must reproduce the above copyright notice, this
or see http://www.gnu.org/licenses/agpl.txt. list of conditions and the following disclaimer in the documentation and/or
*/ other materials provided with the distribution.
#ifndef MAP_MATCHING_H THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
#define MAP_MATCHING_H 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 MAP_MATCHING_HPP
#define MAP_MATCHING_HPP
#include "routing_base.hpp" #include "routing_base.hpp"
#include "../data_structures/coordinate_calculation.hpp" #include "../data_structures/coordinate_calculation.hpp"
#include "../util/simple_logger.hpp" #include "../util/simple_logger.hpp"
#include <variant/variant.hpp>
#include <osrm/json_container.hpp> #include <osrm/json_container.hpp>
#include <variant/variant.hpp>
#include <fstream>
#include <algorithm> #include <algorithm>
#include <iomanip> #include <iomanip>
#include <numeric> #include <numeric>
#include <fstream>
using JSONVariantArray = mapbox::util::recursive_wrapper<osrm::json::Array>; using JSONVariantArray = mapbox::util::recursive_wrapper<osrm::json::Array>;
using JSONVariantObject = mapbox::util::recursive_wrapper<osrm::json::Object>; using JSONVariantObject = mapbox::util::recursive_wrapper<osrm::json::Object>;
@ -592,4 +599,4 @@ template <class DataFacadeT> class MapMatching final
//[1] "Hidden Markov Map Matching Through Noise and Sparseness"; P. Newson and J. Krumm; 2009; ACM GIS //[1] "Hidden Markov Map Matching Through Noise and Sparseness"; P. Newson and J. Krumm; 2009; ACM GIS
#endif /* MAP_MATCHING_H */ #endif /* MAP_MATCHING_HPP */