Changeset 1582

Timestamp:

Aug 18, 2004, 4:25:42 PM (22 years ago)

Author:

Paul Price

Message:

Updating from SDRS.

File:

• trunk/archive/pslib/include/psStats.h (modified) (5 diffs)

trunk/archive/pslib/include/psStats.h

@@ -24 +24 @@
     PS_STAT_USE_RANGE             = 0x002000,
     PS_STAT_USE_BINSIZE           = 0x004000,
-    PS_STAT_ROBUST_FOR_SAMPLE     = 0x008000
 } psStatsOptions;
 
@@ -34 +33 @@
     double sampleUQ;                    ///< upper quartile of sample
     double sampleLQ;                    ///< lower quartile of sample
-    double sampleLimit;                 ///< Number of datapoints to 
     double robustMean;                  ///< robust mean of data
     double robustMedian;                ///< robust median of data
@@ -58 +56 @@
 psStats *
 psVectorStats(psStats *stats,           ///< stats structure defines stats to be calculated, how and result
-             const psVector *restrict myArray, ///< Array to be analysed
-             const psVector *restrict maskArray, ///< Ignore elements where (maskArray & maskVal) != 0
-                                        ///< May be NULL
-             unsigned int maskVal)      ///< Only mask elements with one of these bits set in maskArray
+              const psVector *in,       ///< Array to be analysed
+              const psVector *mask,     ///< Ignore elements where (maskArray & maskVal) != 0.  May be NULL
+              unsigned int maskVal)     ///< Only mask elements with one of these bits set in maskArray
 ;
 
@@ -69 +66 @@
 ;
 
-/** Destructor */
-void
-psStatsFree(psStats *restrict stats)    ///< Stats structure to destroy
-;
-
 /***********************************************************************************************************/
 
 /** Histograms  */
 typedef struct {
-    const psVector *restrict bounds;    ///< Bounds for the bins
+    const psVector *bounds;             ///< Bounds for the bins
     psVector *nums;                     ///< Number in each of the bins
     int minNum, maxNum;                 ///< Number below the minimum and above the maximum
-    int uniform;                        ///< Is it a uniform distribution?
+    bool uniform;                       ///< Is it a uniform distribution?
 } psHistogram;
 
@@ -93 +85 @@
 /** Generic constructor \ingroup MathGroup */
 psHistogram *
-psHistogramAllocGeneric(const psVector *restrict bounds) ///< Bounds for the bins
+psHistogramAllocGeneric(const psVector *bounds) ///< Bounds for the bins
 ;
-
-/** Destructor \ingroup MathGroup **/
-void
-psHistogramFree(psHistogram *restrict myHist) ///< Histogram to destroy
-;
-
 
 /** Calculate a histogram \ingroup MathGroup **/
 psHistogram *
-psHistogramVector(psHistogram *restrict myHist, ///< Histogram data
-                  const psVector *restrict myArray) ///< Array to analyse
-;
+psVectorHistogram(psHistogram *out,     ///< Input and output histogram
+                  const psVector *in    ///< Array to analyse
+                  const psVector *mask, ///< Ignore elements where (maskArray & maskVal) != 0.  May be NULL
+                  unsigned int maskVal  ///< Only mask elements with one of these bits set in maskArray
+    );
 
 #endif