Changeset 609

Timestamp:

May 7, 2004, 12:13:43 PM (22 years ago)

Author:

Paul Price

Message:

Reorganised psHistogram --- no longer specify both upper and lower
bounds, and now include a "simple" flag which indicates if the bounds
are distributed uniformly (impacts choice of algorithm). Also altered
the constructors.

File:

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

trunk/archive/pslib/include/psStats.h

@@ -83 +83 @@
 /** Histograms  */
 typedef struct {
-    const psFloatArray *restrict lower; ///< Lower bounds for the bins
-    const psFloatArray *restrict upper; ///< Upper bounds for the bins
+    const psFloatArray *restrict bounds; ///< Bounds for the bins
     psIntArray *nums;                   ///< Number in each of the bins
     const float minVal, maxVal;         ///< Minimum and maximum values
     int minNum, maxNum;                 ///< Number below the minimum and above the maximum
+    int uniform;                        ///< Is it a uniform distribution?
 } psHistogram;
 
@@ -94 +94 @@
 psHistogramAlloc(float lower,           ///< Lower limit for the bins
                  float upper,           ///< Upper limit for the bins
-                 float size             ///< Size of the bins
+                 int n                  ///< Number of the bins
     );
 
 /** Generic constructor \ingroup MathGroup */
 psHistogram *
-psHistogramAllocGeneric(const psFloatArray *restrict lower, ///< Lower bounds for the bins
-                        const psFloatArray *restrict upper, ///< Upper bounds for the bins
+psHistogramAllocGeneric(const psFloatArray *restrict bounds, ///< Bounds for the bins
                         float minVal,   ///< Minimum value
                         float maxVal    ///< Maximum value