Merge pull request #2026 from pemmanuelviel:giveFurthestPoint

bfb1ba37 · Roman Donchenko · OpenCV Buildbot · a489d86e · d3ac1bc3 · bfb1ba37
Commit bfb1ba37 authored Mar 18, 2014 by Roman Donchenko Committed by OpenCV Buildbot Mar 18, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

kmeans_index.h modules/flann/include/opencv2/flann/kmeans_index.h +7 -4

No files found.
--- a/modules/flann/include/opencv2/flann/kmeans_index.h
+++ b/modules/flann/include/opencv2/flann/kmeans_index.h
@@ -759,10 +759,13 @@ private:
                    for (int k=0; k<indices_length; ++k) {
                        if (belongs_to[k]==j) {
-                            belongs_to[k] = i;
+                            // for cluster j, we move the furthest element from the center to the empty cluster i
-                            count[j]--;
+                            if ( distance_(dataset_[indices[k]], dcenters[j], veclen_) == radiuses[j] ) {
-                            count[i]++;
+                                belongs_to[k] = i;
-                            break;
+                                count[j]--;
+                                count[i]++;
+                                break;
+                            }
                        }
                    }
                    converged = false;