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

Timestamp:

Sep 24, 2004, 10:08:22 AM (22 years ago)

Author:

gusciora

Message:

psCOmments.h

File:

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

trunk/psLib/src/math/psStats.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-22 01:30:21 $
+ *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-24 20:08:22 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23 +23 @@
 
 /*****************************************************************************/
-
 /* INCLUDE FILES                                                             */
-
 /*****************************************************************************/
 #include "psMemory.h"
@@ -38 +36 @@
 
 /*****************************************************************************/
-
 /* DEFINE STATEMENTS                                                         */
-
 /*****************************************************************************/
 // will use robust statistical methods.
@@ -88 +84 @@
 
 /*****************************************************************************/
-
 /* TYPE DEFINITIONS                                                          */
-
 /*****************************************************************************/
 
 /*****************************************************************************/
-
 /* GLOBAL VARIABLES                                                          */
-
 /*****************************************************************************/
 
@@ -102 +94 @@
 
 /*****************************************************************************/
-
 /* FILE STATIC VARIABLES                                                     */
-
 /*****************************************************************************/
 
@@ -110 +100 @@
 
 /*****************************************************************************/
-
 /* FUNCTION IMPLEMENTATION - LOCAL                                           */
-
 /*****************************************************************************/
 
@@ -471 +459 @@
     // regardless of the vector size.
     /*
-     * if (myVector->n > stats->sampleLimit) { psAbort(__func__, "Robust Statistic Algorithms have not yet
-     * been defined or implemented.");
-     * 
      * // Calculate the robust quartiles. stats2 = psStatsAlloc(PS_STAT_ROBUST_MEDIAN);
      * p_psVectorRobustStats(myVector, maskVector, maskVal, stats2);
@@ -1525 +1510 @@
     newStruct->sampleUQ = NAN;
     newStruct->sampleLQ = NAN;
-    newStruct->sampleLimit = 30000;
     newStruct->robustMean = NAN;
     newStruct->robustMedian = NAN;
@@ -1780 +1764 @@
 algorithms stablize, we will then macro everything and put type support in
 the various stat functions.
+ 
+XXX: Should the default data type be F64?  Since we are buying Athlons...
  *****************************************************************************/
 psVector* p_psConvertToF32(psStats* stats, psVector* in, psVector* mask, unsigned int maskVal)
@@ -1826 +1812 @@
 macro-ize everything and add PS_TYPE_U16 and PS_TYPE_F64.
  *****************************************************************************/
-psStats* psVectorStats(psStats* stats, psVector* in, psVector* mask, unsigned int maskVal)
+psStats* psVectorStats(psStats* stats,
+                       psVector* in,
+                       psVector* mask,
+                       unsigned int maskVal)
 {
     psVector* inF32;