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

Timestamp:

Nov 10, 2004, 12:43:48 PM (22 years ago)

Author:

gusciora

Message:

...

File:

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

trunk/psLib/src/math/psStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.85 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-04 01:04:59 $
+ *  @version $Revision: 1.86 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-10 22:43:48 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -55 +55 @@
 psVector* p_psConvertToF32(psVector* in);
 
-int p_psVectorRobustStats(const psVector* restrict myVector,
-                          const psVector* restrict maskVector,
-                          psU32 maskVal,
-                          psStats* stats);
 /*****************************************************************************/
 /* GLOBAL VARIABLES                                                          */
@@ -129 +125 @@
 
 /******************************************************************************
- ******************************************************************************
- ******************************************************************************
     MISC PRIVATE STATISTICAL FUNCTIONS
  
@@ -141 +135 @@
         Is the in data structure NULL?
         Is the in data structure of type PS_TYPE_F32?
- ******************************************************************************
- ******************************************************************************
- *****************************************************************************/
-
+ 
+ *****************************************************************************/
 /******************************************************************************
 p_psVectorSampleMean(myVector, maskVector, maskVal, stats): calculates the
@@ -155 +147 @@
 Returns
     NULL
-ASSUMPTION: the mean is always calculated exactly.  Robust means are never
-calculated in this routine.
  *****************************************************************************/
 
@@ -185 +175 @@
                 }
             }
-            mean /= (float)count;
+            if (count != 0) {
+                mean /= (float)count;
+            } else {
+                mean = NAN;
+            }
+
         } else {
             for (i = 0; i < myVector->n; i++) {
@@ -193 +188 @@
                 }
             }
-            mean /= (float)count;
+            if (count != 0) {
+                mean /= (float)count;
+            } else {
+                mean = NAN;
+            }
         }
     } else {
@@ -203 +202 @@
                 }
             }
-            mean /= (float)count;
+            if (count != 0) {
+                mean /= (float)count;
+            } else {
+                mean = NAN;
+            }
         } else {
             for (i = 0; i < myVector->n; i++) {
@@ -466 +469 @@
 
     // Calculate the median exactly.
-    // XXX: Is this the correct action?
     if (0 == (nValues % 2)) {
         stats->sampleMedian = 0.5 * (sortedVector->data.F32[(nValues / 2) - 1] +
@@ -700 +702 @@
         }
     }
-    countFloat = (float)countInt;
-
-    #ifdef DARWIN
-
-    stats->sampleStdev = (float)sqrt((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
-    #else
-
-    stats->sampleStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
-    #endif
+    if (countInt < 2) {
+        stats->sampleStdev = NAN;
+        // XXX PS WARNING
+    } else {
+        countFloat = (float)countInt;
+        #ifdef DARWIN
+
+        stats->sampleStdev = (float)sqrt((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
+        #else
+
+        stats->sampleStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
+        #endif
+
+    }
 }
 
@@ -756 +763 @@
     }
     // 1. Compute the sample median.
-    // XXX: This seems odd.  Verify with IfA that we want to calculate the
-    // median here, not the mean.
     p_psVectorSampleMedian(myVector, maskVector, maskVal, stats);
 
@@ -828 +833 @@
     }
 
+    // Ensure that max!=min before we divide by (max-min)
+    if (FLT_EPSILON < fabs(max - min)) {
+        for (i = 0; i < myData->n; i++) {
+            myData->data.F32[i] = outLow + (myData->data.F32[i] - min) * (outHigh - outLow) / (max - min);
+        }
+    } else {
+XXX:
+        PS_WARNING
+        for (i = 0; i < myData->n; i++) {
+            myData->data.F32[i] = outLow;
+        }
+    }
+
     for (i = 0; i < myData->n; i++) {
         myData->data.F32[i] = outLow + (myData->data.F32[i] - min) * (outHigh - outLow) / (max - min);
@@ -849 +867 @@
     }
 
-    for (i = 0; i < myData->n; i++) {
-        myData->data.F64[i] = outLow + (myData->data.F64[i] - min) * (outHigh - outLow) / (max - min);
+    // Ensure that max!=min before we divide by (max-min)
+    if (FLT_EPSILON < fabs(max - min)) {
+        for (i = 0; i < myData->n; i++) {
+            myData->data.F64[i] = outLow + (myData->data.F64[i] - min) * (outHigh - outLow) / (max - min);
+        }
+    } else {
+XXX:
+        PS_WARNING
+        for (i = 0; i < myData->n; i++) {
+            myData->data.F64[i] = outLow;
+        }
     }
 }
@@ -1157 +1184 @@
         sumNfit += (float)robustHistogram->nums->data.U32[i];
     }
+    // XXX: divide by zero?
     myMean /= countFloat;