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

Timestamp:

Jul 22, 2004, 2:06:40 PM (22 years ago)

Author:

gusciora

Message:

...

File:

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

trunk/psLib/src/math/psStats.c

@@ -15 +15 @@
 #include "psAbort.h"
 #include "psStats.h"
-#include "psVectorSort.h"
 #include "psMinimize.h"
 #include "psFunctions.h"
@@ -40 +39 @@
 
 /** Preprocessor macro to generate error on an incorrect type */
-#define PS_CHECK_VECTOR_TYPE(NAME, TYPE)                                                          \
-if (NAME->type.type != TYPE) {                                                         \
-    psError(__func__,"Invalid operation: %s has incorrect type.", #NAME);                          \
+#define PS_CHECK_VECTOR_TYPE(NAME, TYPE) \
+if (NAME->type.type != TYPE) { \
+    psError(__func__,"Invalid operation: %s has incorrect type.", #NAME); \
 }
 
 /** Preprocessor macro to generate error on a NULL vector */
-#define PS_CHECK_NULL_VECTOR(NAME)                                                          \
-if (NAME == NULL || NAME->data.V == NULL) {                                                         \
-    psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME);                          \
+#define PS_CHECK_NULL_VECTOR(NAME) \
+if (NAME == NULL || NAME->data.V == NULL) { \
+    psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME); \
 }
 
 /** Preprocessor macro to generate error for zero length vector */
-#define PS_CHECK_EMPTY_VECTOR(NAME)                                                          \
-if (NAME->n < 1) {                                                                                  \
-    psError(__func__,"Invalid operation: %s has zero n value.", #NAME);                             \
+#define PS_CHECK_EMPTY_VECTOR(NAME) \
+if (NAME->n < 1) { \
+    psError(__func__,"Invalid operation: %s has zero n value.", #NAME); \
 }
 
 /** Preprocessor macro to generate error on differing size vectors */
-#define PS_CHECK_VECTOR_SIZE_EQUAL(VEC1, VEC2)                                                          \
-if (VEC1->n != VEC2->n) {               \
+#define PS_CHECK_VECTOR_SIZE_EQUAL(VEC1, VEC2) \
+if (VEC1->n != VEC2->n) { \
     psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
 }
+
+#define PS_PRINT_VECTOR(NAME) \
+for (int my_i=0;my_i<NAME->n;my_i++) { \
+    printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \
+} \
+printf("\n"); \
 
 /*****************************************************************************/
@@ -653 +658 @@
     psFree(unsortedVector);
     psFree(sortedVector);
-    // NOTE: This is the
 }
 
@@ -668 +672 @@
     NULL
  
-NOTE: the mean is always calculated exactly.  Robust means are never
-calculated in this routine.
  *****************************************************************************/
 void p_psVectorSampleStdev(const psVector *restrict myVector,
@@ -1044 +1046 @@
 }
 
-#define PS_PRINT_VECTOR(NAME) \
-for (int my_i=0;my_i<NAME->n;my_i++) { \
-    printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \
-} \
-printf("\n"); \
-
 /******************************************************************************
 p_psVectorRobustStats(myVector, maskVector, maskVal, stats): this procedure
@@ -1059 +1055 @@
 PS_STAT_ROBUST_QUARTILE
 I have included all that computation in a single function, as opposed to
-breaking it across several functions for one primary reason:
+breaking it across several functions for one primary reason: 
 they all
 require the same basic initial processing steps (calculate the histogram,
-etc.)
+etc.) 
 however there is no currently defined means, in the SDRS, to
 specify this computation as a separate step.  If the above robust stat
@@ -1611 +1607 @@
     // NOTE: Verify that this is the correct action.
     if (bounds == NULL) {
-        //        psAbort(__func__, "psHistogram requested with NULL bounds");
+        // psAbort(__func__, "psHistogram requested with NULL bounds");
         return(NULL);
     }
@@ -1617 +1613 @@
     // NOTE: Verify that this is the correct action.
     if (bounds->n <= 1) {
-        //        psAbort(__func__, "psHistogram requested with NULL bounds");
+        // psAbort(__func__, "psHistogram requested with NULL bounds");
         return(NULL);
     }