Skip to content

Commit d2fdfed

Browse files
committed
Changelog for release v1.6.1
1 parent ca526eb commit d2fdfed

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# nanoflann 1.6.1: Released Aug 24, 2024
2+
- Add conan install instructions.
3+
- Add multiple thread kdtree build support for KDTreeEigenMatrixAdaptor ([PR #246](https://github.com/jlblancoc/nanoflann/pull/246))
4+
15
# nanoflann 1.6.0: Released Jul 11, 2024
26
- BUG FIX: nanoflann::SearchParameters::sorted was ignored for RadiusResultSet.
37
- ResultSet classes now must implement a sort() method.

include/nanoflann.hpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#include <vector>
6262

6363
/** Library version: 0xMmP (M=Major,m=minor,P=patch) */
64-
#define NANOFLANN_VERSION 0x160
64+
#define NANOFLANN_VERSION 0x161
6565

6666
// Avoid conflicting declaration of min/max macros in Windows headers
6767
#if !defined(NOMINMAX) && \
@@ -157,7 +157,6 @@ inline typename std::enable_if<!has_assign<Container>::value, void>::type
157157
for (size_t i = 0; i < nElements; i++) c[i] = value;
158158
}
159159

160-
161160
/** operator "<" for std::sort() */
162161
struct IndexDist_Sorter
163162
{
@@ -2620,8 +2619,7 @@ struct KDTreeEigenMatrixAdaptor
26202619
explicit KDTreeEigenMatrixAdaptor(
26212620
const Dimension dimensionality,
26222621
const std::reference_wrapper<const MatrixType>& mat,
2623-
const int leaf_max_size = 10,
2624-
const unsigned int n_thread_build = 1)
2622+
const int leaf_max_size = 10, const unsigned int n_thread_build = 1)
26252623
: m_data_matrix(mat)
26262624
{
26272625
const auto dims = row_major ? mat.get().cols() : mat.get().rows();
@@ -2635,9 +2633,9 @@ struct KDTreeEigenMatrixAdaptor
26352633
"argument");
26362634
index_ = new index_t(
26372635
dims, *this /* adaptor */,
2638-
nanoflann::KDTreeSingleIndexAdaptorParams(leaf_max_size,
2639-
nanoflann::KDTreeSingleIndexAdaptorFlags::None,
2640-
n_thread_build));
2636+
nanoflann::KDTreeSingleIndexAdaptorParams(
2637+
leaf_max_size, nanoflann::KDTreeSingleIndexAdaptorFlags::None,
2638+
n_thread_build));
26412639
}
26422640

26432641
public:

0 commit comments

Comments
 (0)