pietsch 2003/09/26 12:30:33 Modified: math project.xml math/src/java/org/apache/commons/math/analysis SplineInterpolator.java math/src/java/org/apache/commons/math/stat AbstractStoreUnivariate.java AbstractUnivariate.java Applyable.java BeanListUnivariateImpl.java ListUnivariateImpl.java StoreUnivariateImpl.java UnivariateImpl.java math/src/java/org/apache/commons/math/stat/distribution AbstractDiscreteDistribution.java GammaDistributionImpl.java math/src/java/org/apache/commons/math/util ContractableDoubleArray.java ExpandableDoubleArray.java FixedDoubleArray.java math/src/test/org/apache/commons/math/random RandomDataTest.java math/xdocs tasks.xml Log: Fixed JavaDoc warnings. Fixed a few TODOs in the interpolation code. Updated project TODO list. Promoted myself to "developer". Revision Changes Path 1.25 +7 -5 jakarta-commons-sandbox/math/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/project.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- project.xml 17 Sep 2003 19:29:28 -0000 1.24 +++ project.xml 26 Sep 2003 19:30:32 -0000 1.25 @@ -36,6 +36,12 @@ <id>mdiggory</id> <email>[EMAIL PROTECTED]</email> </developer> + <developer> + <name>J.Pietschmann</name> + <id>pietsch</id> + <email>[EMAIL PROTECTED]</email> + <email>[EMAIL PROTECTED]</email> + </developer> </developers> <contributors> <contributor> @@ -53,10 +59,6 @@ <contributor> <name>Albert Davidson Chou</name> <email>[EMAIL PROTECTED]</email> - </contributor> - <contributor> - <name>J.Pietschmann</name> - <email>[EMAIL PROTECTED]</email> </contributor> </contributors> <dependencies> 1.5 +32 -31 jakarta-commons-sandbox/math/src/java/org/apache/commons/math/analysis/SplineInterpolator.java Index: SplineInterpolator.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/java/org/apache/commons/math/analysis/SplineInterpolator.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- SplineInterpolator.java 7 Sep 2003 03:12:56 -0000 1.4 +++ SplineInterpolator.java 26 Sep 2003 19:30:32 -0000 1.5 @@ -71,8 +71,7 @@ */ public UnivariateRealFunction interpolate(double[] xval, double[] yval) { if (xval.length != yval.length) { - throw new IllegalArgumentException( - "Dataset arrays must have same length."); + throw new IllegalArgumentException("Dataset arrays must have same length."); } if (c == null) { @@ -82,8 +81,7 @@ // Separation should be checked too (not implemented: which criteria?). for (int i = 0; i < n; i++) { if (xval[i] >= xval[i + 1]) { - throw new IllegalArgumentException( - "Dataset must specify sorted, ascending x values."); + throw new IllegalArgumentException("Dataset must specify sorted, ascending x values."); } } // Vectors for the equation system. There are n-1 equations for the unknowns s[i] (1<=i<=N-1), @@ -95,36 +93,39 @@ // ... // l[N-4]*s[N-3]+d[N-3]*s[N-2]+u[N-3]*s[N-1] = b[N-3] // l[N-3]*s[N-2]+d[N-2]*s[N-1] = b[N-2] - // Vector b is the right hand side of the system. + // Vector b is the right hand side (RHS) of the system. double b[] = new double[n - 1]; // Vector d is diagonal of the matrix and also holds the computed solution. double d[] = new double[n - 1]; - // u[] and l[] are not really needed, the computation can be folded into the - // system solving loops. - //double u[] = new double[n - 2]; // upper diagonal - //double l[] = new double[n - 2]; // lower diagonal - // Setup RHS and diagonal. + // Setup right hand side and diagonal. + double dquot = (yval[1] - yval[0]) / (xval[1] - xval[0]); for (int i = 0; i < n - 1; i++) { // TODO avoid recomputing the term // (yval[i + 2] - yval[i + 1]) / (xval[i + 2] - xval[i + 1]) // take it from the previous loop pass. Note: the interesting part of performance // loss is the range check in the array access, not the computation itself. - b[i] = 6.0 * ((yval[i + 2] - yval[i + 1]) / (xval[i + 2] - - xval[i + 1]) - (yval[i + 1] - yval[i]) / (xval[i + 1] - - xval[i])); + double dquotNext = + (yval[i + 2] - yval[i + 1]) / (xval[i + 2] - xval[i + 1]); + b[i] = 6.0 * (dquotNext - dquot); d[i] = 2.0 * (xval[i + 2] - xval[i]); + dquot = dquotNext; } + // u[] and l[] (for the upper and lower diagonal respectively) are not + // really needed, the computation is folded into the system solving loops. + // Keep this for documentation purposes: + //double u[] = new double[n - 2]; // upper diagonal + //double l[] = new double[n - 2]; // lower diagonal // Set up upper and lower diagonal. Keep the offsets in mind. //for (int i = 0; i < n - 2; i++) { - //u[i] = xval[i + 2] - xval[i + 1]; - //l[i] = xval[i + 2] - xval[i + 1]; + // u[i] = xval[i + 2] - xval[i + 1]; + // l[i] = xval[i + 2] - xval[i + 1]; //} // Solve the system: forward pass. for (int i = 0; i < n - 2; i++) { - // TODO: This relies on compiler for CSE of delta/d[i]. Is this a reasonable assumption? double delta = xval[i + 2] - xval[i + 1]; - d[i + 1] -= delta * delta / d[i]; - b[i + 1] -= b[i] * delta / d[i]; + double deltaquot = delta / d[i]; + d[i + 1] -= delta * deltaquot; + b[i + 1] -= b[i] * deltaquot; } // Solve the system: backward pass. d[n - 2] = b[n - 2] / d[n - 2]; @@ -134,23 +135,23 @@ // Compute coefficients as usual polynomial coefficients. // Not the best with respect to roundoff on evaluation, but simple. c = new double[n][4]; - c[0][3] = d[0] / (xval[1] - xval[0]) / 6.0; + double delta = xval[1] - xval[0]; + c[0][3] = d[0] / delta / 6.0; c[0][2] = 0.0; - c[0][1] = (yval[1] - yval[0]) / (xval[1] - xval[0]) - d[0] * - (xval[1] - xval[0]) / 6.0; + c[0][1] = (yval[1] - yval[0]) / delta - d[0] * delta / 6.0; for (int i = 1; i < n - 2; i++) { - // TODO: This relies on compiler for CSE of xval[i + 1] - xval[i]. Is this a reasonable assumption? - c[i][3] = (d[i] - d[i - 1]) / (xval[i + 1] - xval[i]) / 6.0; + delta = xval[i + 1] - xval[i]; + c[i][3] = (d[i] - d[i - 1]) / delta / 6.0; c[i][2] = d[i - 1] / 2.0; - c[i][1] = (yval[i + 1] - yval[i]) / (xval[i + 1] - xval[i]) - - d[i] * (xval[i + 1] - xval[i]) / 6.0 - d[i - 1] * - (xval[i + 1] - xval[i]) / 3.0; + c[i][1] = + (yval[i + 1] - yval[i]) / delta + - (d[i] / 2.0 - d[i - 1]) * delta / 3.0; } - // TODO: again, CSE aspects. - c[n - 1][3] = -d[n - 2] / (xval[n] - xval[n - 1]) / 6.0; + delta = (xval[n] - xval[n - 1]); + c[n - 1][3] = -d[n - 2] / delta / 6.0; c[n - 1][2] = d[n - 2] / 2.0; - c[n - 1][1] = (yval[n] - yval[n - 1]) / (xval[n] - xval[n - 1]) - - d[n - 2] * (xval[n] - xval[n - 1]) / 3.0; + c[n - 1][1] = + (yval[n] - yval[n - 1]) / delta - d[n - 2] * delta / 3.0; for (int i = 0; i < n; i++) { c[i][0] = yval[i]; } 1.11 +2 -2 jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/AbstractStoreUnivariate.java Index: AbstractStoreUnivariate.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/AbstractStoreUnivariate.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- AbstractStoreUnivariate.java 15 Jul 2003 03:45:10 -0000 1.10 +++ AbstractStoreUnivariate.java 26 Sep 2003 19:30:32 -0000 1.11 @@ -92,7 +92,7 @@ } /** - * @see org.apache.commons.math.stat2.AbstractStoreUnivariate#getSortedValues() + * @see org.apache.commons.math.stat.StoreUnivariate#getSortedValues() */ public double[] getSortedValues() { double[] sort = getValues(); 1.3 +4 -4 jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/AbstractUnivariate.java Index: AbstractUnivariate.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/AbstractUnivariate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractUnivariate.java 15 Jul 2003 03:45:10 -0000 1.2 +++ AbstractUnivariate.java 26 Sep 2003 19:30:32 -0000 1.3 @@ -294,7 +294,7 @@ } /** - * @see org.apache.commons.math.Univariate#clear() + * @see org.apache.commons.math.stat.Univariate#clear() */ public void clear() { this.n = 0; @@ -313,14 +313,14 @@ } /** - * @see org.apache.commons.math.Univariate#getWindowSize() + * @see org.apache.commons.math.stat.Univariate#getWindowSize() */ public int getWindowSize() { return windowSize; } /** - * @see org.apache.commons.math.Univariate#setWindowSize(int) + * @see org.apache.commons.math.stat.Univariate#setWindowSize(int) */ public void setWindowSize(int windowSize) { clear(); 1.2 +52 -4 jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/Applyable.java Index: Applyable.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/Applyable.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Applyable.java 17 Sep 2003 19:19:09 -0000 1.1 +++ Applyable.java 26 Sep 2003 19:30:32 -0000 1.2 @@ -1,6 +1,55 @@ -/* - * Created on Jul 15, 2003 +/* ==================================================================== + * The Apache Software License, Version 1.1 * + * Copyright (c) 2003 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowlegement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements normally appear. + * + * 4. The names "The Jakarta Project", "Commons", and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact [EMAIL PROTECTED] + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. */ package org.apache.commons.math.stat; @@ -9,8 +58,7 @@ /** * Applyable.java * - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments + * TODO: add javadocs * */ public interface Applyable { 1.6 +2 -2 jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/BeanListUnivariateImpl.java Index: BeanListUnivariateImpl.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/BeanListUnivariateImpl.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- BeanListUnivariateImpl.java 7 Sep 2003 03:12:56 -0000 1.5 +++ BeanListUnivariateImpl.java 26 Sep 2003 19:30:32 -0000 1.6 @@ -109,7 +109,7 @@ } /** - * @see org.apache.commons.math.Univariate#addValue(double) + * @see org.apache.commons.math.stat.Univariate#addValue(double) */ public void addValue(double v) { String msg = 1.6 +6 -6 jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/ListUnivariateImpl.java Index: ListUnivariateImpl.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/ListUnivariateImpl.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ListUnivariateImpl.java 7 Sep 2003 03:12:56 -0000 1.5 +++ ListUnivariateImpl.java 26 Sep 2003 19:30:32 -0000 1.6 @@ -97,7 +97,7 @@ } /** - * @see org.apache.commons.math.StoreUnivariate#getValues() + * @see org.apache.commons.math.stat.StoreUnivariate#getValues() */ public double[] getValues() { @@ -124,7 +124,7 @@ } /** - * @see org.apache.commons.math.StoreUnivariate#getElement(int) + * @see org.apache.commons.math.stat.StoreUnivariate#getElement(int) */ public double getElement(int index) { @@ -148,7 +148,7 @@ } /** - * @see org.apache.commons.math.Univariate#getN() + * @see org.apache.commons.math.stat.Univariate#getN() */ public int getN() { int n = 0; @@ -166,7 +166,7 @@ } /** - * @see org.apache.commons.math.Univariate#addValue(double) + * @see org.apache.commons.math.stat.Univariate#addValue(double) */ public void addValue(double v) { list.add(new Double(v)); @@ -181,7 +181,7 @@ } /** - * @see org.apache.commons.math.Univariate#clear() + * @see org.apache.commons.math.stat.Univariate#clear() */ public void clear() { super.clear(); 1.7 +7 -7 jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/StoreUnivariateImpl.java Index: StoreUnivariateImpl.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/StoreUnivariateImpl.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- StoreUnivariateImpl.java 7 Sep 2003 03:12:56 -0000 1.6 +++ StoreUnivariateImpl.java 26 Sep 2003 19:30:32 -0000 1.7 @@ -74,7 +74,7 @@ } /** - * @see org.apache.commons.math.StoreUnivariate#getValues() + * @see org.apache.commons.math.stat.StoreUnivariate#getValues() */ public double[] getValues() { @@ -89,21 +89,21 @@ } /** - * @see org.apache.commons.math.StoreUnivariate#getElement(int) + * @see org.apache.commons.math.stat.StoreUnivariate#getElement(int) */ public double getElement(int index) { return eDA.getElement(index); } /** - * @see org.apache.commons.math.Univariate#getN() + * @see org.apache.commons.math.stat.Univariate#getN() */ public int getN() { return eDA.getNumElements(); } /** - * @see org.apache.commons.math.Univariate#addValue(double) + * @see org.apache.commons.math.stat.Univariate#addValue(double) */ public synchronized void addValue(double v) { if (windowSize != Univariate.INFINITE_WINDOW) { @@ -123,7 +123,7 @@ } /** - * @see org.apache.commons.math.Univariate#clear() + * @see org.apache.commons.math.stat.Univariate#clear() */ public synchronized void clear() { super.clear(); @@ -131,7 +131,7 @@ } /** - * @see org.apache.commons.math.Univariate#setWindowSize(int) + * @see org.apache.commons.math.stat.Univariate#setWindowSize(int) */ public synchronized void setWindowSize(int windowSize) { this.windowSize = windowSize; 1.20 +2 -2 jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/UnivariateImpl.java Index: UnivariateImpl.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/UnivariateImpl.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- UnivariateImpl.java 15 Jul 2003 03:45:10 -0000 1.19 +++ UnivariateImpl.java 26 Sep 2003 19:30:32 -0000 1.20 @@ -152,7 +152,7 @@ } /** - * @see org.apache.commons.math.Univariate#clear() + * @see org.apache.commons.math.stat.Univariate#clear() */ public void clear() { super.clear(); 1.2 +3 -3 jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/distribution/AbstractDiscreteDistribution.java Index: AbstractDiscreteDistribution.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/distribution/AbstractDiscreteDistribution.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AbstractDiscreteDistribution.java 16 Aug 2003 17:06:15 -0000 1.1 +++ AbstractDiscreteDistribution.java 26 Sep 2003 19:30:33 -0000 1.2 @@ -139,7 +139,7 @@ /** * Access the domain value lower bound, based on <code>p</code>, used to * bracket a PDF root. This method is used by - * [EMAIL PROTECTED] #inverseCummulativeProbability(int)} to find critical values. + * [EMAIL PROTECTED] #inverseCummulativeProbability(double)} to find critical values. * * @param p the desired probability for the critical value * @return domain value lower bound, i.e. @@ -150,7 +150,7 @@ /** * Access the domain value upper bound, based on <code>p</code>, used to * bracket a PDF root. This method is used by - * [EMAIL PROTECTED] #inverseCummulativeProbability(int)} to find critical values. + * [EMAIL PROTECTED] #inverseCummulativeProbability(double)} to find critical values. * * @param p the desired probability for the critical value * @return domain value upper bound, i.e. 1.7 +5 -6 jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/distribution/GammaDistributionImpl.java Index: GammaDistributionImpl.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/java/org/apache/commons/math/stat/distribution/GammaDistributionImpl.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- GammaDistributionImpl.java 17 Sep 2003 19:29:28 -0000 1.6 +++ GammaDistributionImpl.java 26 Sep 2003 19:30:33 -0000 1.7 @@ -153,7 +153,7 @@ * @param p the desired probability for the critical value * @return domain value lower bound, i.e. * P(X < <i>lower bound</i>) < <code>p</code> - * @todo try to improve on this estimate + * TODO: try to improve on this estimate */ protected double getDomainLowerBound(double p) { return Double.MIN_VALUE; @@ -167,7 +167,7 @@ * @param p the desired probability for the critical value * @return domain value upper bound, i.e. * P(X < <i>upper bound</i>) > <code>p</code> - * @todo try to improve on this estimate + * TODO: try to improve on this estimate */ protected double getDomainUpperBound(double p) { // NOTE: gamma is skewed to the left @@ -193,11 +193,10 @@ * * @param p the desired probability for the critical value * @return initial domain value - * @todo try to improve on this estimate + * TODO: try to improve on this estimate */ protected double getInitialDomain(double p) { - // NOTE: gamma is skewed to the left - // NOTE: therefore, P(X < μ) > .5 + // Gamma is skewed to the left, therefore, P(X < μ) > .5 double ret; 1.5 +3 -3 jakarta-commons-sandbox/math/src/java/org/apache/commons/math/util/ContractableDoubleArray.java Index: ContractableDoubleArray.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/java/org/apache/commons/math/util/ContractableDoubleArray.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ContractableDoubleArray.java 7 Sep 2003 03:12:56 -0000 1.4 +++ ContractableDoubleArray.java 26 Sep 2003 19:30:33 -0000 1.5 @@ -246,7 +246,7 @@ * must validate the combination of expansionFactor and * contractionCriteria. * - * @see org.apache.commons.math.ExpandableDoubleArray#setExpansionFactor(float) + * @see org.apache.commons.math.util.ExpandableDoubleArray#setExpansionFactor(float) */ public void setExpansionFactor(float expansionFactor) { checkContractExpand(getContractionCriteria(), expansionFactor); @@ -318,7 +318,7 @@ } /** - * @see org.apache.commons.math.ExpandableDoubleArray#discardFrontElements(int) + * @see org.apache.commons.math.util.ExpandableDoubleArray#discardFrontElements(int) */ public synchronized void discardFrontElements(int i) { super.discardFrontElements(i); 1.6 +2 -2 jakarta-commons-sandbox/math/src/java/org/apache/commons/math/util/ExpandableDoubleArray.java Index: ExpandableDoubleArray.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/java/org/apache/commons/math/util/ExpandableDoubleArray.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ExpandableDoubleArray.java 7 Sep 2003 03:12:56 -0000 1.5 +++ ExpandableDoubleArray.java 26 Sep 2003 19:30:33 -0000 1.6 @@ -415,7 +415,7 @@ } /** - * @see org.apache.commons.math.DoubleArray#getElements() + * @see org.apache.commons.math.util.DoubleArray#getElements() */ public double[] getElements() { double[] elementArray = new double[numElements]; 1.7 +7 -7 jakarta-commons-sandbox/math/src/java/org/apache/commons/math/util/FixedDoubleArray.java Index: FixedDoubleArray.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/java/org/apache/commons/math/util/FixedDoubleArray.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- FixedDoubleArray.java 7 Sep 2003 03:12:56 -0000 1.6 +++ FixedDoubleArray.java 26 Sep 2003 19:30:33 -0000 1.7 @@ -144,7 +144,7 @@ /** * Retrieves the current size of the array. - * @see org.apache.commons.math.DoubleArray#getNumElements() + * @see org.apache.commons.math.util.DoubleArray#getNumElements() */ public int getNumElements() { return size; @@ -159,7 +159,7 @@ * 2 - trying to retrieve an element outside of the current element * array will throw an ArrayIndexOutOfBoundsException. * - * @see org.apache.commons.math.DoubleArray#getElement(int) + * @see org.apache.commons.math.util.DoubleArray#getElement(int) */ public double getElement(int index) { if (index > (size - 1)) { @@ -198,7 +198,7 @@ * </ul> * </p> * - * @see org.apache.commons.math.DoubleArray#setElement(int, double) + * @see org.apache.commons.math.util.DoubleArray#setElement(int, double) */ public void setElement(int index, double value) { if (index > (size - 1)) { @@ -215,7 +215,7 @@ * this array has already met or exceeded the maximum number * of elements * - * @see org.apache.commons.math.DoubleArray#addElement(double) + * @see org.apache.commons.math.util.DoubleArray#addElement(double) */ public void addElement(double value) { if (size < internalArray.length) { @@ -305,7 +305,7 @@ * * @return The array of elements added to this DoubleArray * implementation. - * @see org.apache.commons.math.DoubleArray#getElements() + * @see org.apache.commons.math.util.DoubleArray#getElements() */ public double[] getElements() { double[] copy = new double[size]; @@ -336,7 +336,7 @@ * setting the size of the array back to zero, and reinitializing * the internal storage array. * - * @see org.apache.commons.math.DoubleArray#clear() + * @see org.apache.commons.math.util.DoubleArray#clear() */ public void clear() { size = 0; 1.3 +2 -2 jakarta-commons-sandbox/math/src/test/org/apache/commons/math/random/RandomDataTest.java Index: RandomDataTest.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/src/test/org/apache/commons/math/random/RandomDataTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RandomDataTest.java 7 Jul 2003 23:19:21 -0000 1.2 +++ RandomDataTest.java 26 Sep 2003 19:30:33 -0000 1.3 @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the - * distribution. + * distribution. * * 3. The end-user documentation included with the redistribution, if * any, must include the following acknowlegement: 1.9 +4 -3 jakarta-commons-sandbox/math/xdocs/tasks.xml Index: tasks.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/math/xdocs/tasks.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- tasks.xml 24 Sep 2003 20:15:50 -0000 1.8 +++ tasks.xml 26 Sep 2003 19:30:33 -0000 1.9 @@ -40,8 +40,7 @@ <dt>Analysis.</dt> <dd> <ul> - <li>Framework and implementation strategie(s) for finding roots or real-valued functions of one (real) variable.</li> - <li>Cubic spline interpolation.</li> + <li>Rework unit tests for root finding and spline interpolation.</li> <li>CheckStyle with modified properties still shows many errors. Try to clean these up.</li> </ul> </dd> @@ -62,6 +61,8 @@ <section name="Completed"> <subsection name="Since Conception"> <ul> + <li>Framework and implementation strategie(s) for finding roots or real-valued functions of one (real) variable. Implemented algorithms: Brent-Dekker, secant, simple bisection.</li> + <li>Cubic spline interpolation.</li> <li>Bivariate Regression, correlation. </li> <li>Sampling from Collections</li> <li>Add higher order moments to Univariate implementations.</li>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]