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

Fixes unneeded includes in contractor header and self-include

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-03-09 13:18:09 +01:00
parent 4150c804df
commit a013da860e
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/contractor/contractor.hpp
View File

@ -1,30 +1,20 @@
#ifndef CONTRACTOR_CONTRACTOR_HPP #ifndef CONTRACTOR_CONTRACTOR_HPP
#define CONTRACTOR_CONTRACTOR_HPP #define CONTRACTOR_CONTRACTOR_HPP
#include "extractor/edge_based_edge.hpp"
#include "extractor/node_based_edge.hpp"
#include "contractor/contractor.hpp"
#include "contractor/contractor_config.hpp" #include "contractor/contractor_config.hpp"
#include "contractor/query_edge.hpp" #include "contractor/query_edge.hpp"
#include "extractor/edge_based_edge.hpp" #include "extractor/edge_based_edge.hpp"
#include "extractor/edge_based_node.hpp" #include "extractor/edge_based_node.hpp"
#include "util/static_graph.hpp" #include "util/typedefs.hpp"
#include "util/deallocating_vector.hpp" #include "util/deallocating_vector.hpp"
#include "util/node_based_graph.hpp"
#include <boost/filesystem.hpp>
#include <vector> #include <vector>
#include <string>
struct lua_State; #include <cstddef>
namespace osrm namespace osrm
{ {
namespace extractor
{
struct SpeedProfileProperties;
struct EdgeBasedEdge;
}
namespace contractor namespace contractor
{ {
@ -34,11 +24,10 @@ class Contractor
public: public:
using EdgeData = QueryEdge::EdgeData; using EdgeData = QueryEdge::EdgeData;
explicit Contractor(ContractorConfig contractor_config) : config(std::move(contractor_config)) explicit Contractor(const ContractorConfig &config_) : config{config_} {}
{
}
Contractor(const Contractor &) = delete; Contractor(const Contractor &) = delete;
Contractor& operator=(const Contractor &) = delete; Contractor &operator=(const Contractor &) = delete;
int Run(); int Run();
@ -61,6 +50,7 @@ class Contractor
private: private:
ContractorConfig config; ContractorConfig config;
std::size_t std::size_t
LoadEdgeExpandedGraph(const std::string &edge_based_graph_path, LoadEdgeExpandedGraph(const std::string &edge_based_graph_path,
util::DeallocatingVector<extractor::EdgeBasedEdge> &edge_based_edge_list, util::DeallocatingVector<extractor::EdgeBasedEdge> &edge_based_edge_list,

16
src/contractor/contractor.cpp
View File

@ -1,18 +1,15 @@
#include "contractor/contractor.hpp" #include "contractor/contractor.hpp"
#include "contractor/crc32_processor.hpp"
#include "contractor/graph_contractor.hpp" #include "contractor/graph_contractor.hpp"
#include "extractor/edge_based_edge.hpp" #include "extractor/node_based_edge.hpp"
#include "extractor/compressed_edge_container.hpp" #include "extractor/compressed_edge_container.hpp"
#include "util/static_graph.hpp"
#include "util/static_rtree.hpp" #include "util/static_rtree.hpp"
#include "util/deallocating_vector.hpp"
#include "contractor/crc32_processor.hpp"
#include "util/graph_loader.hpp" #include "util/graph_loader.hpp"
#include "util/io.hpp" #include "util/io.hpp"
#include "util/integer_range.hpp" #include "util/integer_range.hpp"
#include "util/lua_util.hpp"
#include "util/exception.hpp" #include "util/exception.hpp"
#include "util/simple_logger.hpp" #include "util/simple_logger.hpp"
#include "util/string_util.hpp" #include "util/string_util.hpp"
@ -21,19 +18,16 @@
#include <fast-cpp-csv-parser/csv.h> #include <fast-cpp-csv-parser/csv.h>
#include <boost/assert.hpp>
#include <boost/filesystem/fstream.hpp> #include <boost/filesystem/fstream.hpp>
#include <boost/program_options.hpp>
#include <tbb/parallel_sort.h> #include <tbb/parallel_sort.h>
#include <cstddef>
#include <cstdint> #include <cstdint>
#include <bitset> #include <bitset>
#include <chrono> #include <chrono>
#include <memory> #include <memory>
#include <string>
#include <thread> #include <thread>
#include <vector>
#include <iterator> #include <iterator>
namespace std namespace std
@ -71,8 +65,6 @@ int Contractor::Run()
TIMER_START(preparing); TIMER_START(preparing);
// Create a new lua state
util::SimpleLogger().Write() << "Loading edge-expanded graph representation"; util::SimpleLogger().Write() << "Loading edge-expanded graph representation";
util::DeallocatingVector<extractor::EdgeBasedEdge> edge_based_edge_list; util::DeallocatingVector<extractor::EdgeBasedEdge> edge_based_edge_list;