Changeset 20514

Timestamp:

Nov 3, 2008, 2:54:12 PM (18 years ago)

Author:

Paul Price

Message:

Catch !string.

File:

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

trunk/psLib/src/math/psStats.c

@@ -13 +13 @@
  * use ->min and ->max (PS_STAT_USE_RANGE)
  *
- *  @version $Revision: 1.228 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-08-03 20:54:43 $
+ *  @version $Revision: 1.229 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-11-04 00:54:12 $
  *
  *  Copyright 2006 IfA, University of Hawaii
@@ -651 +651 @@
         // b) compute new mean and stdev
         // Allocate a psStats structure for calculating the mean and stdev.
-        // XXX Can we just use this psStats structure to calculate the SAMPLE MEAN and STDEV?
+        // XXX Can we just use this psStats structure to calculate the SAMPLE MEAN and STDEV?
         // psStats *statsTmp = psStatsAlloc(PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV);
         // vectorSampleMean(myVector, errors, tmpMask, maskVal, statsTmp);
@@ -932 +932 @@
             for (long i = 0 ; i < myVector->n ; i++) {
                 if ((myVector->data.F32[i] < medianLo) || (myVector->data.F32[i] > medianHi)) {
-                    // XXXX is this correct?  is MASK_MARK safe?
+                    // XXXX is this correct?  is MASK_MARK safe?
                     mask->data.U8[i] |= MASK_MARK;
                     psTrace(TRACE, 6, "Masking element %ld is %f\n", i, myVector->data.F32[i]);
@@ -2381 +2381 @@
 psStatsOptions psStatsOptionFromString(const char *string)
 {
+    PS_ASSERT_STRING_NON_EMPTY(string, PS_STAT_NONE);
+
 #define READ_STAT(NAME, SYMBOL) \
     if (strcasecmp(string, NAME) == 0) { \
@@ -2419 +2421 @@
 
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unable to parse statistic: %s\n", string);
-    return 0;
+    return PS_STAT_NONE;
 }