From d2fdfed6bcb940a07d8b217ed589f1ff89aa7324 Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Sat, 24 Aug 2024 16:02:47 +0200 Subject: [PATCH] Changelog for release v1.6.1 --- CHANGELOG.md | 4 ++++ include/nanoflann.hpp | 12 +++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 140b5d2..a607b59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# nanoflann 1.6.1: Released Aug 24, 2024 + - Add conan install instructions. + - Add multiple thread kdtree build support for KDTreeEigenMatrixAdaptor ([PR #246](https://github.com/jlblancoc/nanoflann/pull/246)) + # nanoflann 1.6.0: Released Jul 11, 2024 - BUG FIX: nanoflann::SearchParameters::sorted was ignored for RadiusResultSet. - ResultSet classes now must implement a sort() method. diff --git a/include/nanoflann.hpp b/include/nanoflann.hpp index 3d41f27..ced16be 100644 --- a/include/nanoflann.hpp +++ b/include/nanoflann.hpp @@ -61,7 +61,7 @@ #include /** Library version: 0xMmP (M=Major,m=minor,P=patch) */ -#define NANOFLANN_VERSION 0x160 +#define NANOFLANN_VERSION 0x161 // Avoid conflicting declaration of min/max macros in Windows headers #if !defined(NOMINMAX) && \ @@ -157,7 +157,6 @@ inline typename std::enable_if::value, void>::type for (size_t i = 0; i < nElements; i++) c[i] = value; } - /** operator "<" for std::sort() */ struct IndexDist_Sorter { @@ -2620,8 +2619,7 @@ struct KDTreeEigenMatrixAdaptor explicit KDTreeEigenMatrixAdaptor( const Dimension dimensionality, const std::reference_wrapper& mat, - const int leaf_max_size = 10, - const unsigned int n_thread_build = 1) + const int leaf_max_size = 10, const unsigned int n_thread_build = 1) : m_data_matrix(mat) { const auto dims = row_major ? mat.get().cols() : mat.get().rows(); @@ -2635,9 +2633,9 @@ struct KDTreeEigenMatrixAdaptor "argument"); index_ = new index_t( dims, *this /* adaptor */, - nanoflann::KDTreeSingleIndexAdaptorParams(leaf_max_size, - nanoflann::KDTreeSingleIndexAdaptorFlags::None, - n_thread_build)); + nanoflann::KDTreeSingleIndexAdaptorParams( + leaf_max_size, nanoflann::KDTreeSingleIndexAdaptorFlags::None, + n_thread_build)); } public: