fix test after header file rename

This commit is contained in:
Dennis Luxen 2015-01-27 17:16:50 +01:00
parent 7be5502a12
commit 203e3ef077

View File

@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../data_structures/query_node.hpp" #include "../data_structures/query_node.hpp"
#include "../data_structures/shared_memory_vector_wrapper.hpp" #include "../data_structures/shared_memory_vector_wrapper.hpp"
#include "../data_structures/static_rtree.hpp" #include "../data_structures/static_rtree.hpp"
#include "../Util/BoostFileSystemFix.h" #include "../Util/boost_filesystem_2_fix.hpp"
#include "../data_structures/edge_based_node.hpp" #include "../data_structures/edge_based_node.hpp"
#include <osrm/coordinate.hpp> #include <osrm/coordinate.hpp>
@ -88,11 +88,9 @@ void Benchmark(BenchStaticRTree &rtree, unsigned num_queries)
for (const auto &q : queries) for (const auto &q : queries)
{ {
phantom_node_vector.clear(); phantom_node_vector.clear();
rtree.IncrementalFindPhantomNodeForCoordinate( rtree.IncrementalFindPhantomNodeForCoordinate(q, phantom_node_vector, 3, num_results);
q, phantom_node_vector, 3, num_results);
phantom_node_vector.clear(); phantom_node_vector.clear();
rtree.IncrementalFindPhantomNodeForCoordinate( rtree.IncrementalFindPhantomNodeForCoordinate(q, phantom_node_vector, 17, num_results);
q, phantom_node_vector, 17, num_results);
} }
TIMER_STOP(query_phantom); TIMER_STOP(query_phantom);
@ -130,8 +128,7 @@ void Benchmark(BenchStaticRTree &rtree, unsigned num_queries)
} }
TIMER_STOP(query_node); TIMER_STOP(query_node);
std::cout << "Took " << TIMER_MSEC(query_node) << " msec for " << num_queries std::cout << "Took " << TIMER_MSEC(query_node) << " msec for " << num_queries << " queries."
<< " queries."
<< "\n"; << "\n";
std::cout << TIMER_MSEC(query_node) / ((double)num_queries) << " msec/query." std::cout << TIMER_MSEC(query_node) / ((double)num_queries) << " msec/query."
<< "\n"; << "\n";
@ -147,11 +144,9 @@ void Benchmark(BenchStaticRTree &rtree, unsigned num_queries)
for (const auto &q : queries) for (const auto &q : queries)
{ {
phantom_node_vector.clear(); phantom_node_vector.clear();
rtree.IncrementalFindPhantomNodeForCoordinate( rtree.IncrementalFindPhantomNodeForCoordinate(q, phantom_node_vector, 3, num_results);
q, phantom_node_vector, 3, num_results);
phantom_node_vector.clear(); phantom_node_vector.clear();
rtree.IncrementalFindPhantomNodeForCoordinate( rtree.IncrementalFindPhantomNodeForCoordinate(q, phantom_node_vector, 17, num_results);
q, phantom_node_vector, 17, num_results);
} }
TIMER_STOP(query_phantom); TIMER_STOP(query_phantom);