Changeset 7991 for trunk/psLib/src/math/psStats.c

Timestamp:

Jul 26, 2006, 5:52:15 PM (20 years ago)

Author:

Paul Price

Message:

Adding psStatsOptionFromString and psStatsOptionToString.

File:

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

trunk/psLib/src/math/psStats.c

@@ -16 +16 @@
  * use ->min and ->max (PS_STAT_USE_RANGE)
  *
- *  @version $Revision: 1.180 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-26 22:09:48 $
+ *  @version $Revision: 1.181 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-27 03:51:13 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -2126 +2126 @@
 }
 
-psStats *psStatsFromString(const char *string)
-{
-    psList *subStrings = psStringSplit(string, " ,;", false); // List of sub-strings
-    if (!subStrings || psListLength(subStrings) == 0) {
-        // Nothing here
-        psError(PS_ERR_BAD_PARAMETER_VALUE, false, "No string to parse for statistics: %s\n", string);
-        psFree(subStrings);
-        return NULL;
-    }
-    psStats *stats = psStatsAlloc(0);   // Generate empty stats structure
-    psListIterator *iterator = psListIteratorAlloc(subStrings, PS_LIST_HEAD, false); // Iterator
-    psString statString;                // Statistic string, from iteration
-
+psStatsOptions psStatsOptionFromString(const char *string)
+{
     #define READ_STAT(NAME, SYMBOL) \
-    if (strcasecmp(statString, NAME) == 0) { \
-        stats->options |= SYMBOL; \
-    }
-
-    while ((statString = psListGetAndIncrement(iterator))) {
-        // This might look a little weird if automatically formated,
-        // but it's legal C once the pre-processing has been done, and
-        // it reads a lot better than a whole heap of "if-then-else" statements.
-        READ_STAT("MEAN",     PS_STAT_SAMPLE_MEAN) else
-            READ_STAT("STDEV",    PS_STAT_SAMPLE_STDEV) else
-                READ_STAT("MEDIAN",   PS_STAT_SAMPLE_MEDIAN) else
-                    READ_STAT("QUARTILE", PS_STAT_SAMPLE_QUARTILE) else
-                        READ_STAT("SAMPLE_MEAN",     PS_STAT_SAMPLE_MEAN) else
-                            READ_STAT("SAMPLE_STDEV",    PS_STAT_SAMPLE_STDEV) else
-                                READ_STAT("SAMPLE_MEDIAN",   PS_STAT_SAMPLE_MEDIAN) else
-                                    READ_STAT("SAMPLE_QUARTILE", PS_STAT_SAMPLE_QUARTILE) else
-                                        READ_STAT("ROBUST",          PS_STAT_ROBUST_MEDIAN) else
-                                            READ_STAT("ROBUST_MEDIAN",   PS_STAT_ROBUST_MEDIAN) else
-                                                READ_STAT("ROBUST_STDEV",    PS_STAT_ROBUST_STDEV) else
-                                                    READ_STAT("ROBUST_QUARTILE", PS_STAT_ROBUST_QUARTILE) else
-                                                        READ_STAT("FITTED",       PS_STAT_FITTED_MEAN) else
-                                                            READ_STAT("FITTED_MEAN",  PS_STAT_FITTED_MEAN) else
-                                                                READ_STAT("FITTED_STDEV", PS_STAT_ROBUST_STDEV) else
-                                                                    READ_STAT("CLIPPED",       PS_STAT_CLIPPED_MEAN) else
-                                                                        READ_STAT("CLIPPED_MEAN",  PS_STAT_CLIPPED_MEAN) else
-                                                                            READ_STAT("CLIPPED_STDEV", PS_STAT_CLIPPED_STDEV) else {
-                                                                                psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Can't interpret string as statistic: %s\n",
-                                                                                        statString);
-                                                                                psFree(iterator);
-                                                                                psFree(subStrings);
-                                                                                psFree(stats);
-                                                                                return NULL;
-                                                                            }
-    }
-
-    psFree(iterator);
-    psFree(subStrings);
-    return stats;
-}
-
-psString psStatsToString(const psStats *stats)
+    if (strcasecmp(string, NAME) == 0) { \
+        return SYMBOL; \
+    }
+
+    READ_STAT("MEAN",     PS_STAT_SAMPLE_MEAN);
+    READ_STAT("STDEV",    PS_STAT_SAMPLE_STDEV);
+    READ_STAT("MEDIAN",   PS_STAT_SAMPLE_MEDIAN);
+    READ_STAT("QUARTILE", PS_STAT_SAMPLE_QUARTILE);
+    READ_STAT("SAMPLE_MEAN",     PS_STAT_SAMPLE_MEAN);
+    READ_STAT("SAMPLE_STDEV",    PS_STAT_SAMPLE_STDEV);
+    READ_STAT("SAMPLE_MEDIAN",   PS_STAT_SAMPLE_MEDIAN);
+    READ_STAT("SAMPLE_QUARTILE", PS_STAT_SAMPLE_QUARTILE);
+    READ_STAT("ROBUST",          PS_STAT_ROBUST_MEDIAN);
+    READ_STAT("ROBUST_MEDIAN",   PS_STAT_ROBUST_MEDIAN);
+    READ_STAT("ROBUST_STDEV",    PS_STAT_ROBUST_STDEV);
+    READ_STAT("ROBUST_QUARTILE", PS_STAT_ROBUST_QUARTILE);
+    READ_STAT("FITTED",       PS_STAT_FITTED_MEAN);
+    READ_STAT("FITTED_MEAN",  PS_STAT_FITTED_MEAN);
+    READ_STAT("FITTED_STDEV", PS_STAT_ROBUST_STDEV);
+    READ_STAT("CLIPPED",       PS_STAT_CLIPPED_MEAN);
+    READ_STAT("CLIPPED_MEAN",  PS_STAT_CLIPPED_MEAN);
+    READ_STAT("CLIPPED_STDEV", PS_STAT_CLIPPED_STDEV);
+
+    psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unable to parse statistic: %s\n", string);
+    return 0;
+}
+
+psString psStatsOptionToString(psStatsOptions option)
 {
     psString string = NULL;             // String to return
 
     #define WRITE_STAT(NAME, SYMBOL) \
-    if (stats->options & SYMBOL) { \
-        psStringAppend(&string, ",%s", NAME); \
+    if (option & SYMBOL) { \
+        psStringAppend(&string, "%s ", NAME); \
     }
 
@@ -2204 +2180 @@
     return string;
 }
+
+psStats *psStatsFromString(const char *string)
+{
+    psList *subStrings = psStringSplit(string, " ,;", false); // List of sub-strings
+    if (!subStrings || psListLength(subStrings) == 0) {
+        // Nothing here
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false, "No string to parse for statistics: %s\n", string);
+        psFree(subStrings);
+        return NULL;
+    }
+    psStats *stats = psStatsAlloc(0);   // Generate empty stats structure
+    psListIterator *iterator = psListIteratorAlloc(subStrings, PS_LIST_HEAD, false); // Iterator
+    psString statString;                // Statistic string, from iteration
+    while ((statString = psListGetAndIncrement(iterator))) {
+        psStatsOptions option = psStatsOptionFromString(statString);
+        if (option == 0) {
+            psLogMsg(__func__, PS_LOG_WARN, "Unable to interpret statistic option: %s --- ignored.\n",
+                     statString);
+            continue;
+        }
+        stats->options |= option;
+    }
+    psFree(iterator);
+    psFree(subStrings);
+    return stats;
+}
+
+psString psStatsToString(const psStats *stats)
+{
+    return psStatsOptionToString(stats->options);
+}