Use PointView iterator after rebasing with master

PDAL · Feb 25, 2020 · 8c2472d · 8c2472d
1 parent 8e6ecd4
commit 8c2472d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/filters/NormalFilter.cpp b/filters/NormalFilter.cpp
@@ -127,13 +127,11 @@ void NormalFilter::prepared(PointTableRef table)
 void NormalFilter::compute(PointView& view, KD3Index& kdi)
 {
     log()->get(LogLevel::Debug) << "Computing normal vectors\n";
-    for (PointId idx = 0; idx < view.size(); ++idx)
+    for (auto&& p : view)
     {
-        PointRef p = view.point(idx);
-
         // Perform eigen decomposition of covariance matrix computed from
         // neighborhood composed of k-nearest neighbors.
-        PointIdList neighbors = kdi.neighbors(idx, m_args->m_knn);
+        PointIdList neighbors = kdi.neighbors(p.pointId(), m_args->m_knn);
         auto B = computeCovariance(view, neighbors);
         SelfAdjointEigenSolver<Matrix3d> solver(B);
         if (solver.info() != Success)

diff --git a/test/unit/filters/NormalFilterTest.cpp b/test/unit/filters/NormalFilterTest.cpp
@@ -72,9 +72,8 @@ TEST(NormalFilterTest, XYPlane)
     Dimension::Id nz = table.layout()->findDim("NormalZ");
     Dimension::Id c = table.layout()->findDim("Curvature");
 
-    for (point_count_t idx = 0; idx < outView->size(); ++idx)
+    for (auto const& p : *outView)
     {
-        PointRef p = outView->point(idx);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(nx), 0.0);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(ny), 0.0);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(nz), 1.0);
@@ -110,9 +109,8 @@ TEST(NormalFilterTest, XZPlane)
     Dimension::Id nz = table.layout()->findDim("NormalZ");
     Dimension::Id c = table.layout()->findDim("Curvature");
 
-    for (point_count_t idx = 0; idx < outView->size(); ++idx)
+    for (auto const& p : *outView)
     {
-        PointRef p = outView->point(idx);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(nx), 0.0);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(ny), 1.0);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(nz), 0.0);
@@ -148,9 +146,8 @@ TEST(NormalFilterTest, YZPlane)
     Dimension::Id nz = table.layout()->findDim("NormalZ");
     Dimension::Id c = table.layout()->findDim("Curvature");
 
-    for (point_count_t idx = 0; idx < outView->size(); ++idx)
+    for (auto const& p : *outView)
     {
-        PointRef p = outView->point(idx);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(nx), 1.0);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(ny), 0.0);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(nz), 0.0);
@@ -197,9 +194,8 @@ TEST(NormalFilterTest, RampPlane)
     Dimension::Id c = table.layout()->findDim("Curvature");
 
     double expected = std::sqrt(2.0) / 2.0;
-    for (point_count_t idx = 0; idx < outView->size(); ++idx)
+    for (auto const& p : *outView)
     {
-        PointRef p = outView->point(idx);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(nx), -expected);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(ny), 0.0);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(nz), expected);
@@ -246,9 +242,8 @@ TEST(NormalFilterTest, RampPlane2)
     Dimension::Id c = table.layout()->findDim("Curvature");
 
     double expected = std::sqrt(2.0) / 2.0;
-    for (point_count_t idx = 0; idx < outView->size(); ++idx)
+    for (auto const& p : *outView)
     {
-        PointRef p = outView->point(idx);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(nx), 0.0);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(ny), -expected);
         ASSERT_FLOAT_EQ(p.getFieldAs<float>(nz), expected);