Changeset 36428

Timestamp:

Jan 7, 2014, 1:22:56 PM (13 years ago)

Author:

watersc1

Message:

Check for bad modes (mode = -1) in kmeans code. I suspect htis happens when the inputs are non-finite, or at least very very bad.

File:

• trunk/psLib/src/math/psMixtureModels.c (modified) (2 diffs)

trunk/psLib/src/math/psMixtureModels.c

@@ -320 +320 @@
         }
       }
-      i = modes->data.F32[k];
-      counts->data.F32[i] += 1.0;
+      if (modes->data.F32[k] != -1) {
+        i = modes->data.F32[k];
+        counts->data.F32[i] += 1.0;
+      }
     }
 
@@ -335 +337 @@
     for (k = 0; k < N; k++) {
       i = modes->data.F32[k];
-      for (j = 0; j < dim; j++) {
-        means->data.F32[i][j] += D->data.F32[k][j];
+      if (i != -1) {
+        for (j = 0; j < dim; j++) {
+          means->data.F32[i][j] += D->data.F32[k][j];
+        }
       }
     }