psteitz 2004/07/17 22:39:30
Modified: math/src/java/org/apache/commons/math/stat/univariate/moment
FirstMoment.java FourthMoment.java
SecondMoment.java ThirdMoment.java
math/src/java/org/apache/commons/math/stat/univariate/rank
Max.java Min.java
math/src/java/org/apache/commons/math/stat/univariate/summary
Product.java Sum.java SumOfLogs.java
SumOfSquares.java
Log:
Added constructor.
Revision Changes Path
1.20 +15 -6
jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/moment/FirstMoment.java
Index: FirstMoment.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/moment/FirstMoment.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FirstMoment.java 10 Jul 2004 17:09:08 -0000 1.19
+++ FirstMoment.java 18 Jul 2004 05:39:30 -0000 1.20
@@ -51,25 +51,35 @@
static final long serialVersionUID = -803343206421984070L;
/** Count of values that have been added */
- protected long n = 0;
+ protected long n;
/** First moment of values that have been added */
- protected double m1 = Double.NaN;
+ protected double m1;
/**
* Deviation of most recently added value from previous first moment.
* Retained to prevent repeated computation in higher order moments.
*/
- protected double dev = Double.NaN;
+ protected double dev;
/**
* Deviation of most recently added value from previous first moment,
* normalized by previous sample size. Retained to prevent repeated
* computation in higher order moments
*/
- protected double nDev = Double.NaN;
+ protected double nDev;
/**
+ * Create a FirstMoment instance
+ */
+ public FirstMoment() {
+ n = 0;
+ m1 = Double.NaN;
+ dev = Double.NaN;
+ nDev = Double.NaN;
+ }
+
+ /**
* @see
org.apache.commons.math.stat.univariate.StorelessUnivariateStatistic#increment(double)
*/
public void increment(final double d) {
@@ -106,5 +116,4 @@
public long getN() {
return n;
}
-
}
1.21 +10 -2
jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/moment/FourthMoment.java
Index: FourthMoment.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/moment/FourthMoment.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- FourthMoment.java 4 Jul 2004 09:02:36 -0000 1.20
+++ FourthMoment.java 18 Jul 2004 05:39:30 -0000 1.21
@@ -55,8 +55,16 @@
static final long serialVersionUID = 4763990447117157611L;
/** fourth moment of values that have been added */
- protected double m4 = Double.NaN;
+ protected double m4;
+ /**
+ * Create a FourthMoment instance
+ */
+ public FourthMoment() {
+ super();
+ m4 = Double.NaN;
+ }
+
/**
* @see
org.apache.commons.math.stat.univariate.StorelessUnivariateStatistic#increment(double)
*/
1.20 +10 -2
jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/moment/SecondMoment.java
Index: SecondMoment.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/moment/SecondMoment.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SecondMoment.java 4 Jul 2004 09:02:36 -0000 1.19
+++ SecondMoment.java 18 Jul 2004 05:39:30 -0000 1.20
@@ -47,8 +47,16 @@
static final long serialVersionUID = 3942403127395076445L;
/** second moment of values that have been added */
- protected double m2 = Double.NaN;
+ protected double m2;
+ /**
+ * Create a SecondMoment instance
+ */
+ public SecondMoment() {
+ super();
+ m2 = Double.NaN;
+ }
+
/**
* @see
org.apache.commons.math.stat.univariate.StorelessUnivariateStatistic#increment(double)
*/
1.20 +11 -3
jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/moment/ThirdMoment.java
Index: ThirdMoment.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/moment/ThirdMoment.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ThirdMoment.java 4 Jul 2004 09:02:36 -0000 1.19
+++ ThirdMoment.java 18 Jul 2004 05:39:30 -0000 1.20
@@ -48,15 +48,23 @@
static final long serialVersionUID = -7818711964045118679L;
/** third moment of values that have been added */
- protected double m3 = Double.NaN;
+ protected double m3;
/**
* Square of deviation of most recently added value from previous first
* moment, normalized by previous sample size. Retained to prevent
* repeated computation in higher order moments. nDevSq = nDev * nDev.
*/
- protected double nDevSq = Double.NaN;
+ protected double nDevSq;
+ /**
+ * Create a FourthMoment instance
+ */
+ public ThirdMoment() {
+ super();
+ m3 = Double.NaN;
+ nDevSq = Double.NaN;
+ }
/**
* @see
org.apache.commons.math.stat.univariate.StorelessUnivariateStatistic#increment(double)
1.22 +12 -4
jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/rank/Max.java
Index: Max.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/rank/Max.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Max.java 11 Jul 2004 18:39:08 -0000 1.21
+++ Max.java 18 Jul 2004 05:39:30 -0000 1.22
@@ -36,17 +36,25 @@
*
* @version $Revision$ $Date$
*/
-public class Max extends AbstractStorelessUnivariateStatistic implements
Serializable {
+public class Max extends AbstractStorelessUnivariateStatistic {
/** Serializable version identifier */
static final long serialVersionUID = -5593383832225844641L;
/** Number of values that have been added */
- private long n = 0;
+ private long n;
/** Current value of the statistic */
- private double value = Double.NaN;
+ private double value;
+ /**
+ * Create a Max instance
+ */
+ public Max() {
+ n = 0;
+ value = Double.NaN;
+ }
+
/**
* @see
org.apache.commons.math.stat.univariate.StorelessUnivariateStatistic#increment(double)
*/
1.23 +11 -3
jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/rank/Min.java
Index: Min.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/rank/Min.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Min.java 11 Jul 2004 18:39:08 -0000 1.22
+++ Min.java 18 Jul 2004 05:39:30 -0000 1.23
@@ -42,11 +42,19 @@
static final long serialVersionUID = -2941995784909003131L;
/**Number of values that have been added */
- private long n = 0;
+ private long n;
/**Current value of the statistic */
- private double value = Double.NaN;
+ private double value;
+ /**
+ * Create a Min instance
+ */
+ public Min() {
+ n = 0;
+ value = Double.NaN;
+ }
+
/**
* @see
org.apache.commons.math.stat.univariate.StorelessUnivariateStatistic#increment(double)
*/
1.22 +11 -3
jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/summary/Product.java
Index: Product.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/summary/Product.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Product.java 10 Jul 2004 17:09:08 -0000 1.21
+++ Product.java 18 Jul 2004 05:39:30 -0000 1.22
@@ -38,13 +38,21 @@
static final long serialVersionUID = 2824226005990582538L;
/**The number of values that have been added */
- private long n = 0;
+ private long n;
/**
* The current Running Product.
*/
- private double value = Double.NaN;
+ private double value;
+ /**
+ * Create a Product instance
+ */
+ public Product() {
+ n = 0;
+ value = Double.NaN;
+ }
+
/**
* @see
org.apache.commons.math.stat.univariate.StorelessUnivariateStatistic#increment(double)
*/
1.25 +11 -3
jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/summary/Sum.java
Index: Sum.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/summary/Sum.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Sum.java 10 Jul 2004 17:09:08 -0000 1.24
+++ Sum.java 18 Jul 2004 05:39:30 -0000 1.25
@@ -38,13 +38,21 @@
static final long serialVersionUID = -8231831954703408316L;
/** */
- private long n = 0;
+ private long n;
/**
* The currently running sum.
*/
- private double value = Double.NaN;
+ private double value;
+ /**
+ * Create a Sum instance
+ */
+ public Sum() {
+ n = 0;
+ value = Double.NaN;
+ }
+
/**
* @see
org.apache.commons.math.stat.univariate.StorelessUnivariateStatistic#increment(double)
*/
1.22 +14 -5
jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/summary/SumOfLogs.java
Index: SumOfLogs.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/summary/SumOfLogs.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SumOfLogs.java 10 Jul 2004 17:09:08 -0000 1.21
+++ SumOfLogs.java 18 Jul 2004 05:39:30 -0000 1.22
@@ -25,8 +25,9 @@
* Uses [EMAIL PROTECTED] java.lang.Math#log(double)} to compute the logs.
Therefore,
* <ul>
* <li>If any of values are < 0, the result is <code>NaN.</code></li>
- * <li>If all values are non-negative and less than
<code>Double.POSITIVE_INFINITY</code>,
- * but at least one value is 0, the result is
<code>Double.NEGATIVE_INFINITY.</code></li>
+ * <li>If all values are non-negative and less than
+ * <code>Double.POSITIVE_INFINITY</code>, but at least one value is 0, the
+ * result is <code>Double.NEGATIVE_INFINITY.</code></li>
* <li>If both <code>Double.POSITIVE_INFINITY</code> and
* <code>Double.NEGATIVE_INFINITY</code> are among the values, the result is
* <code>NaN.</code></li>
@@ -45,12 +46,20 @@
static final long serialVersionUID = -370076995648386763L;
/**Number of values that have been added */
- private int n = 0;
+ private int n;
/**
* The currently running value
*/
- private double value = 0d;
+ private double value;
+
+ /**
+ * Create a SumOfLogs instance
+ */
+ public SumOfLogs() {
+ value = 0d;
+ n = 0;
+ }
/**
* @see
org.apache.commons.math.stat.univariate.StorelessUnivariateStatistic#increment(double)
1.22 +11 -3
jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/summary/SumOfSquares.java
Index: SumOfSquares.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/math/src/java/org/apache/commons/math/stat/univariate/summary/SumOfSquares.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SumOfSquares.java 10 Jul 2004 17:09:08 -0000 1.21
+++ SumOfSquares.java 18 Jul 2004 05:39:30 -0000 1.22
@@ -38,13 +38,21 @@
static final long serialVersionUID = 1460986908574398008L;
/** */
- private long n = 0;
+ private long n;
/**
* The currently running sumSq
*/
- private double value = Double.NaN;
+ private double value;
+ /**
+ * Create a SumOfSquares instance
+ */
+ public SumOfSquares() {
+ n = 0;
+ value = Double.NaN;
+ }
+
/**
* @see
org.apache.commons.math.stat.univariate.StorelessUnivariateStatistic#increment(double)
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
