Changeset 1279

Timestamp:

Jul 22, 2004, 1:44:25 PM (22 years ago)

Author:

gusciora

Message:

...

File:

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

trunk/psLib/src/math/psStats.c

@@ -18 +18 @@
 #include "psMinimize.h"
 #include "psFunctions.h"
-=======
-
-    /*****************************************************************************/
-    /* DEFINE STATEMENTS                                                         */
-    /*****************************************************************************/
-    #define DEFAULT_ROBUST_SIZE_THRESHOLD 30000   // Vectors that are large than this
-    // will use robust statistical methods.
-    #define GAUSS_WIDTH 20                  // The width of the Gaussian or boxcar smoothing.
-    #define CLIPPED_NUM_ITER_LB 1
-    #define CLIPPED_NUM_ITER_UB 10
-    #define CLIPPED_SIGMA_LB 1.0
-    #define CLIPPED_SIGMA_UB 10.0
-    #define true 1
-    #define false 0
-    #define MYMAXFLOAT HUGE
-    #define MAX_ITERATIONS 20
-
-    #ifndef DOXYGEN
-    void p_psVectorRobustStats(const psVector *restrict myVector,
-                               const psVector *restrict maskVector,
-                               unsigned int maskVal,
-                               psStats *stats);
-#endif
+
+/*****************************************************************************/
+/* DEFINE STATEMENTS                                                         */
+/*****************************************************************************/
+#define DEFAULT_ROBUST_SIZE_THRESHOLD 30000   // Vectors that are large than this
+// will use robust statistical methods.
+#define GAUSS_WIDTH 20                  // The width of the Gaussian or boxcar smoothing.
+#define CLIPPED_NUM_ITER_LB 1
+#define CLIPPED_NUM_ITER_UB 10
+#define CLIPPED_SIGMA_LB 1.0
+#define CLIPPED_SIGMA_UB 10.0
+#define true 1
+#define false 0
+#define MYMAXFLOAT HUGE
+#define MAX_ITERATIONS 20
+
+void p_psVectorRobustStats(const psVector *restrict myVector,
+                           const psVector *restrict maskVector,
+                           unsigned int maskVal,
+                           psStats *stats);
 
 /** Preprocessor macro to generate error on an incorrect type */
@@ -478 +475 @@
     }
     // Sort the temporary vectors.
-    psVectorSort(sortedVector, unsortedVector);
+    psSort(sortedVector, unsortedVector);
 
     // Calculate the median exactly.
@@ -647 +644 @@
 
     // Sort the temporary vectors.
-    psVectorSort(sortedVector, unsortedVector);
+    psSort(sortedVector, unsortedVector);
 
     // Calculate the quartile points exactly.
@@ -1827 +1824 @@
             (stats->options & PS_STAT_ROBUST_QUARTILE)) {
         p_psVectorRobustStats(in, mask, maskVal, stats);
-
-        printf("HMMMM stats->robustMode is %f\n", stats->robustMode);
     }