Changeset 652 for trunk/psLib/src/math/psStats.h

Timestamp:

May 12, 2004, 3:05:35 PM (22 years ago)

Author:

gusciora

Message:

Added the median calculation functions.

File:

• trunk/psLib/src/math/psStats.h (modified) (2 diffs)

trunk/psLib/src/math/psStats.h

@@ -6 +6 @@
  *  \ingroup MathGroup
  */
+#include "psLib.h"
+#include "psVector.h"
 
-/******************************************************************************
-    The following typedefs and functions belong in the psArray.h and psArray.c
-    files.  However, those files are not available at this time, due to the
-    changing definition of the psLib data/functions.  For temporary purposes
-    only, I am including them here so that I can continue coding while our
-    basic data types are still being implemented.
- *****************************************************************************/
-typedef enum {
-    PS_TYPE_CHAR,
-    PS_TYPE_SHORT,
-    PS_TYPE_INT,
-    PS_TYPE_LONG,
-    PS_TYPE_UCHAR,
-    PS_TYPE_USHORT,
-    PS_TYPE_UINT,
-    PS_TYPE_ULONG,
-    PS_TYPE_FLOAT,
-    PS_TYPE_DOUBLE,
-    PS_TYPE_COMPLEX,
-    PS_TYPE_OTHER,
-} psElemType;
-
-typedef enum {
-    PS_DIMEN_SCALAR,
-    PS_DIMEN_VECTOR,
-    PS_DIMEN_TRANSV,
-    PS_DIMEN_IMAGE,
-    PS_DIMEN_OTHER
-} psDimen;
-
-typedef struct
-{
-    psElemType type;
-    psDimen dimen;
-}
-psType;
-
-typedef struct
-{
-    psType type;                ///< Type of data.
-    int nalloc;                 ///< Total number of elements available.
-    int n;                      ///< Number of elements in use.
-
-    union {
-        int *vecI;
-        float *vecF;
-        double *vecD;
-        //        complex float *vecC;
-        void **vecP;
-    }vec;                       ///< Union with array data.
-}
-psVector;
-
-psVector *psVectorAlloc(int        nalloc,
-                        psElemType type)
-{
-    return(NULL);
-}
-
-psVector *psVectorRealloc(psVector myVector,
-                          int nalloc)
-{
-    return(NULL);
-}
-
-void psVectorFree(psVector *restrict psArr)
-{}
+int mine(psVector *myVector);
 
 /** statistics which may be calculated */
@@ -133 +69 @@
 /** Do Statistics on an array.  Returns a status value. \ingroup MathGroup */
 psStats *
-psArrayStats(const psVector *restrict myVector, ///< Vector to be analysed
-             // must be FLOAT
-             const psVector *restrict maskVector, ///< Ignore elements where (maskVector & maskVal) != 0
-             // must be INT or NULL
+psArrayStats(const psVector *restrict myVector, ///< Vector to be analysed: must be FLOAT
+             const psVector *restrict maskVector, ///< Ignore elements where (maskVector & maskVal) != 0: must be INT or NULL
              unsigned int maskVal, ///< Only mask elements with one of these bits set in maskVector
              psStats *stats  ///< stats structure defines stats to be calculated and how