Changeset 36437 for branches/bills_branches/bills_201312/psLib/src/math/psMixtureModels.c

Timestamp:

Jan 14, 2014, 1:05:35 PM (13 years ago)

Author:

bills

Message:

updates from the trunk

File:

• branches/bills_branches/bills_201312/psLib/src/math/psMixtureModels.c (modified) (4 diffs)

branches/bills_branches/bills_201312/psLib/src/math/psMixtureModels.c

@@ -120 +120 @@
   *Ncensored = 0;
 
+  int k = 0;
   for (int i = 0; i < in->numRows; i++) {
     int isCensored = 0;
@@ -130 +131 @@
       *Ncensored = *Ncensored + 1;
     }
-    offsets->data.S32[i] = *Ncensored;
-  }
+    else {
+      offsets->data.S32[k] = i - k;
+      k++;
+    }
+    //    offsets->data.S32[i] = isCensored;
+  }
+
   psImage *out;
   if (*Ncensored == 0) {
@@ -320 +326 @@
         }
       }
-      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 +343 @@
     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];
+        }
       }
     }