Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip building index when loading a tree from a file #171

Merged
merged 1 commit into from
May 15, 2022
Merged

Skip building index when loading a tree from a file #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion examples/saveload_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,11 @@ void kdtree_save_load_demo(const size_t N)
{
// Important: construct the index associated to the same dataset, since
// data points are NOT stored in the binary file.
// Note - set KDTreeSingleIndexAdaptor::SkipInitialBuildIndex, otherwise the tree
// builds an index that'll be overwritten via loadIndex
my_kd_tree_t index(
3 /*dim*/, cloud,
nanoflann::KDTreeSingleIndexAdaptorParams(10 /* max leaf */));
nanoflann::KDTreeSingleIndexAdaptorParams(10 /* max leaf */, nanoflann::KDTreeSingleIndexAdaptorFlags::SkipInitialBuildIndex));

std::ifstream f("index.bin", std::ofstream::binary);

Expand Down
19 changes: 16 additions & 3 deletions include/nanoflann.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,15 +648,26 @@ struct metric_SO3 : public Metric
/** @addtogroup param_grp Parameter structs
* @{ */

enum class KDTreeSingleIndexAdaptorFlags {
None = 0,
SkipInitialBuildIndex = 1
};

inline std::underlying_type<KDTreeSingleIndexAdaptorFlags>::type operator&(KDTreeSingleIndexAdaptorFlags lhs, KDTreeSingleIndexAdaptorFlags rhs) {
using underlying = typename std::underlying_type<KDTreeSingleIndexAdaptorFlags>::type;
return static_cast<underlying>(lhs) & static_cast<underlying>(rhs);
}

/** Parameters (see README.md) */
struct KDTreeSingleIndexAdaptorParams
{
KDTreeSingleIndexAdaptorParams(size_t _leaf_max_size = 10)
: leaf_max_size(_leaf_max_size)
KDTreeSingleIndexAdaptorParams(size_t _leaf_max_size = 10, KDTreeSingleIndexAdaptorFlags _flags = KDTreeSingleIndexAdaptorFlags::None)
: leaf_max_size(_leaf_max_size), flags(_flags)
{
}

size_t leaf_max_size;
KDTreeSingleIndexAdaptorFlags flags;
};

/** Search options for KDTreeSingleIndexAdaptor::findNeighbors() */
Expand Down Expand Up @@ -1353,7 +1364,9 @@ class KDTreeSingleIndexAdaptor
if (DIM > 0) BaseClassRef::dim = DIM;
BaseClassRef::m_leaf_max_size = params.leaf_max_size;

buildIndex();
if (!(index_params.flags & KDTreeSingleIndexAdaptorFlags::SkipInitialBuildIndex)) {
buildIndex();
}
}

/**
Expand Down