Merge pull request #2 from Jaybro/eigen_adaptor

eigen_adaptor.hpp is now part of the library.
Jaybro · Oct 24, 2020 · 651bd13 · 651bd13
2 parents 472180a + 64170c9
commit 651bd13
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/examples/eigen/eigen.cpp b/examples/eigen/eigen.cpp
@@ -1,10 +1,9 @@
 #include <Eigen/Dense>
+#include <pico_tree/eigen_adaptor.hpp>
 #include <pico_tree/kd_tree.hpp>
 #include <point.hpp>
 #include <scoped_timer.hpp>
 
-#include "eigen_adaptor.hpp"
-
 using Index = int;
 using Scalar = double;
 

diff --git a/examples/eigen/eigen_adaptor.hpp → src/pico_tree/eigen_adaptor.hpp b/examples/eigen/eigen_adaptor.hpp → src/pico_tree/eigen_adaptor.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <Eigen/Dense>
-
 namespace pico_tree {
 
 namespace internal {
@@ -26,9 +24,8 @@ class EigenAdaptorBase<Index_, EigenMatrix, false> {
   }
 
   //! Returns dimension \p dim of point \p point.
-  template <typename Derived>
-  inline Scalar operator()(
-      Eigen::MatrixBase<Derived> const& point, Index const dim) const {
+  template <typename Point>
+  inline Scalar operator()(Point const& point, Index const dim) const {
     return point(dim);
   }
 
@@ -59,9 +56,8 @@ class EigenAdaptorBase<Index_, EigenMatrix, true> {
   }
 
   //! Returns dimension \p dim of point \p point.
-  template <typename Derived>
-  inline Scalar operator()(
-      Eigen::MatrixBase<Derived> const& point, Index const dim) const {
+  template <typename Point>
+  inline Scalar operator()(Point const& point, Index const dim) const {
     return point(dim);
   }