# HG changeset patch # User SeanHalle # Date 1289482627 28800 # Node ID 13b8591dd0453aa43909dd6f462d5f07fe4655c8 # Parent dbb58ebfd69018297802cc05e43d981ab36b26a1 added addInterval -- is old version, have to merge with VMS__malloc version diff -r dbb58ebfd690 -r 13b8591dd045 Histogram.c --- a/Histogram.c Sat Sep 11 04:46:29 2010 -0700 +++ b/Histogram.c Thu Nov 11 05:37:07 2010 -0800 @@ -23,13 +23,13 @@ Histogram * -makeHistogram( int numBins, int startOfRange, int endOfRange ) +makeHistogram( int32 numBins, int32 startOfRange, int32 endOfRange ) { Histogram *hist; - int i; + int32 i; hist = malloc( sizeof(Histogram) ); - hist->bins = malloc( numBins * sizeof(int) ); + hist->bins = malloc( numBins * sizeof(int32) ); hist->numBins = numBins; hist->binWidth = (endOfRange - startOfRange) / numBins; @@ -44,10 +44,10 @@ return hist; } -void -addToHist( int value, Histogram *hist ) +void inline +addToHist( int32 value, Histogram *hist ) { - int binIdx; + int32 binIdx; if( value < hist->startOfRange ) { binIdx = 0; @@ -63,10 +63,21 @@ hist->bins[ binIdx ] += 1; } + +void inline +addIntervalToHist( int32 startIntvl, int32 endIntvl, Histogram *hist ) + { + int32 value; + + value = endIntvl - startIntvl; + if( value < 0 || value > 10000000 ) return; //sanity check + addToHist( value, hist ); + } + void printHist( Histogram *hist ) { - int binIdx, i, numBars, maxHeight, barValue, binStart, binEnd; + int32 binIdx, i, numBars, maxHeight, barValue, binStart, binEnd; maxHeight = 0; for( i = 0; i < hist->numBins; i++ ) diff -r dbb58ebfd690 -r 13b8591dd045 Histogram.h --- a/Histogram.h Sat Sep 11 04:46:29 2010 -0700 +++ b/Histogram.h Thu Nov 11 05:37:07 2010 -0800 @@ -21,10 +21,13 @@ Histogram; Histogram * -makeHistogram( int numBins, int startOfRange, int endOfRange ); +makeHistogram( int32 numBins, int32 startOfRange, int32 endOfRange ); -void -addToHist( int value, Histogram *hist ); +void inline +addToHist( int32 value, Histogram *hist ); + +void inline +addIntervalToHist( int32 startIntvl, int32 endIntvl, Histogram *hist ); void printHist( Histogram *hist );