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

Added Percentile and removed small bug in Add

This commit is contained in:
Paolo Cignoni 2005-06-07 07:44:08 +00:00
parent cd855e4e57
commit 17fb55c9e0
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vcg/math/histogram.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.4 2005/04/04 10:48:35 cignoni
Added missing functions Avg, rms etc, now fully (almost) functional
Revision 1.3 2005/03/14 09:23:40 cignoni Revision 1.3 2005/03/14 09:23:40 cignoni
Added missing include<vector> Added missing include<vector>
@ -121,12 +124,13 @@ int Histogram<ScalarType>::Interize(ScalarType val)
template <class ScalarType> template <class ScalarType>
void Histogram<ScalarType>::Add(ScalarType v){ void Histogram<ScalarType>::Add(ScalarType v){
int pos= lower_bound(R.begin(),R.end(),v)-R.begin()-1; int pos= lower_bound(R.begin(),R.end(),v)-R.begin()-1;
if(pos<=n){ if(pos>=0 && pos<=n){
++H[pos]; ++H[pos];
++cnt; ++cnt;
avg+=v; avg+=v;
rms += v*v; rms += v*v;
} }
} }
@ -137,5 +141,26 @@ fp=fopen(filename.c_str(),"w");
for(int i=0;i<H.size();i++) for(int i=0;i<H.size();i++)
fprintf (fp,"%12.8lf , %12.8lf \n",R[i],double(H[i])/cnt); fprintf (fp,"%12.8lf , %12.8lf \n",R[i],double(H[i])/cnt);
} }
template <class ScalarType>
ScalarType Histogram<ScalarType>::Percentile(ScalarType frac) const
{
if(H.size()==0 && R.size()==0) return 0;
assert(frac>=0 && frac<=1);
ScalarType sum=0,partsum=0;
int isum=0,ipartsum=0;
for(int i=0;i<n+1;i++) { sum+=H[i]; isum+=H[i];}
assert(isum==cnt);
assert(sum==cnt);
sum*=frac;
for(i=0;i<n;i++) {
partsum+=H[i];
if(partsum>=sum) break;
}
return R[i+1];
}
}// end namespace }// end namespace
#endif #endif