Changeset 37444

Timestamp:

Sep 29, 2014, 8:40:51 AM (12 years ago)

Author:

eugene

Message:

fix vstats to better handle combinations of weight and dvalue NULL or not

File:

• branches/eam_branches/ipp-20140904/Ohana/src/libohana/src/vstats.c (modified) (11 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/libohana/src/vstats.c

@@ -60 +60 @@
   int N20 = MAX (  0, 0.2*N);
 
-  if (weight) {
+  if (weight && dvalue) {
     dsortthree (value, dvalue, weight, N);
   } else {
     if (dvalue) {
       dsortpair (value, dvalue, N);
+    } else if (weight) {
+      dsortpair (value, weight, N);
     } else {
       dsort (value, N);
@@ -112 +114 @@
   // I'm actually just using chisq to get the correct sorting order
   if ((stats->statmode == VSTATS_CHI_INNER_MEAN) || (stats->statmode == VSTATS_CHI_INNER_WTMEAN)) {
+    if (!dvalue) myAbort ("invalid combination: Chisq-based mean, no dvalue provided");
     ALLOCATE (chi, double, N);
     for (i = 0; i < N; i++) {
@@ -128 +131 @@
   WeightedMean |= (stats->statmode == VSTATS_INNER_WTMEAN);
   WeightedMean |= (stats->statmode == VSTATS_CHI_INNER_WTMEAN);
+
+  if (WeightedMean && !dvalue) myAbort ("invalid combination: weighted mean, no dvalue provided");
 
   /* calculate stats based on the desired weighting scheme */
@@ -149 +154 @@
         M  += value[i] * weight[i];
         W  +=            weight[i];
-        dM += SQ (weight[i] * dvalue[i]);
+        dM += dvalue ? SQ (weight[i] * dvalue[i]) : 0.0;
         R  += weight[i];
         Nm += 1.0;  
       } 
       Mo  = M / W;
-      dMo = sqrt (dM) / R;
+      dMo = dvalue ? sqrt (dM) / R : NAN;
     }
   } else {
@@ -171 +176 @@
       for (i = ks; i < ke; i++) {
         M   += value[i];
-        dM  += SQ (dvalue[i]);
+        dM  += dvalue ? SQ (dvalue[i]) : 0.0;
         Nm  += 1.0;  
       } 
       Mo = M / Nm;
-      dMo = sqrt (dM) / Nm;
+      dMo = dvalue ? sqrt (dM) / Nm : NAN;
     }
   }
@@ -244 +249 @@
   int N20 = MAX (  0, 0.2*N);
 
-  if (weight) {
+  if (weight && dvalue) {
     fsortthree (value, dvalue, weight, N);
   } else {
     if (dvalue) {
       fsortpair (value, dvalue, N);
+    } else if (weight) {
+      fsortpair (value, weight, N);
     } else {
       fsort (value, N);
@@ -296 +303 @@
   // I'm actually just using chisq to get the correct sorting order
   if ((stats->statmode == VSTATS_CHI_INNER_MEAN) || (stats->statmode == VSTATS_CHI_INNER_WTMEAN)) {
+    if (!dvalue) myAbort ("invalid combination: Chisq-based mean, no dvalue provided");
     ALLOCATE (chi, float, N);
     for (i = 0; i < N; i++) {
@@ -312 +320 @@
   WeightedMean |= (stats->statmode == VSTATS_INNER_WTMEAN);
   WeightedMean |= (stats->statmode == VSTATS_CHI_INNER_WTMEAN);
+
+  if (WeightedMean && !dvalue) myAbort ("invalid combination: weighted mean, no dvalue provided");
 
   /* calculate stats based on the desired weighting scheme */
@@ -333 +343 @@
         M  += value[i] * weight[i];
         W  +=            weight[i];
-        dM += SQ (weight[i] * dvalue[i]);
+        dM += dvalue ? SQ (weight[i] * dvalue[i]) : 0.0;
         R  += weight[i];
         Nm += 1.0;  
       } 
       Mo  = M / W;
-      dMo = sqrt (dM) / R;
+      dMo = dvalue ? sqrt (dM) / R : NAN;
     }
   } else {
@@ -355 +365 @@
       for (i = ks; i < ke; i++) {
         M   += value[i];
-        dM  += SQ (dvalue[i]);
+        dM  += dvalue ? SQ (dvalue[i]) : 0.0;
         Nm  += 1.0;  
       } 
       Mo = M / Nm;
-      dMo = sqrt (dM) / Nm;
+      dMo = dvalue ? sqrt (dM) / Nm : NAN;
     }
   }
@@ -368 +378 @@
   for (i = ks; i < ke; i++) {
     M  = SQ (value[i] - Mo);
-    dM = SQ (dvalue[i]);
+    dM = dvalue ? SQ (dvalue[i]) : 1.0;
     X2 += M / dM;
     dS += M;
   }
-  X2 = X2 / (Nm - 1);
+  X2 = dvalue ? X2 / (Nm - 1) : NAN;
   dS = sqrt (dS / (Nm - 1));