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

Timestamp:

Sep 29, 2004, 9:52:53 AM (22 years ago)

Author:

evanalst

Message:

Fixed psConvertToF32 and used inF32 as input vector for stats functions.

File:

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

trunk/psLib/src/math/psStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-28 23:27:37 $
+ *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-29 19:52:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1780 +1780 @@
         tmp = psVectorAlloc(in->n, PS_TYPE_F32);
         for (i = 0; i < in->n; i++) {
-            tmp->data.F32[i] = (float)in->data.S32[i];
+            tmp->data.F32[i] = (float)in->data.S8[i];
         }
     } else if (in->type.type == PS_TYPE_U16) {
         tmp = psVectorAlloc(in->n, PS_TYPE_F32);
         for (i = 0; i < in->n; i++) {
-            tmp->data.F32[i] = (float)in->data.U32[i];
+            tmp->data.F32[i] = (float)in->data.U16[i];
         }
     } else if (in->type.type == PS_TYPE_F64) {
@@ -1851 +1851 @@
     // ************************************************************************
     if (stats->options & PS_STAT_SAMPLE_MEAN) {
-        p_psVectorSampleMean(in, mask, maskVal, stats);
+        p_psVectorSampleMean(inF32, mask, maskVal, stats);
     }
     // ************************************************************************
     if (stats->options & PS_STAT_SAMPLE_MEDIAN) {
-        p_psVectorSampleMedian(in, mask, maskVal, stats);
+        p_psVectorSampleMedian(inF32, mask, maskVal, stats);
     }
     // ************************************************************************
@@ -1861 +1861 @@
     // mean has already been calculated? Or should we always calculate it?
     if (stats->options & PS_STAT_SAMPLE_STDEV) {
-        p_psVectorSampleMean(in, mask, maskVal, stats);
-        p_psVectorSampleStdev(in, mask, maskVal, stats);
+        p_psVectorSampleMean(inF32, mask, maskVal, stats);
+        p_psVectorSampleStdev(inF32, mask, maskVal, stats);
     }
     // ************************************************************************
     if (stats->options & PS_STAT_SAMPLE_QUARTILE) {
-        p_psVectorSampleQuartiles(in, mask, maskVal, stats);
+        p_psVectorSampleQuartiles(inF32, mask, maskVal, stats);
     }
     // Since the various robust stats quantities share much computation, they
@@ -1875 +1875 @@
             (stats->options & PS_STAT_ROBUST_MODE) ||
             (stats->options & PS_STAT_ROBUST_STDEV) || (stats->options & PS_STAT_ROBUST_QUARTILE)) {
-        p_psVectorRobustStats(in, mask, maskVal, stats);
+        p_psVectorRobustStats(inF32, mask, maskVal, stats);
     }
 
     if ((stats->options & PS_STAT_CLIPPED_MEAN) || (stats->options & PS_STAT_CLIPPED_STDEV)) {
-        p_psVectorClippedStats(in, mask, maskVal, stats);
+        p_psVectorClippedStats(inF32, mask, maskVal, stats);
     }
     // ************************************************************************
     if (stats->options & PS_STAT_MAX) {
-        p_psVectorMax(in, mask, maskVal, stats);
+        p_psVectorMax(inF32, mask, maskVal, stats);
     }
     // ************************************************************************
     if (stats->options & PS_STAT_MIN) {
-        p_psVectorMin(in, mask, maskVal, stats);
+        p_psVectorMin(inF32, mask, maskVal, stats);
     }