Changeset 36429 for trunk/psLib

Timestamp:

Jan 7, 2014, 4:23:07 PM (13 years ago)

Author:

watersc1

Message:

Better fix of the mixture model error. This should solve all of the various problems, as I've rewritten the offset/censor code.

File:

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

trunk/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) {
@@ -141 +147 @@
       for (int j = 0; j < out->numCols; j++) {
         out->data.F32[i][j] = in->data.F32[i + offsets->data.S32[i]][j];
+        fprintf(stderr,"%d %d %d %g %g\n",i,0,
+                offsets->data.S32[i],
+                out->data.F32[i][0],
+                in->data.F32[i][0]);
       }
     }