Removed support for L2 due to updated query.

Author: Jaybro

examples/pico_understory/CMakeLists.txt

@@ -5,4 +5,5 @@ target_link_libraries(pico_understory INTERFACE PicoTree::PicoTree)
 target_sources(pico_understory
     INTERFACE
         ${CMAKE_CURRENT_LIST_DIR}/pico_understory/cover_tree.hpp
+        ${CMAKE_CURRENT_LIST_DIR}/pico_understory/metric.hpp
 )

examples/pico_understory/pico_understory/cover_tree.hpp

@@ -4,9 +4,10 @@
 #include <numeric>
 #include <pico_tree/internal/memory.hpp>
 #include <pico_tree/internal/search_visitor.hpp>
-#include <pico_tree/metric.hpp>
 #include <random>
 
+#include "metric.hpp"
+
 // Use this define to enable a simplified version of the nearest ancestor tree
 // or disable it to use the regular one from "Faster Cover Trees".
 //

examples/pico_understory/pico_understory/metric.hpp

@@ -0,0 +1,40 @@
+#pragma once
+
+#include <pico_tree/metric.hpp>
+
+namespace pico_tree {
+
+//! \brief L2 metric for measuring Euclidean distances between points.
+//! \details https://en.wikipedia.org/wiki/Euclidean_distance
+//! \see L1
+template <typename Traits>
+class L2 {
+ private:
+  using Scalar = typename Traits::ScalarType;
+
+ public:
+  //! \brief Calculates the distance between points \p p0 and \p p1.
+  //! \tparam P0 Point type.
+  //! \tparam P1 Point type.
+  //! \param p0 Point.
+  //! \param p1 Point.
+  template <typename P0, typename P1>
+  // The enable_if is not required but it forces implicit casts which are
+  // handled by operator()(Scalar, Scalar).
+  inline typename std::enable_if<
+      !std::is_fundamental<P0>::value && !std::is_fundamental<P1>::value,
+      Scalar>::type
+  operator()(P0 const& p0, P1 const& p1) const {
+    return std::sqrt(internal::Sum<Traits, internal::SqrdDiff>::Op(p0, p1));
+  }
+
+  //! \brief Calculates the distance between two coordinates.
+  inline Scalar operator()(Scalar const x, Scalar const y) const {
+    return std::abs(x - y);
+  }
+
+  //! \brief Returns the absolute value of \p x.
+  inline Scalar operator()(Scalar const x) const { return std::abs(x); }
+};
+
+}  // namespace pico_tree

src/pico_tree/pico_tree/metric.hpp

@@ -88,39 +88,6 @@ class L1 {
   inline Scalar operator()(Scalar const x) const { return std::abs(x); }
 };
 
-//! \brief L2 metric for measuring Euclidean distances between points.
-//! \details https://en.wikipedia.org/wiki/Euclidean_distance
-//! \see L1
-template <typename Traits>
-class L2 {
- private:
-  using Scalar = typename Traits::ScalarType;
-
- public:
-  //! \brief Calculates the distance between points \p p0 and \p p1.
-  //! \tparam P0 Point type.
-  //! \tparam P1 Point type.
-  //! \param p0 Point.
-  //! \param p1 Point.
-  template <typename P0, typename P1>
-  // The enable_if is not required but it forces implicit casts which are
-  // handled by operator()(Scalar, Scalar).
-  inline typename std::enable_if<
-      !std::is_fundamental<P0>::value && !std::is_fundamental<P1>::value,
-      Scalar>::type
-  operator()(P0 const& p0, P1 const& p1) const {
-    return std::sqrt(internal::Sum<Traits, internal::SqrdDiff>::Op(p0, p1));
-  }
-
-  //! \brief Calculates the distance between two coordinates.
-  inline Scalar operator()(Scalar const x, Scalar const y) const {
-    return std::abs(x - y);
-  }
-
-  //! \brief Returns the absolute value of \p x.
-  inline Scalar operator()(Scalar const x) const { return std::abs(x); }
-};
-
 //! \brief The L2Squared semimetric measures squared Euclidean distances between
 //! points. It does not satisfy the triangle inequality.
 //! \see L1

test/pico_tree/metric_test.cpp

@@ -2,6 +2,7 @@
 
 #include <pico_toolshed/point.hpp>
 #include <pico_tree/metric.hpp>
+#include <pico_understory/metric.hpp>
 
 using PointX = Point2f;
 using SpaceX = std::vector<PointX>;