From 544f4604eaa4fa7a35b2942eb83678f50ab35272 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Wed, 8 Jul 2015 08:36:24 +0200
Subject: [PATCH] [T/GL] Prevent creating temporaries.
---
Tests/GeoLib/TestGrid.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Tests/GeoLib/TestGrid.cpp b/Tests/GeoLib/TestGrid.cpp
index 44a31879297..f44fa4d8834 100644
--- a/Tests/GeoLib/TestGrid.cpp
+++ b/Tests/GeoLib/TestGrid.cpp
@@ -84,7 +84,7 @@ TEST(GeoLib, SearchNearestPointInGrid)
ASSERT_NO_THROW(grid = new GeoLib::Grid<GeoLib::Point>(pnts.begin(), pnts.end()));
GeoLib::Point p0(0,10,10);
- GeoLib::Point* res(grid->getNearestPoint(p0.getCoords()));
+ GeoLib::Point* res(grid->getNearestPoint(p0));
ASSERT_EQ(sqrt(MathLib::sqrDist(*res, *pnts[0])), 0.0);
delete grid;
@@ -117,19 +117,19 @@ TEST(GeoLib, SearchNearestPointsInDenseGrid)
// search point (1,1,1) is outside of the point set
GeoLib::Point search_pnt(std::array<double,3>({{1,1,1}}), 0);
- GeoLib::Point* res(grid->getNearestPoint(search_pnt.getCoords()));
+ GeoLib::Point* res(grid->getNearestPoint(search_pnt));
ASSERT_EQ(res->getID(), i_max*j_max*k_max-1);
ASSERT_NEAR(sqrt(MathLib::sqrDist(*res, search_pnt)), sqrt(3.0)/50.0, std::numeric_limits<double>::epsilon());
// search point (0,1,1) is outside of the point set
search_pnt[0] = 0;
- res = grid->getNearestPoint(search_pnt.getCoords());
+ res = grid->getNearestPoint(search_pnt);
ASSERT_EQ(res->getID(), j_max*k_max - 1);
ASSERT_NEAR(sqrt(MathLib::sqrDist(*res, search_pnt)), sqrt(2.0)/50.0, std::numeric_limits<double>::epsilon());
// search point (0.5,1,1) is outside of the point set
search_pnt[0] = 0.5;
- res = grid->getNearestPoint(search_pnt.getCoords());
+ res = grid->getNearestPoint(search_pnt);
ASSERT_EQ(res->getID(), j_max*k_max*(i_max/2 + 1) - 1);
ASSERT_NEAR(sqrt(MathLib::sqrDist(*res, search_pnt)), sqrt(2.0)/50.0, std::numeric_limits<double>::epsilon());
@@ -138,7 +138,7 @@ TEST(GeoLib, SearchNearestPointsInDenseGrid)
for (std::size_t j(0); j < j_max; j++) {
std::size_t offset1(j * k_max + offset0);
for (std::size_t k(0); k < k_max; k++) {
- res = grid->getNearestPoint(pnts[offset1+k]->getCoords());
+ res = grid->getNearestPoint(*pnts[offset1+k]);
ASSERT_EQ(res->getID(), offset1+k);
ASSERT_NEAR(sqrt(MathLib::sqrDist(*res, *pnts[offset1+k])), 0.0, std::numeric_limits<double>::epsilon());
}
--
GitLab