diff Histogram.h @ 7:fa6a281bd854

Nov 14 vers -- add makeFixedBinHist & Ext version & expected value &fxd name bug
author Me
date Sun, 14 Nov 2010 11:11:44 -0800
parents a2388fae93ff
children c83c27796fad
line diff
     1.1 --- a/Histogram.h	Thu Nov 11 05:45:08 2010 -0800
     1.2 +++ b/Histogram.h	Sun Nov 14 11:11:44 2010 -0800
     1.3 @@ -13,11 +13,12 @@
     1.4  
     1.5  typedef struct
     1.6   {
     1.7 -   int  startOfRange;
     1.8 -   int  endOfRange;
     1.9 -   int  numBins;
    1.10 -   int  binWidth;
    1.11 -   int *bins;
    1.12 +   char  *name;
    1.13 +   int32  startOfRange;
    1.14 +   int32  endOfRange;
    1.15 +   int32  numBins;
    1.16 +   int32  binWidth;
    1.17 +   int32 *bins;
    1.18   }
    1.19  Histogram;
    1.20  
    1.21 @@ -25,9 +26,9 @@
    1.22   {
    1.23     float32  startOfRange;
    1.24     float32  endOfRange;
    1.25 -   int      numBins;
    1.26 +   int32    numBins;
    1.27     float32  binWidth;
    1.28 -   int     *bins;
    1.29 +   int32   *bins;
    1.30   }
    1.31  FloatHist;
    1.32  
    1.33 @@ -35,15 +36,23 @@
    1.34   {
    1.35     float64 startOfRange;
    1.36     float64  endOfRange;
    1.37 -   int      numBins;
    1.38 +   int32    numBins;
    1.39     float64  binWidth;
    1.40 -   int     *bins;
    1.41 +   int32   *bins;
    1.42   }
    1.43  DblHist;
    1.44  
    1.45  Histogram *
    1.46  makeHistogram( int32 numBins, int32 startOfRange, int32 endOfRange );
    1.47  
    1.48 +Histogram *
    1.49 +makeFixedBinHist( int32 numBins, int32 startOfRange, int32 binWidth,
    1.50 +                  char *name );
    1.51 +
    1.52 +Histogram *
    1.53 +makeFixedBinHistExt( int32 numBins, int32 startOfRange, int32 binWidth,
    1.54 +                     char *name );
    1.55 +
    1.56  void inline
    1.57  addToHist( int32 value, Histogram *hist );
    1.58