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

rename a number of overly long variable names

Browse Source
This commit is contained in:
Dennis Luxen 2015-01-05 16:29:33 +01:00
parent 703a88a639
commit 25d5653f66
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
benchmarks/static_rtree.cpp
View File

@ -52,10 +52,10 @@ FixedPointCoordinateListPtr LoadCoordinates(const boost::filesystem::path &nodes
boost::filesystem::ifstream nodes_input_stream(nodes_file, std::ios::binary); boost::filesystem::ifstream nodes_input_stream(nodes_file, std::ios::binary);
QueryNode current_node; QueryNode current_node;
unsigned number_of_coordinates = 0; unsigned coordinate_count = 0;
nodes_input_stream.read((char *)&number_of_coordinates, sizeof(unsigned)); nodes_input_stream.read((char *)&coordinate_count, sizeof(unsigned));
auto coords = std::make_shared<std::vector<FixedPointCoordinate>>(number_of_coordinates); auto coords = std::make_shared<std::vector<FixedPointCoordinate>>(coordinate_count);
for (unsigned i = 0; i < number_of_coordinates; ++i) for (unsigned i = 0; i < coordinate_count; ++i)
{ {
nodes_input_stream.read((char *)&current_node, sizeof(QueryNode)); nodes_input_stream.read((char *)&current_node, sizeof(QueryNode));
coords->at(i) = FixedPointCoordinate(current_node.lat, current_node.lon); coords->at(i) = FixedPointCoordinate(current_node.lat, current_node.lon);
@ -84,15 +84,15 @@ void Benchmark(BenchStaticRTree &rtree, unsigned num_queries)
<< "\n"; << "\n";
TIMER_START(query_phantom); TIMER_START(query_phantom);
std::vector<PhantomNode> resulting_phantom_node_vector; std::vector<PhantomNode> phantom_node_vector;
for (const auto &q : queries) for (const auto &q : queries)
{ {
resulting_phantom_node_vector.clear(); phantom_node_vector.clear();
rtree.IncrementalFindPhantomNodeForCoordinate( rtree.IncrementalFindPhantomNodeForCoordinate(
q, resulting_phantom_node_vector, 3, num_results); q, phantom_node_vector, 3, num_results);
resulting_phantom_node_vector.clear(); phantom_node_vector.clear();
rtree.IncrementalFindPhantomNodeForCoordinate( rtree.IncrementalFindPhantomNodeForCoordinate(
q, resulting_phantom_node_vector, 17, num_results); q, phantom_node_vector, 17, num_results);
} }
TIMER_STOP(query_phantom); TIMER_STOP(query_phantom);
@ -122,18 +122,18 @@ void Benchmark(BenchStaticRTree &rtree, unsigned num_queries)
std::cout << "#### FindPhantomNodeForCoordinate" std::cout << "#### FindPhantomNodeForCoordinate"
<< "\n"; << "\n";
TIMER_START(query_phantomnode); TIMER_START(query_node);
for (const auto &q : queries) for (const auto &q : queries)
{ {
PhantomNode phantom; PhantomNode phantom;
rtree.FindPhantomNodeForCoordinate(q, phantom, 3); rtree.FindPhantomNodeForCoordinate(q, phantom, 3);
} }
TIMER_STOP(query_phantomnode); TIMER_STOP(query_node);
std::cout << "Took " << TIMER_MSEC(query_phantomnode) << " msec for " << num_queries std::cout << "Took " << TIMER_MSEC(query_node) << " msec for " << num_queries
<< " queries." << " queries."
<< "\n"; << "\n";
std::cout << TIMER_MSEC(query_phantomnode) / ((double)num_queries) << " msec/query." std::cout << TIMER_MSEC(query_node) / ((double)num_queries) << " msec/query."
<< "\n"; << "\n";
{ {
@ -143,15 +143,15 @@ void Benchmark(BenchStaticRTree &rtree, unsigned num_queries)
<< "\n"; << "\n";
TIMER_START(query_phantom); TIMER_START(query_phantom);
std::vector<PhantomNode> resulting_phantom_node_vector; std::vector<PhantomNode> phantom_node_vector;
for (const auto &q : queries) for (const auto &q : queries)
{ {
resulting_phantom_node_vector.clear(); phantom_node_vector.clear();
rtree.IncrementalFindPhantomNodeForCoordinate( rtree.IncrementalFindPhantomNodeForCoordinate(
q, resulting_phantom_node_vector, 3, num_results); q, phantom_node_vector, 3, num_results);
resulting_phantom_node_vector.clear(); phantom_node_vector.clear();
rtree.IncrementalFindPhantomNodeForCoordinate( rtree.IncrementalFindPhantomNodeForCoordinate(
q, resulting_phantom_node_vector, 17, num_results); q, phantom_node_vector, 17, num_results);
} }
TIMER_STOP(query_phantom); TIMER_STOP(query_phantom);