Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make HashMap final as it is only set in the ctors 

Document behaviour of getCount(Object v) if v is not comparable
Save value of getSumFreq() from DIV/0 check so we don't calculate it twice

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@765978 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2009-04-17 13:07:26 +00:00
parent f641b8cb31
commit 04d470232e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/org/apache/commons/math/stat/Frequency.java
View File

@ -49,7 +49,7 @@ public class Frequency implements Serializable {
private static final long serialVersionUID = -3845586908418844111L; private static final long serialVersionUID = -3845586908418844111L;
/** underlying collection */ /** underlying collection */
private TreeMap freqTable = null; private final TreeMap freqTable;
/** /**
* Default constructor. * Default constructor.
@ -193,6 +193,7 @@ public class Frequency implements Serializable {
/** /**
* Returns the number of values = v. * Returns the number of values = v.
* Returns 0 if the value is not comparable.
* *
* @param v the value to lookup. * @param v the value to lookup.
* @return the frequency of v. * @return the frequency of v.
@ -255,10 +256,11 @@ public class Frequency implements Serializable {
* @return the proportion of values equal to v * @return the proportion of values equal to v
*/ */
public double getPct(Object v) { public double getPct(Object v) {
if (getSumFreq() == 0) { final long sumFreq = getSumFreq();
if (sumFreq == 0) {
return Double.NaN; return Double.NaN;
} }
return (double) getCount(v) / (double) getSumFreq(); return (double) getCount(v) / (double) sumFreq;
} }
/** /**
@ -396,10 +398,11 @@ public class Frequency implements Serializable {
* @return the proportion of values less than or equal to v * @return the proportion of values less than or equal to v
*/ */
public double getCumPct(Object v) { public double getCumPct(Object v) {
if (getSumFreq() == 0) { final long sumFreq = getSumFreq();
if (sumFreq == 0) {
return Double.NaN; return Double.NaN;
} }
return (double) getCumFreq(v) / (double) getSumFreq(); return (double) getCumFreq(v) / (double) sumFreq;
} }
/** /**