Changeset 683

Timestamp:

May 13, 2004, 5:25:22 PM (22 years ago)

Author:

gusciora

Message:

Adding the upper/lower quartile code.

Location:

trunk/psLib/src

Files:

• dataManip/psStats.c (modified) (3 diffs)
• math/psStats.c (modified) (3 diffs)

trunk/psLib/src/dataManip/psStats.c

@@ -29 +29 @@
     newStruct->sampleLQ = NAN;
     newStruct->robustMean = NAN;
-    newStruct->robustMeanNvalues = 0;
+    newStruct->robustMeanNvalues = -1;
     newStruct->robustMedian = NAN;
-    newStruct->robustMedianNvalues = 0;
+    newStruct->robustMedianNvalues = -1;
     newStruct->robustMode = NAN;
-    newStruct->robustModeNvalues = 0;
+    newStruct->robustModeNvalues = -1;
     newStruct->robustStdev = NAN;
     newStruct->robustUQ = NAN;
     newStruct->robustLQ = NAN;
     newStruct->clippedMean = NAN;
-    newStruct->clippedMeanNvalues = 0;
+    newStruct->clippedMeanNvalues = -1;
     newStruct->clippedStdev = NAN;
     newStruct->clipSigma = NAN;
-    newStruct->clipIter = 0;
+    newStruct->clipIter = -1;
     newStruct->min = NAN;
     newStruct->max = NAN;
-    newStruct->nValues = 0;
+    newStruct->nValues = -1;
     newStruct->options = options;
 
@@ -368 +368 @@
 }
 
+void p_psArraySampleUQ(const psVector *restrict myVector,
+                       const psVector *restrict maskVector,
+                       unsigned int maskVal,
+                       psStats *newStruct)
+{
+    psHistogram    *nonRobustHistogram = NULL;
+
+    if (-1 == newStruct->nValues) {
+        p_psArrayNValues(myVector, maskVector, maskVal, newStruct);
+    }
+
+    if (newStruct->nValues < MEDIAN_SIZE_THRESHOLD) {
+
+    }
+    else {
+        if (0 != isnan(newStruct->sampleStdev)) {
+            p_psArraySampleStdev(myVector, maskVector, maskVal, newStruct);
+        }
+        if (0 != isnan(newStruct->min)) {
+            p_psArrayMin(myVector, maskVector, maskVal, newStruct);
+        }
+        if (0 != isnan(newStruct->max)) {
+            p_psArrayMax(myVector, maskVector, maskVal, newStruct);
+        }
+
+        nonRobustHistogram = psHistogramAlloc(newStruct->min,
+                                              newStruct->max,
+                                              10);
+    }
+}
+
+
 /******************************************************************************
  
@@ -427 +459 @@
 
     if (stats->options & PS_STAT_SAMPLE_UQ) {
-        newStruct->sampleUQ = p_psArrayXXX(myVector, maskVector, maskVal);
+        p_psArraySampleUQ(myVector, maskVector, maskVal, newStruct);
     }
 

trunk/psLib/src/math/psStats.c

@@ -29 +29 @@
     newStruct->sampleLQ = NAN;
     newStruct->robustMean = NAN;
-    newStruct->robustMeanNvalues = 0;
+    newStruct->robustMeanNvalues = -1;
     newStruct->robustMedian = NAN;
-    newStruct->robustMedianNvalues = 0;
+    newStruct->robustMedianNvalues = -1;
     newStruct->robustMode = NAN;
-    newStruct->robustModeNvalues = 0;
+    newStruct->robustModeNvalues = -1;
     newStruct->robustStdev = NAN;
     newStruct->robustUQ = NAN;
     newStruct->robustLQ = NAN;
     newStruct->clippedMean = NAN;
-    newStruct->clippedMeanNvalues = 0;
+    newStruct->clippedMeanNvalues = -1;
     newStruct->clippedStdev = NAN;
     newStruct->clipSigma = NAN;
-    newStruct->clipIter = 0;
+    newStruct->clipIter = -1;
     newStruct->min = NAN;
     newStruct->max = NAN;
-    newStruct->nValues = 0;
+    newStruct->nValues = -1;
     newStruct->options = options;
 
@@ -368 +368 @@
 }
 
+void p_psArraySampleUQ(const psVector *restrict myVector,
+                       const psVector *restrict maskVector,
+                       unsigned int maskVal,
+                       psStats *newStruct)
+{
+    psHistogram    *nonRobustHistogram = NULL;
+
+    if (-1 == newStruct->nValues) {
+        p_psArrayNValues(myVector, maskVector, maskVal, newStruct);
+    }
+
+    if (newStruct->nValues < MEDIAN_SIZE_THRESHOLD) {
+
+    }
+    else {
+        if (0 != isnan(newStruct->sampleStdev)) {
+            p_psArraySampleStdev(myVector, maskVector, maskVal, newStruct);
+        }
+        if (0 != isnan(newStruct->min)) {
+            p_psArrayMin(myVector, maskVector, maskVal, newStruct);
+        }
+        if (0 != isnan(newStruct->max)) {
+            p_psArrayMax(myVector, maskVector, maskVal, newStruct);
+        }
+
+        nonRobustHistogram = psHistogramAlloc(newStruct->min,
+                                              newStruct->max,
+                                              10);
+    }
+}
+
+
 /******************************************************************************
  
@@ -427 +459 @@
 
     if (stats->options & PS_STAT_SAMPLE_UQ) {
-        newStruct->sampleUQ = p_psArrayXXX(myVector, maskVector, maskVal);
+        p_psArraySampleUQ(myVector, maskVector, maskVal, newStruct);
     }