Skip to content

Commit

Permalink
Changelog for release v1.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jlblancoc committed Aug 24, 2024
1 parent ca526eb commit d2fdfed
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
12 changes: 5 additions & 7 deletions include/nanoflann.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#include <vector>

/** 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) && \
Expand Down Expand Up @@ -157,7 +157,6 @@ inline typename std::enable_if<!has_assign<Container>::value, void>::type
for (size_t i = 0; i < nElements; i++) c[i] = value;
}


/** operator "<" for std::sort() */
struct IndexDist_Sorter
{
Expand Down Expand Up @@ -2620,8 +2619,7 @@ struct KDTreeEigenMatrixAdaptor
explicit KDTreeEigenMatrixAdaptor(
const Dimension dimensionality,
const std::reference_wrapper<const MatrixType>& 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();
Expand All @@ -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:
Expand Down

0 comments on commit d2fdfed

Please sign in to comment.