Roman Donchenko
c2f59a0f73
flann: fix AutotunedIndex crashing if a KDTree index is selected
...
Backport of mariusmuja/flann@f8ca6df3.
10 years ago
Thomas Gabrowski
63dbeeaac5
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
...
Conflicts:
modules/contrib/include/opencv2/contrib/retina.hpp
10 years ago
ippei ito
7d665a4754
Fix warn conversion from 'size_t' to 'int'. add comment for doxygen
10 years ago
ippei ito
f7d52c774e
Fix compile error on linux change cv::InputArray& to cv::InputArray
10 years ago
ippei ito
8efdfd9dfc
Fix unused-parameter Warning
10 years ago
ippei ito
cd42e38013
FlannBasedMatcher(LshIndex) in the feature2d optimization for continuance additional train()
...
Current implementation of miniflann is releasing the trained index, and
rebuilding the index from the beginning.
But, some indexing algorithms like the LSH are able to add the indexing
data after that.
This branch is implementation of that optimization for LshIndex
FlannBasedMatcher in the feature2d.
10 years ago
Maksim Shabunin
37c74e38f4
Python support
10 years ago
Thomas Gabrowski
ff4c42d182
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
10 years ago
Alexander Karsakov
c481e06e87
Fixed getPolicy() method to make it thread-safe.
...
(cherry picked from commit 8910508b83
)
10 years ago
Maksim Shabunin
d01bedbc61
Removed Sphinx documentation files
10 years ago
Andrey Kamaev
c105b72945
Assorted fixes:
...
* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
10 years ago
Maksim Shabunin
91e21847e2
Some changes to make migration to 3.0 easier
10 years ago
Maksim Shabunin
1523fdcc1c
Doxygen documentation: more fixes and cleanups
10 years ago
Maksim Shabunin
472c210687
Doxygen documentation: flann, photo and stitching modules
10 years ago
Takahiro Poly Horikawa
553bb7956e
Fix "assignment operator could not be generated" warnings
10 years ago
Takahiro Poly Horikawa
180e54d09d
- Use cv::Mutex to safely update converged flag
...
- Use cv::AutoBuffer rather than new allocation
- Fix "assignment operator could not be generated" warning
10 years ago
Takahiro Poly Horikawa
123ca7e1c5
Parallize building kmeans index in flann
10 years ago
Maksim Shabunin
9b55c09999
Basic doxygen documentation support
...
- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
Conflicts:
CMakeLists.txt
doc/CMakeLists.txt
modules/core/include/opencv2/core.hpp
modules/core/include/opencv2/core/base.hpp
modules/core/include/opencv2/core/cuda.inl.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/matx.hpp
modules/core/include/opencv2/core/types.hpp
modules/flann/include/opencv2/flann/lsh_table.h
modules/imgproc/include/opencv2/imgproc.hpp
10 years ago
Maksim Shabunin
ba5f343c38
Basic doxygen documentation support
...
- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
10 years ago
Adil Ibragimov
8a4a1bb018
Several type of formal refactoring:
...
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
10 years ago
Maksim Shabunin
f908c2b0e3
Revert "Avoid obtaining several identical dimensions between two LSH sub-vectors by choosing orthogonal sub-vectors."
...
This reverts commit e85bacff7b
.
10 years ago
Maksim Shabunin
032c363ea0
Revert "Fix a heap issue with static on Windows"
...
This reverts commit 8e93c19de3
.
10 years ago
Maksim Shabunin
0be18aca81
Revert "Allows to choose orthogonal sub-vectors for LSH without using a static table among LshTable instances"
...
This reverts commit e63d7de87c
.
10 years ago
Maksim Shabunin
4c54b287e4
Revert "Fix local variable shadowing"
...
This reverts commit 2f8b5731da
.
10 years ago
Pierre-Emmanuel Viel
ec99f96c62
Add the ensureSimpleDistance() method to ensure the user the returned distance is not ^2 (the default for L2 for instance)
11 years ago
Pierre-Emmanuel Viel
2f8b5731da
Fix local variable shadowing
11 years ago
Pierre-Emmanuel Viel
e63d7de87c
Allows to choose orthogonal sub-vectors for LSH without using a static table among LshTable instances
11 years ago
1Hyena
6c118ebc51
Changed ostringstream to ostream for new print_params and added the old
...
version of print_params for backwards compatibility.
11 years ago
1Hyena
dfdb09386f
Autotuned_index now prints all info into logger instead of couting it.
11 years ago
Adil Ibragimov
3bd364fce3
fixing accum_dist and operator() mismatching for HellingerDistance and KL_Divergence
11 years ago
Alexander Karsakov
8910508b83
Fixed getPolicy() method to make it thread-safe.
11 years ago
gleb.sternharz
f85aa929f1
fix dev by 0 in KL-Divergence
11 years ago
Pierre-Emmanuel Viel
cdea6b532f
Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified
...
(cherry picked from commit 3f458c6eb1
)
11 years ago
Ilya Lavrenov
37789f015a
deleted excess semicolons, commas
11 years ago
Pierre-Emmanuel Viel
3f458c6eb1
Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified
11 years ago
Pierre-Emmanuel Viel
8e93c19de3
Fix a heap issue with static on Windows
11 years ago
Pierre-Emmanuel Viel
e85bacff7b
Avoid obtaining several identical dimensions between two LSH sub-vectors by choosing orthogonal sub-vectors.
11 years ago
Pierre-Emmanuel Viel
112d63ae96
Add a new method for initializing KMeans centers that leads to better clusters and thus better retrieval when final centers have to be existing keypoints instead of clusters barycenters.
11 years ago
berak
2bb3de5aa0
core/utility.hpp missing in flann/timer.h
11 years ago
Pierre-Emmanuel Viel
d3ac1bc314
When a cluster is empty for KMeans, it's better to give it the point from another cluster j that is the furthest one from center j.
11 years ago
Pierre-Emmanuel Viel
92fc763925
Fix some memory leaks in HierarchicalClusteringIndex
11 years ago
Pierre-Emmanuel Viel
0d19685f95
Move templates in dist.h in order to share them between KMeansIndex and HierarchicalClusteringIndex classes.
11 years ago
Pierre-Emmanuel Viel
fa749de0dc
As some processed distances are already ^2, use template to select whether or not we have to ^2 in KMeanspp
11 years ago
Pierre-Emmanuel Viel
5aeeaa6fce
Apply to KMeansIndex KMeanspp the same modification as in HierarchicalClusteringIndex
11 years ago
Pierre-Emmanuel Viel
45e0e5f8e9
Pick centers in KMeans++ with a probability proportional to their distance^2, instead of simple distance, to previous centers
11 years ago
Roman Donchenko
58da54cb7a
Cherry-picked mariusmuja/flann@8c8b0e0cb879666797ab2ac51b9ee438bf84a183.
...
Original author: me.
11 years ago
Roman Donchenko
4c19e0273a
Cherry-picked mariusmuja/flann@b615f2694723fe402b8bbe50d77e622beff7f171.
...
Original author: Alex Wilson.
11 years ago
Roman Donchenko
78c4ffec99
Revert "Fixed a bug in FLANN resulting in uninitialized accesses."
...
This reverts commit a9975b144a
, to prepare
for cherry-picking upstream's solution.
11 years ago
Roman Donchenko
fec697b390
Silenced a few -Wcast-align warnings in the headers.
...
We don't use -Wcast-align ourselves, but the headers trigger warnings
for those users who do, which is not nice.
11 years ago
Roman Donchenko
a9975b144a
Fixed a bug in FLANN resulting in uninitialized accesses.
...
This is fixed upstream in mariusmuja/flann@b615f26, but that fix
would break binary compatibility, so I had to make a different one.
Since the bug isn't quite obvious, here's an explanation. In the const
version of any::cast, if policy is a small_any_policy, its get_value
returns its input argument. So r becomes a pointer to obj, and the
return value is a reference to a local variable, which is invalidated
when the function exits.
11 years ago