Pass vectors as const ref in case they might be large.

PDAL · Apr 23, 2018 · 545a440 · 545a440
1 parent 6f5115b
commit 545a440
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/pdal/EigenUtils.cpp b/pdal/EigenUtils.cpp
@@ -52,7 +52,8 @@ namespace pdal
 namespace eigen
 {
 
-Eigen::Vector3d computeCentroid(PointView& view, std::vector<PointId> ids)
+Eigen::Vector3d computeCentroid(PointView& view,
+    const std::vector<PointId>& ids)
 {
     using namespace Eigen;
 
@@ -80,7 +81,8 @@ Eigen::Vector3d computeCentroid(PointView& view, std::vector<PointId> ids)
     return centroid;
 }
 
-Eigen::Matrix3f computeCovariance(PointView& view, std::vector<PointId> ids)
+Eigen::Matrix3f computeCovariance(PointView& view,
+    const std::vector<PointId>& ids)
 {
     using namespace Eigen;
 
@@ -102,7 +104,8 @@ Eigen::Matrix3f computeCovariance(PointView& view, std::vector<PointId> ids)
     return A * A.transpose() / (ids.size()-1);
 }
 
-uint8_t computeRank(PointView& view, std::vector<PointId> ids, double threshold)
+uint8_t computeRank(PointView& view, const std::vector<PointId>& ids,
+    double threshold)
 {
     using namespace Eigen;
 

diff --git a/pdal/EigenUtils.hpp b/pdal/EigenUtils.hpp
@@ -76,7 +76,7 @@ namespace eigen
   \return the 3D centroid of the XYZ dimensions.
 */
 PDAL_DLL Eigen::Vector3d computeCentroid(PointView& view,
-        std::vector<PointId> ids);
+    const std::vector<PointId>& ids);
 
 /**
   Compute the covariance matrix of a collection of points.
@@ -101,7 +101,7 @@ PDAL_DLL Eigen::Vector3d computeCentroid(PointView& view,
   \return the covariance matrix of the XYZ dimensions.
 */
 PDAL_DLL Eigen::Matrix3f computeCovariance(PointView& view,
-        std::vector<PointId> ids);
+    const std::vector<PointId>& ids);
 
 /**
   Compute second derivative in X direction using central difference method.
@@ -232,7 +232,7 @@ PDAL_DLL Eigen::MatrixXd cleanDSM(Eigen::MatrixXd data);
   \param ids a vector of PointIds specifying a subset of points.
   \return the estimated rank.
 */
-PDAL_DLL uint8_t computeRank(PointView& view, std::vector<PointId> ids,
+PDAL_DLL uint8_t computeRank(PointView& view, const std::vector<PointId>& ids,
                              double threshold);
 
 /**

diff --git a/pdal/PointView.hpp b/pdal/PointView.hpp
@@ -46,7 +46,6 @@
 #include <memory>
 #include <queue>
 #include <set>
-#include <vector>
 #include <deque>
 
 #pragma warning(disable: 4244)  // conversion from 'type1' to 'type2', possible loss of data