Changeset 19944

Timestamp:

Oct 7, 2008, 9:57:23 AM (18 years ago)

Author:

eugene

Message:

add SUM, UQ, LQ stats

File:

• trunk/ppStats/src/ppStatsFromMetadataStats.c (modified) (2 diffs)

trunk/ppStats/src/ppStatsFromMetadataStats.c

@@ -3 +3 @@
 // calculate the stats for the non-constant entries (already calculated)
 bool ppStatsFromMetadataStats (psArray *entries) {
+
+    double value;
 
     for (int i = 0; i < entries->n; i++) {
@@ -13 +15 @@
 
         psStatsOptions option;
-        if (!strcasecmp (entry->statistic, "rms")) {
+        if (!strcasecmp (entry->statistic, "RMS")) {
             option = psStatsOptionFromString ("ROBUST_MEDIAN");
-        } else {
-            option = psStatsOptionFromString (entry->statistic);
-        }
+            goto got_stats;
+        } 
+        if (!strcasecmp (entry->statistic, "SUM")) {
+            option = psStatsOptionFromString ("SAMPLE_MEAN");
+            goto got_stats;
+        } 
+        if (!strcasecmp (entry->statistic, "UQ")) {
+            option = psStatsOptionFromString ("ROBUST_QUARTILE");
+            goto got_stats;
+        } 
+        if (!strcasecmp (entry->statistic, "LQ")) {
+            option = psStatsOptionFromString ("ROBUST_QUARTILE");
+            goto got_stats;
+        } 
+
+        option = psStatsOptionFromString (entry->statistic);
         
+    got_stats:
         psStats *stats = psStatsAlloc (option);
 
         psVectorStats (stats, entry->vector, NULL, NULL, 0);
 
+        if (!strcasecmp (entry->statistic, "RMS")) {
+            value = sqrt(value);
+            goto got_value;
+        } 
+        if (!strcasecmp (entry->statistic, "SUM")) {
+            value = stats->sampleMean * entry->vector->n;
+            goto got_value;
+        } 
+        if (!strcasecmp (entry->statistic, "UQ")) {
+            value = stats->robustUQ;
+            goto got_value;
+        } 
+        if (!strcasecmp (entry->statistic, "LQ")) {
+            value = stats->robustLQ;
+            goto got_value;
+        } 
+
         double value = psStatsGetValue (stats, option);
 
-        if (!strcasecmp (entry->statistic, "rms")) {
-            value = sqrt(value);
-        }
-
+    got_value:
         entry->value = psMetadataItemAllocF32 (entry->keyword, entry->statistic, value);
     }