# HG changeset patch # User Sean Halle # Date 1379660468 25200 # Node ID eb23eeae41987883aa5838e066b7355105e3940c # Parent 8166ea441cb533aeff9c86cb4b3daa0f89e1895c updated include paths diff -r 8166ea441cb5 -r eb23eeae4198 DblHist.c --- a/DblHist.c Tue Jul 23 07:32:47 2013 -0700 +++ b/DblHist.c Fri Sep 20 00:01:08 2013 -0700 @@ -7,7 +7,8 @@ */ #include -#include "Histogram.h" +#include +#include /*This Histogram Abstract Data Type has a number of bins, the starting diff -r 8166ea441cb5 -r eb23eeae4198 FloatHist.c --- a/FloatHist.c Tue Jul 23 07:32:47 2013 -0700 +++ b/FloatHist.c Fri Sep 20 00:01:08 2013 -0700 @@ -6,7 +6,7 @@ * */ #include -#include "Histogram.h" +#include /*This Histogram Abstract Data Type has a number of bins, the starting * value, and the width of each bin, as a float, all chosen at creation. diff -r 8166ea441cb5 -r eb23eeae4198 Histogram.c --- a/Histogram.c Tue Jul 23 07:32:47 2013 -0700 +++ b/Histogram.c Fri Sep 20 00:01:08 2013 -0700 @@ -7,8 +7,8 @@ */ #include #include -#include "Histogram.h" -#include "PR__common_includes/Services_offered_by_PR/Memory_Handling/vmalloc__wrapper_library.h" +#include +#include /*This Histogram Abstract Data Type has a number of bins plus a range of * values that the bins span, both chosen at creation. diff -r 8166ea441cb5 -r eb23eeae4198 Histogram.h --- a/Histogram.h Tue Jul 23 07:32:47 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,101 +0,0 @@ -/* - * Copyright 2010 OpenSourceResearchInstitute.org - * Licensed under GNU General Public License version 2 - * - * Author: seanhalle@yahoo.com - * - */ - - -#ifndef _HISTOGRAM_H -#define _HISTOGRAM_H - -#include "PR__common_includes/PR__primitive_data_types.h" - - -typedef struct - { - char *name; - int32 startOfRange; - int32 endOfRange; - int32 numBins; - int32 binWidth; - int32 *bins; - } -Histogram; - -typedef struct - { - float32 startOfRange; - float32 endOfRange; - int32 numBins; - float32 binWidth; - int32 *bins; - } -FloatHist; - -typedef struct - { - float64 startOfRange; - float64 endOfRange; - int32 numBins; - float64 binWidth; - int32 *bins; - } -DblHist; - -Histogram * -makeHistogram( int32 numBins, int32 startOfRange, int32 endOfRange ); - -Histogram * -makeFixedBinHist( int32 numBins, int32 startOfRange, int32 binWidth, - char *name ); - -Histogram * -makeFixedBinHistExt( int32 numBins, int32 startOfRange, int32 binWidth, - char *name ); - -void inline -addToHist( int32 value, Histogram *hist ); - -void inline -addIntervalToHist( uint32 startIntvl, uint32 endIntvl, Histogram *hist ); - -void inline -subIntervalFromHist( int32 startIntvl, int32 endIntvl, Histogram *hist ); - -void -saveHistToFile(Histogram *hist); - -void -printHist( Histogram *hist ); - -FloatHist * -makeFloatHistogram( int numBins, float32 startOfRange, float32 binWidth ); - -void -addToFloatHist( float32 value, FloatHist *hist ); - -void -printFloatHist( FloatHist *hist ); - -void -freeHistExt( Histogram *hist ); - -void -freeHist( Histogram *hist ); - -DblHist * -makeDblHistogram( int numBins, float64 startOfRange, float64 binWidth ); - -void -addToDblHist( float64 value, DblHist *hist ); - -void -printDblHist( DblHist *hist ); - -void -freeDblHist( DblHist *hist ); - -#endif /* _HISTOGRAM_H */ - diff -r 8166ea441cb5 -r eb23eeae4198 prhistogram.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/prhistogram.h Fri Sep 20 00:01:08 2013 -0700 @@ -0,0 +1,102 @@ +/* + * Copyright 2010 OpenSourceResearchInstitute.org + * Licensed under GNU General Public License version 2 + * + * Author: seanhalle@yahoo.com + * + */ + + +#ifndef _PRHISTOGRAM_H +#define _PRHISTOGRAM_H + +#include +#include + + +typedef struct + { + char *name; + int32 startOfRange; + int32 endOfRange; + int32 numBins; + int32 binWidth; + int32 *bins; + } +Histogram; + +typedef struct + { + float32 startOfRange; + float32 endOfRange; + int32 numBins; + float32 binWidth; + int32 *bins; + } +FloatHist; + +typedef struct + { + float64 startOfRange; + float64 endOfRange; + int32 numBins; + float64 binWidth; + int32 *bins; + } +DblHist; + +Histogram * +makeHistogram( int32 numBins, int32 startOfRange, int32 endOfRange ); + +Histogram * +makeFixedBinHist( int32 numBins, int32 startOfRange, int32 binWidth, + char *name ); + +Histogram * +makeFixedBinHistExt( int32 numBins, int32 startOfRange, int32 binWidth, + char *name ); + +void inline +addToHist( int32 value, Histogram *hist ); + +void inline +addIntervalToHist( uint32 startIntvl, uint32 endIntvl, Histogram *hist ); + +void inline +subIntervalFromHist( int32 startIntvl, int32 endIntvl, Histogram *hist ); + +void +saveHistToFile(Histogram *hist); + +void +printHist( Histogram *hist ); + +FloatHist * +makeFloatHistogram( int numBins, float32 startOfRange, float32 binWidth ); + +void +addToFloatHist( float32 value, FloatHist *hist ); + +void +printFloatHist( FloatHist *hist ); + +void +freeHistExt( Histogram *hist ); + +void +freeHist( Histogram *hist ); + +DblHist * +makeDblHistogram( int numBins, float64 startOfRange, float64 binWidth ); + +void +addToDblHist( float64 value, DblHist *hist ); + +void +printDblHist( DblHist *hist ); + +void +freeDblHist( DblHist *hist ); + +#endif /* _HISTOGRAM_H */ +