manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added missing functions Avg, rms etc, now fully (almost) functional

This commit is contained in:
Paolo Cignoni 2005-04-04 10:48:35 +00:00
parent 4679fecf83
commit 1363b8c4a8
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
vcg/math/histogram.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.3 2005/03/14 09:23:40 cignoni
Added missing include<vector>
Revision 1.2 2004/08/25 15:15:26 ganovelli Revision 1.2 2004/08/25 15:15:26 ganovelli
minor changes to comply gcc compiler (typename's and stuff) minor changes to comply gcc compiler (typename's and stuff)
@ -60,10 +63,13 @@ public:
int Interize(ScalarType val); int Interize(ScalarType val);
void Add(ScalarType v); void Add(ScalarType v);
ScalarType Percentile(ScalarType frac) const; ScalarType Percentile(ScalarType frac) const;
ScalarType Avg(); ScalarType Avg() { return avg/cnt; }
ScalarType RMS(); ScalarType RMS() { return sqrt(rms/double(cnt));}
ScalarType Variance(); ScalarType Variance() { return rms/cnt-Avg()*Avg(); }
ScalarType StandardDeviation(); ScalarType StandardDeviation() { return sqrt(Variance()); }
void FileWrite(const std::string &filename);
void Clear(); void Clear();
}; };
@ -122,5 +128,14 @@ void Histogram<ScalarType>::Add(ScalarType v){
rms += v*v; rms += v*v;
} }
} }
template <class ScalarType>
void Histogram<ScalarType>::FileWrite(const std::string &filename){
FILE *fp;
fp=fopen(filename.c_str(),"w");
for(int i=0;i<H.size();i++)
fprintf (fp,"%12.8lf , %12.8lf \n",R[i],double(H[i])/cnt);
}
}// end namespace }// end namespace
#endif #endif