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

Timestamp:

May 13, 2004, 1:53:59 PM (22 years ago)

Author:

gusciora

Message:

Brought psStats.c up-to-date with the new psVector.

File:

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

trunk/psLib/src/math/psStats.c

@@ -5 +5 @@
 /******************************************************************************
 //#include "pslib.h"
-//#include "psMemory.h"
+#include "psMemory.h"
+#include "psVector.h"
 //#include "psTrace.h"
 //#include "psString.h"
@@ -63 +64 @@
     psHistogram *newHist = NULL;
     int numBins = 0;
-    psType dummyFloatType;
-    psType dummyIntType;
-
-    dummyFloatType.type = PS_TYPE_FLOAT;
-    dummyFloatType.dimen = PS_DIMEN_VECTOR;
-    dummyIntType.type = PS_TYPE_FLOAT;
-    dummyIntType.dimen = PS_DIMEN_VECTOR;
+
 
     numBins = 1 + ((upper - lower) / size);
     newHist = (psHistogram *) psAlloc(sizeof(psHistogram));
-    newHist->lower = psVectorAlloc(dummyFloatType, numBins);
-    newHist->upper = psVectorAlloc(dummyFloatType, numBins);
-    newHist->nums =  psVectorAlloc(dummyIntType, numBins);
+    newHist->lower = psVectorAlloc(PS_TYPE_FLOAT, numBins);
+    newHist->upper = psVectorAlloc(PS_TYPE_FLOAT, numBins);
+    newHist->nums =  psVectorAlloc(PS_TYPE_INT32, numBins);
     newHist->minVal = lower;
     newHist->maxVal = upper;
@@ -92 +87 @@
     int numBins = 0;
     int i;
-    psType dummyFloatType;
-    psType dummyIntType;
-
-    dummyFloatType.type = PS_TYPE_FLOAT;
-    dummyFloatType.dimen = PS_DIMEN_VECTOR;
-    dummyIntType.type = PS_TYPE_FLOAT;
-    dummyIntType.dimen = PS_DIMEN_VECTOR;
 
     if (lower->n != upper->n) {
@@ -105 +93 @@
     numBins = lower->n;
     newHist = (psHistogram *) psAlloc(sizeof(psHistogram));
-    newHist->lower = psVectorAlloc(dummyFloatType, numBins);
-    newHist->upper = psVectorAlloc(dummyFloatType, numBins);
+    newHist->lower = psVectorAlloc(PS_TYPE_FLOAT, numBins);
+    newHist->upper = psVectorAlloc(PS_TYPE_FLOAT, numBins);
     for (i=0;i<numBins;i++) {
         newHist->lower->vec.f[i] = lower->vec.f[i];
         newHist->upper->vec.f[i] = upper->vec.f[i];
     }
-    newHist->nums = psVectorAlloc(dummyIntType, numBins);
+    newHist->nums = psVectorAlloc(PS_TYPE_INT32, numBins);
     newHist->minVal = minVal;
     newHist->maxVal = maxVal;
@@ -156 +144 @@
             if ((myVector->vec.f[i] >= myHist->lower->vec.f[i]) &&
                     (myVector->vec.f[i] <= myHist->upper->vec.f[i])) {
-                myHist->nums->vec.i[i]++;
+                myHist->nums->vec.i32[i]++;
             } else {
                 psError(__func__, "data value was not within the bounds of the bin it should habe been in.");
@@ -178 +166 @@
     if (maskVector != NULL) {
         for (i=0;i<myVector->n;i++) {
-            if (!(maskVal & maskVector->vec.i[i])) {
+            if (!(maskVal & maskVector->vec.i32[i])) {
                 mean+= myVector->vec.f[i];
                 count++;
@@ -203 +191 @@
     if (maskVector != NULL) {
         for (i=0;i<myVector->n;i++) {
-            if (!(maskVal & maskVector->vec.i[i])) {
+            if (!(maskVal & maskVector->vec.i32[i])) {
                 if (myVector->vec.f[i] > max) {
-                    max = maskVector->vec.i[i];
+                    max = maskVector->vec.i32[i];
                 }
             }
@@ -212 +200 @@
         for (i=0;i<myVector->n;i++) {
             if (myVector->vec.f[i] > max) {
-                max = maskVector->vec.i[i];
+                max = maskVector->vec.i32[i];
             }
         }
@@ -228 +216 @@
     if (maskVector != NULL) {
         for (i=0;i<myVector->n;i++) {
-            if (!(maskVal & maskVector->vec.i[i])) {
+            if (!(maskVal & maskVector->vec.i32[i])) {
                 if (myVector->vec.f[i] < min) {
-                    min = maskVector->vec.i[i];
+                    min = maskVector->vec.i32[i];
                 }
             }
@@ -237 +225 @@
         for (i=0;i<myVector->n;i++) {
             if (myVector->vec.f[i] < min) {
-                min = maskVector->vec.i[i];
+                min = maskVector->vec.i32[i];
             }
         }
@@ -256 +244 @@
     if (maskVector != NULL) {
         for (i=0;i<myVector->n;i++) {
-            if (!(maskVal & maskVector->vec.i[i])) {
+            if (!(maskVal & maskVector->vec.i32[i])) {
                 numData++;
             }
@@ -275 +263 @@
     psVector *unsortedVector = NULL;
     psVector *sortedVector = NULL;
-    psType dummyFloatType;
     int dataSize = 0;
     int count = 0;
@@ -281 +268 @@
     float median = 0.0;
 
-    dummyFloatType.type = PS_TYPE_FLOAT;
-    dummyFloatType.dimen = PS_DIMEN_VECTOR;
     dataSize = p_psArrayNValues(myVector, maskVector, maskVal);
 
     if (dataSize < MEDIAN_SIZE_THRESHOLD) {
-        unsortedVector = psVectorAlloc(dummyFloatType, dataSize);
-        sortedVector   = psVectorAlloc(dummyFloatType, dataSize);
+        unsortedVector = psVectorAlloc(PS_TYPE_FLOAT, dataSize);
+        sortedVector   = psVectorAlloc(PS_TYPE_FLOAT, dataSize);
 
         count = 0;
         if (maskVector != NULL) {
             for (i=0;i<myVector->n;i++) {
-                if (!(maskVal & maskVector->vec.i[i])) {
+                if (!(maskVal & maskVector->vec.i32[i])) {
                     unsortedVector->vec.f[count++] = maskVector->vec.f[i];
                 }