Vadim Pisarevsky
8539d424b2
Merge pull request #2071 from pemmanuelviel:LshOrthogonalSubvectors
2014-07-02 14:24:09 +00:00
Pierre-Emmanuel Viel
ec99f96c62
Add the ensureSimpleDistance() method to ensure the user the returned distance is not ^2 (the default for L2 for instance)
2014-05-21 13:16:12 +02:00
Pierre-Emmanuel Viel
2f8b5731da
Fix local variable shadowing
2014-05-21 12:27:38 +02:00
Pierre-Emmanuel Viel
00367cfb00
Merge remote-tracking branch 'upstream/2.4' into LshOrthogonalSubvectors
2014-05-21 01:31:52 +02:00
Pierre-Emmanuel Viel
e63d7de87c
Allows to choose orthogonal sub-vectors for LSH without using a static table among LshTable instances
2014-05-20 22:52:11 +02:00
1Hyena
6c118ebc51
Changed ostringstream to ostream for new print_params and added the old
...
version of print_params for backwards compatibility.
2014-05-12 23:01:44 +03:00
1Hyena
dfdb09386f
Autotuned_index now prints all info into logger instead of couting it.
2014-05-01 20:55:49 +03:00
Vadim Pisarevsky
6a5a0fe803
Merge pull request #2016 from pemmanuelviel:kmeansppSquareDist
2014-04-15 13:31:48 +04:00
Roman Donchenko
bfb1ba371c
Merge pull request #2026 from pemmanuelviel:giveFurthestPoint
2014-03-18 13:40:44 +04:00
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
2014-01-03 13:16:36 +01:00
Pierre-Emmanuel Viel
8e93c19de3
Fix a heap issue with static on Windows
2013-12-26 23:46:52 +01:00
Pierre-Emmanuel Viel
e85bacff7b
Avoid obtaining several identical dimensions between two LSH sub-vectors by choosing orthogonal sub-vectors.
2013-12-26 19:44:23 +01:00
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.
2013-12-20 01:00:55 +01:00
Pierre-Emmanuel Viel
92fc763925
Fix some memory leaks in HierarchicalClusteringIndex
2013-12-18 22:46:41 +01:00
Pierre-Emmanuel Viel
0d19685f95
Move templates in dist.h in order to share them between KMeansIndex and HierarchicalClusteringIndex classes.
2013-12-18 20:48:34 +01:00
Pierre-Emmanuel Viel
fa749de0dc
As some processed distances are already ^2, use template to select whether or not we have to ^2 in KMeanspp
2013-12-18 20:48:25 +01:00
Pierre-Emmanuel Viel
5aeeaa6fce
Apply to KMeansIndex KMeanspp the same modification as in HierarchicalClusteringIndex
2013-12-18 20:48:15 +01:00
Pierre-Emmanuel Viel
45e0e5f8e9
Pick centers in KMeans++ with a probability proportional to their distance^2, instead of simple distance, to previous centers
2013-12-18 20:48:02 +01:00
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.
2013-09-12 12:33:56 +04:00
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.
2013-09-04 14:06:34 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +04:00
Alexander Smorkalov
2243118fc0
NEON instruction set enabled for WIN32 on ARM by default.
2013-08-04 08:47:42 -07:00
Roman Donchenko
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
Andrey Kamaev
2665c39a0d
Fix build warnings from gcc 4.8
2013-05-13 17:07:30 +04:00
Alexander Smorkalov
6f68640d4d
Multiple fixes for WinRT
...
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
2013-03-26 17:19:52 -07:00
Ilya Lysenkov
098ea6fcb7
Checked key_size in LSH table for validness ( #2677 )
2013-01-31 23:19:19 +04:00
Ilya Lysenkov
1becbd9fcc
Added a test for invalid key sizes in LSH tables
2013-01-31 23:17:07 +04:00
Alexander Smorkalov
8cb0343f4c
Documentation build warning fixes.
...
Invalid links and refences fixed.
SpaeseMat class documentation updated.
2013-01-14 17:58:27 +04:00
Andrey Kamaev
40030d2ca0
Fix windows build warnings
2012-10-22 19:13:18 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
88e9a072ec
Fix binary compatibility of opencv_flann
2012-10-16 15:13:00 +04:00
Andrey Kamaev
a3b1971977
Bring back escaped virtual destructors from 2.4.2
2012-10-15 17:48:49 +04:00
Vadim Pisarevsky
d72cc06b96
fixed possibly inccorrect interval measurements in flann's timer (bug #1165 ). Note: this may break binary compatibility, but since the class is not wrapped in Java and not exposed in Windows API, for example (it's considered internal-use class for flann), the effect should be minimal
2012-10-11 22:40:37 +04:00
Andrey Kamaev
56b27bcc7e
Fix inconsistent argument type in HammingLUT distance (flann)
...
this fixes 64-bit MSVC warning
2012-10-10 00:31:22 +04:00
Vadim Pisarevsky
d54f4e1cfb
added #undef True/False to avoid collision with X11 (Patch #1562 )
2012-10-09 16:02:06 +04:00
Marius Muja
5cf6c5f0b2
Added test to fix backwards compatibility with the way LSH was handled before comit 7236858b
2012-09-28 10:40:38 -07:00
Marius Muja
7236858bea
Exposed HierarchicalClusteringIndex in OpenCV wrapper
2012-09-27 03:58:17 -07:00
Vadim Pisarevsky
0bd68a70f1
fixed #2297 , #2300 ; fixed several warnings
2012-08-28 13:45:35 +04:00
Alexander Mordvintesv
647b1dd96c
comment fixed
2012-08-07 23:19:13 +03:00
Alexander Mordvintesv
0998669d26
Revert "fixed LshIndex types in its constructor"
...
This reverts commit 54d68da8e7
2012-08-07 21:37:19 +03:00
Maria Dimashova
54d68da8e7
fixed LshIndex types in its constructor
2012-07-24 17:09:24 +04:00
Vincent Rabaud
3df72fe669
fix gcc C++11 bug mentioned in http://answers.opencv.org/question/283 . Bug also fixed in FLANN upstream
2012-07-12 16:02:02 +00:00
Vadim Pisarevsky
73ce3ef8c1
fixed ios framework build (ticket #2092 )
2012-06-27 19:52:59 +00:00
Andrey Kamaev
a381b95e91
Fixed buggy NEON check inside flann
2012-06-22 16:10:43 +00:00
Andrey Kamaev
e94e5866a1
Fixed mingw build warnings
2012-06-20 17:57:26 +00:00
Andrey Kamaev
d48d7b2b46
Updated warning options for GCC; fixed new warnings.
2012-06-20 12:27:02 +00:00
Andrey Kamaev
c5aba337e9
Fixed number of warnings. Fixed mingw64 build.
2012-06-12 14:46:12 +00:00
Alexander Mordvintsev
08b2bd9174
fixed #1974
2012-06-11 07:20:34 +00:00
