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

reduce number of old-style casts

Browse Source
This commit is contained in:
Dennis Luxen 2015-01-27 18:37:52 +01:00
parent b20b7e65bf
commit 64a6859753
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/components.cpp
View File

@ -58,8 +58,8 @@ namespace
struct TarjanEdgeData struct TarjanEdgeData
{ {
TarjanEdgeData() : distance(INVALID_EDGE_WEIGHT), name_id(INVALID_NAMEID) {} TarjanEdgeData() : distance(INVALID_EDGE_WEIGHT), name_id(INVALID_NAMEID) {}
TarjanEdgeData(int distance, unsigned name_id) : distance(distance), name_id(name_id) {} TarjanEdgeData(unsigned distance, unsigned name_id) : distance(distance), name_id(name_id) {}
int distance; unsigned distance;
unsigned name_id; unsigned name_id;
}; };
@ -97,7 +97,8 @@ int main(int argc, char *argv[])
std::ifstream restriction_ifstream(argv[2], std::ios::binary); std::ifstream restriction_ifstream(argv[2], std::ios::binary);
const FingerPrint fingerprint_orig; const FingerPrint fingerprint_orig;
FingerPrint fingerprint_loaded; FingerPrint fingerprint_loaded;
restriction_ifstream.read((char *)&fingerprint_loaded, sizeof(FingerPrint)); restriction_ifstream.read(reinterpret_cast<char *>(&fingerprint_loaded),
sizeof(FingerPrint));
// check fingerprint and warn if necessary // check fingerprint and warn if necessary
if (!fingerprint_loaded.TestGraphUtil(fingerprint_orig)) if (!fingerprint_loaded.TestGraphUtil(fingerprint_orig))
@ -111,13 +112,13 @@ int main(int argc, char *argv[])
throw osrm::exception("Could not access <osrm-restrictions> files"); throw osrm::exception("Could not access <osrm-restrictions> files");
} }
uint32_t usable_restrictions = 0; uint32_t usable_restrictions = 0;
restriction_ifstream.read((char *)&usable_restrictions, sizeof(uint32_t)); restriction_ifstream.read(reinterpret_cast<char *>(&usable_restrictions), sizeof(uint32_t));
restriction_list.resize(usable_restrictions); restriction_list.resize(usable_restrictions);
// load restrictions // load restrictions
if (usable_restrictions > 0) if (usable_restrictions > 0)
{ {
restriction_ifstream.read((char *)&(restriction_list[0]), restriction_ifstream.read(reinterpret_cast<char *>(&restriction_list[0]),
usable_restrictions * sizeof(TurnRestriction)); usable_restrictions * sizeof(TurnRestriction));
} }
restriction_ifstream.close(); restriction_ifstream.close();
@ -147,7 +148,7 @@ int main(int argc, char *argv[])
// Building an node-based graph // Building an node-based graph
std::vector<TarjanEdge> graph_edge_list; std::vector<TarjanEdge> graph_edge_list;
for (const NodeBasedEdge &input_edge : edge_list) for (const auto &input_edge : edge_list)
{ {
if (input_edge.source == input_edge.target) if (input_edge.source == input_edge.target)
{ {
@ -157,14 +158,12 @@ int main(int argc, char *argv[])
if (input_edge.forward) if (input_edge.forward)
{ {
graph_edge_list.emplace_back(input_edge.source, input_edge.target, graph_edge_list.emplace_back(input_edge.source, input_edge.target,
(std::max)((int)input_edge.weight, 1), (std::max)(input_edge.weight, 1), input_edge.name_id);
input_edge.name_id);
} }
if (input_edge.backward) if (input_edge.backward)
{ {
graph_edge_list.emplace_back(input_edge.target, input_edge.source, graph_edge_list.emplace_back(input_edge.target, input_edge.source,
(std::max)((int)input_edge.weight, 1), (std::max)(input_edge.weight, 1), input_edge.name_id);
input_edge.name_id);
} }
} }
edge_list.clear(); edge_list.clear();
@ -226,7 +225,7 @@ int main(int argc, char *argv[])
SimpleLogger().Write() << "shapefile setup took " << TIMER_MSEC(SCC_RUN_SETUP) / 1000. SimpleLogger().Write() << "shapefile setup took " << TIMER_MSEC(SCC_RUN_SETUP) / 1000.
<< "s"; << "s";
uint64_t total_network_distance = 0; uint64_t total_network_length = 0;
p.reinit(graph->GetNumberOfNodes()); p.reinit(graph->GetNumberOfNodes());
TIMER_START(SCC_OUTPUT); TIMER_START(SCC_OUTPUT);
for (const NodeID source : osrm::irange(0u, graph->GetNumberOfNodes())) for (const NodeID source : osrm::irange(0u, graph->GetNumberOfNodes()))
@ -238,7 +237,7 @@ int main(int argc, char *argv[])
if (source < target || graph->EndEdges(target) == graph->FindEdge(target, source)) if (source < target || graph->EndEdges(target) == graph->FindEdge(target, source))
{ {
total_network_distance += total_network_length +=
100 * coordinate_calculation::euclidean_distance( 100 * coordinate_calculation::euclidean_distance(
coordinate_list[source].lat, coordinate_list[source].lon, coordinate_list[source].lat, coordinate_list[source].lon,
coordinate_list[target].lat, coordinate_list[target].lon); coordinate_list[target].lat, coordinate_list[target].lon);
@ -278,7 +277,8 @@ int main(int argc, char *argv[])
<< "s"; << "s";
SimpleLogger().Write() << "total network distance: " SimpleLogger().Write() << "total network distance: "
<< (uint64_t)total_network_distance / 100 / 1000. << " km"; << static_cast<uint64_t>(total_network_length / 100 / 1000.)
<< " km";
SimpleLogger().Write() << "finished component analysis"; SimpleLogger().Write() << "finished component analysis";
} }