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

Added comments and MaxCountInRange function to get the max bucket count in the specified range

This commit is contained in:
Paolo Cignoni 2016-04-20 22:05:28 +00:00
parent 5c37e87b06
commit eac3243375
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vcg/math/histogram.h
View File

@ -163,13 +163,13 @@ public:
*/ */
void SetRange(ScalarType _minv, ScalarType _maxv, int _n,ScalarType gamma=1.0 ); void SetRange(ScalarType _minv, ScalarType _maxv, int _n,ScalarType gamma=1.0 );
ScalarType MinV() {return minv;} //! Minimum value. ScalarType MinV() {return minv;} //! Minimum value of the range where the histogram is defined.
ScalarType MaxV() {return maxv;} //! Maximum value. ScalarType MaxV() {return maxv;} //! Maximum value of the range where the histogram is defined.
ScalarType Sum() {return sum;} //! Total sum of inserted values. ScalarType Sum() {return sum;} //! Total sum of inserted values.
ScalarType Cnt() {return cnt;} ScalarType Cnt() {return cnt;}
ScalarType MinElem() {return minElem;} //! Minimum element added to the histogram. It could be < or > than MinV;. ScalarType MinElem() {return minElem;} //! Minimum element that has been added to the histogram. It could be < or > than MinV;.
ScalarType MaxElem() {return maxElem;} //! Maximum element added to the histogram. It could be < or > than MinV;.. ScalarType MaxElem() {return maxElem;} //! Maximum element that has been added to the histogram. It could be < or > than MinV;..
/** /**
* Add a new value to the histogram. * Add a new value to the histogram.
@ -179,7 +179,8 @@ public:
*/ */
void Add(ScalarType v, ScalarType increment=ScalarType(1.0)); void Add(ScalarType v, ScalarType increment=ScalarType(1.0));
ScalarType MaxCount() const; ScalarType MaxCount() const; //! Max number of elements among all buckets (including the two infinity bounded buckets)
ScalarType MaxCountInRange() const; //! Max number of elements among all buckets between MinV and MaxV.
int BinNum() const {return n;} int BinNum() const {return n;}
ScalarType BinCount(ScalarType v); ScalarType BinCount(ScalarType v);
ScalarType BinCountInd(int index) {return H[index];} ScalarType BinCountInd(int index) {return H[index];}
@ -366,6 +367,12 @@ ScalarType Histogram<ScalarType>::MaxCount() const
return *(std::max_element(H.begin(),H.end())); return *(std::max_element(H.begin(),H.end()));
} }
template <class ScalarType>
ScalarType Histogram<ScalarType>::MaxCountInRange() const
{
return *(std::max_element(H.begin()+1,H.end()-1));
}
// Return the scalar value <r> such that there are <frac> samples <= <r>. // Return the scalar value <r> such that there are <frac> samples <= <r>.
// E.g. Percentile(0.0) will return R[1] e.g. min value // E.g. Percentile(0.0) will return R[1] e.g. min value
// E.g. Percentile(1.0) will return R[n+1] e.g max value // E.g. Percentile(1.0) will return R[n+1] e.g max value