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

Timestamp:

Jul 12, 2005, 9:12:01 AM (21 years ago)

Author:

desonia

Message:

massive restructuring of codebase.

File:

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

trunk/psLib/src/math/psStats.c

@@ -14 +14 @@
  *      stats->binsize
  *
- *  @version $Revision: 1.136 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-28 20:17:52 $
+ *  @version $Revision: 1.137 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-12 19:12:01 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -41 +41 @@
 #include "psConstants.h"
 
-#include "psDataManipErrors.h"
+#include "psErrorText.h"
 
 /*****************************************************************************/
@@ -77 +77 @@
 psBool p_psGetStatValue(const psStats* stats, psF64 *value)
 {
-    switch (stats->options & ~(PS_STAT_USE_RANGE | PS_STAT_USE_BINSIZE | PS_STAT_ROBUST_FOR_SAMPLE)) {
+    //    switch (stats->options & ~(PS_STAT_USE_RANGE | PS_STAT_USE_BINSIZE | PS_STAT_ROBUST_FOR_SAMPLE)) {
+    switch (stats->options & ~(PS_STAT_USE_RANGE | PS_STAT_USE_BINSIZE)) {
     case PS_STAT_SAMPLE_MEAN:
         *value = stats->sampleMean;
@@ -658 +659 @@
         x.data.F32 = iMid - (PS_GAUSS_WIDTH * sigma);
         if ((x.data.F32 >= firstBound) && (x.data.F32 <= lastBound)) {
-            jMin = p_psVectorBinDisect(robustHistogram->bounds, &x);
+            jMin = p_psVectorBinDisect( *(psVector* *)&robustHistogram->bounds, &x);
             if (jMin < 0) {
                 psError(PS_ERR_UNEXPECTED_NULL,
@@ -673 +674 @@
         x.data.F32 = iMid + (PS_GAUSS_WIDTH * sigma);
         if ((x.data.F32 >= firstBound) && (x.data.F32 <= lastBound)) {
-            jMax = p_psVectorBinDisect(robustHistogram->bounds, &x);
+            jMax = p_psVectorBinDisect( *(psVector* *)&robustHistogram->bounds, &x);
             if (jMax < 0) {
                 psError(PS_ERR_UNEXPECTED_NULL,
@@ -1705 +1706 @@
         //Determine id that is okay.
         stats->robustMedian = fitQuadraticSearchForYThenReturnX(
-                                  robustHistogram->bounds,
+                                  *(psVector* *)&robustHistogram->bounds,
                                   cumulativeRobustSums,
                                   medianBinNum,
@@ -1721 +1722 @@
         //Determine id that is okay.
         stats->robustLQ = fitQuadraticSearchForYThenReturnX(
-                              robustHistogram->bounds,
+                              *(psVector* *)&robustHistogram->bounds,
                               cumulativeRobustSums,
                               LQBinNum,
@@ -1728 +1729 @@
         //Determine id that is okay.
         stats->robustUQ = fitQuadraticSearchForYThenReturnX(
-                              robustHistogram->bounds,
+                              *(psVector* *)&robustHistogram->bounds,
                               cumulativeRobustSums,
                               UQBinNum,
@@ -1812 +1813 @@
     psMemSetDeallocator(newHist, (psFreeFunc) histogramFree);
     newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32);
-    newHist->bounds->n = newHist->bounds->nalloc;
+    *(int *)&newHist->bounds->n = newHist->bounds->nalloc;
 
     // Calculate the bounds for each bin.
@@ -1859 +1860 @@
     psMemSetDeallocator(newHist, (psFreeFunc) histogramFree);
     newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32);
-    newHist->bounds->n = newHist->bounds->nalloc;
+    *(int *)&newHist->bounds->n = newHist->bounds->nalloc;
     for (i = 0; i < bounds->n; i++) {
         newHist->bounds->data.F32[i] = bounds->data.F32[i];
@@ -2067 +2068 @@
                     // correct bin number requires a bit more work.
                     tmpScalar.data.F32 = inF32->data.F32[i];
-                    binNum = p_psVectorBinDisect(out->bounds, &tmpScalar);
+                    binNum = p_psVectorBinDisect( *(psVector* *)&out->bounds, &tmpScalar);
                     if (binNum < 0) {
                         psLogMsg(__func__, PS_LOG_WARN,