mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-25 13:41:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18062 from pemmanuelviel:pev-multiple-kmeans-trees

Browse Source
This commit is contained in:
Alexander Alekhin 2020-08-10 20:25:49 +00:00
commit c3ced6db4e
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/flann/include/opencv2/flann.hpp
View File

@ -220,14 +220,8 @@ public:
int branching = 32, int branching = 32,
int iterations = 11, int iterations = 11,
flann_centers_init_t centers_init = CENTERS_RANDOM, flann_centers_init_t centers_init = CENTERS_RANDOM,
float cb_index = 0.2 ); float cb_index = 0.2,
int trees = 1);
KMeansIndexParams(
int branching,
int iterations,
flann_centers_init_t centers_init,
float cb_index,
int trees );
}; };
@endcode @endcode
- **CompositeIndexParams** When using a parameters object of this type the index created - **CompositeIndexParams** When using a parameters object of this type the index created

17
modules/flann/include/opencv2/flann/kmeans_index.h
View File

@ -57,8 +57,9 @@ namespace cvflann
struct KMeansIndexParams : public IndexParams struct KMeansIndexParams : public IndexParams
{ {
void indexParams(int branching, int iterations, KMeansIndexParams(int branching = 32, int iterations = 11,
flann_centers_init_t centers_init, float cb_index, int trees) flann_centers_init_t centers_init = FLANN_CENTERS_RANDOM,
float cb_index = 0.2, int trees = 1 )
{ {
(*this)["algorithm"] = FLANN_INDEX_KMEANS; (*this)["algorithm"] = FLANN_INDEX_KMEANS;
// branching factor // branching factor
@ -72,18 +73,6 @@ struct KMeansIndexParams : public IndexParams
// number of kmeans trees to search in // number of kmeans trees to search in
(*this)["trees"] = trees; (*this)["trees"] = trees;
} }
KMeansIndexParams(int branching = 32, int iterations = 11,
flann_centers_init_t centers_init = FLANN_CENTERS_RANDOM, float cb_index = 0.2 )
{
indexParams(branching, iterations, centers_init, cb_index, 1);
}
KMeansIndexParams(int branching, int iterations,
flann_centers_init_t centers_init, float cb_index, int trees)
{
indexParams(branching, iterations, centers_init, cb_index, trees);
}
}; };