Changeset 10395

Timestamp:

Dec 1, 2006, 12:41:33 PM (20 years ago)

Author:

magnier

Message:

fitted Mean now respects the binsize option

Location:

trunk/psLib

Files:

• src/math/psStats.c (modified) (3 diffs)
• test/math/tap_psStats_Sample_01.c (modified) (1 diff)

trunk/psLib/src/math/psStats.c

@@ -16 +16 @@
  * use ->min and ->max (PS_STAT_USE_RANGE)
  *
- *  @version $Revision: 1.191 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-29 17:55:25 $
+ *  @version $Revision: 1.192 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-01 22:41:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1090 +1090 @@
     tmpScalar.type.type = PS_TYPE_F32;
 
-    // construct a histogram with (sigma/10 < binsize < sigma)
-    // set roughly so that the lowest bins have about 2 cnts
-    // Nsmallest ~ N50 / (4*dN))
-    psF32 dN = PS_MAX (1, PS_MIN (10, stats->robustN50 / 8));
-    psF32 newBinSize = stats->fittedStdev / dN;
+    psF32 binSize = 1;
+    if (stats->options & PS_STAT_USE_BINSIZE) {
+        // Set initial bin size to the specified value.
+        binSize = stats->binsize;
+        psTrace("psLib.math", 6, "Setting initial robust bin size to %.2f\n", binSize);
+    } else {
+        // construct a histogram with (sigma/10 < binsize < sigma)
+        // set roughly so that the lowest bins have about 2 cnts
+        // Nsmallest ~ N50 / (4*dN))
+        psF32 dN = PS_MAX (1, PS_MIN (10, stats->robustN50 / 8));
+        binSize = stats->fittedStdev / dN;
+    }
 
     // Determine the min/max of the vector (which prior outliers masked out)
@@ -1108 +1115 @@
 
     // Calculate the number of bins.
-    long numBins = (max - min) / newBinSize;
+    long numBins = (max - min) / binSize;
     psTrace("psLib.math", 6, "The new min/max values are (%f, %f).\n", min, max);
-    psTrace("psLib.math", 6, "The new bin size is %f.\n", newBinSize);
+    psTrace("psLib.math", 6, "The new bin size is %f.\n", binSize);
     psTrace("psLib.math", 6, "The numBins is %ld\n", numBins);
 

trunk/psLib/test/math/tap_psStats_Sample_01.c

@@ -226 +226 @@
         psMemId id = psMemGetId();
 
-        diag("sample 1");
+        diag("sample 1 : problem with integer-binned data driven to tiny sigma values");
         psStats *stats = psStatsAlloc (PS_STAT_FITTED_MEAN | PS_STAT_FITTED_STDEV |
                                        PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV |
                                        PS_STAT_CLIPPED_MEAN | PS_STAT_CLIPPED_STDEV |
                                        PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_MEDIAN |
-                                       PS_STAT_SAMPLE_STDEV);
+                                       PS_STAT_SAMPLE_STDEV | PS_STAT_USE_BINSIZE);
+        stats->binsize = 1.0;
+
 
         // copy data in static array