Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 94963 invoked from network); 24 Apr 2008 13:25:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Apr 2008 13:25:35 -0000 Received: (qmail 91477 invoked by uid 500); 24 Apr 2008 13:25:35 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 91412 invoked by uid 500); 24 Apr 2008 13:25:35 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 91401 invoked by uid 99); 24 Apr 2008 13:25:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Apr 2008 06:25:35 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Apr 2008 13:24:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 15DFF1A983A; Thu, 24 Apr 2008 06:25:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r651259 - in /commons/proper/math/branches/MATH_2_0/src/mantissa/src/org/spaceroots/mantissa/fitting: HarmonicFitter.java PolynomialFitter.java Date: Thu, 24 Apr 2008 13:25:11 -0000 To: commits@commons.apache.org From: luc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080424132513.15DFF1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: luc Date: Thu Apr 24 06:25:06 2008 New Revision: 651259 URL: http://svn.apache.org/viewvc?rev=651259&view=rev Log: removed deprecated methods this does not belong to commons-math yet, but will probably be merged some day Modified: commons/proper/math/branches/MATH_2_0/src/mantissa/src/org/spaceroots/mantissa/fitting/HarmonicFitter.java commons/proper/math/branches/MATH_2_0/src/mantissa/src/org/spaceroots/mantissa/fitting/PolynomialFitter.java Modified: commons/proper/math/branches/MATH_2_0/src/mantissa/src/org/spaceroots/mantissa/fitting/HarmonicFitter.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/mantissa/src/org/spaceroots/mantissa/fitting/HarmonicFitter.java?rev=651259&r1=651258&r2=651259&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_0/src/mantissa/src/org/spaceroots/mantissa/fitting/HarmonicFitter.java (original) +++ commons/proper/math/branches/MATH_2_0/src/mantissa/src/org/spaceroots/mantissa/fitting/HarmonicFitter.java Thu Apr 24 06:25:06 2008 @@ -73,65 +73,6 @@ firstGuessNeeded = false; } - /** - * Simple constructor. - * @param maxIterations maximum number of iterations allowed - * @param convergence criterion threshold below which we do not need - * to improve the criterion anymore - * @param steadyStateThreshold steady state detection threshold, the - * problem has reached a steady state (read converged) if - * Math.abs (Jn - Jn-1) < Jn * convergence, where - * Jn and Jn-1 are the current and - * preceding criterion value (square sum of the weighted residuals - * of considered measurements). - * @param epsilon threshold under which the matrix of the linearized - * problem is considered singular (see {@link - * org.spaceroots.mantissa.linalg.SquareMatrix#solve( - * org.spaceroots.mantissa.linalg.Matrix,double) SquareMatrix.solve}). - * @deprecated replaced by {@link #HarmonicFitter(Estimator)} - * as of version 7.0 - */ - public HarmonicFitter(int maxIterations, double convergence, - double steadyStateThreshold, double epsilon) { - this(new GaussNewtonEstimator(maxIterations, convergence, - steadyStateThreshold, epsilon)); - } - - /** - * Simple constructor. - - *

This constructor can be used when a first estimate of the - * coefficients is already known.

- - * @param coefficients first estimate of the coefficients. - * A reference to this array is hold by the newly created - * object. Its elements will be adjusted during the fitting process - * and they will be set to the adjusted coefficients at the end. - * @param maxIterations maximum number of iterations allowed - * @param convergence criterion threshold below which we do not need - * to improve the criterion anymore - * @param steadyStateThreshold steady state detection threshold, the - * problem has reached a steady state (read converged) if - * Math.abs (Jn - Jn-1) < Jn * convergence, where - * Jn and Jn-1 are the current and - * preceding criterion value (square sum of the weighted residuals - * of considered measurements). - * @param epsilon threshold under which the matrix of the linearized - * problem is considered singular (see {@link - * org.spaceroots.mantissa.linalg.SquareMatrix#solve( - * org.spaceroots.mantissa.linalg.Matrix,double) SquareMatrix.solve}). - - * @deprecated replaced by {@link #HarmonicFitter(EstimatedParameter[], - * Estimator)} as of version 7.0 - */ - public HarmonicFitter(EstimatedParameter[] coefficients, - int maxIterations, double convergence, - double steadyStateThreshold, double epsilon) { - this(coefficients, - new GaussNewtonEstimator(maxIterations, convergence, - steadyStateThreshold, epsilon)); - } - public double[] fit() throws EstimationException { if (firstGuessNeeded) { Modified: commons/proper/math/branches/MATH_2_0/src/mantissa/src/org/spaceroots/mantissa/fitting/PolynomialFitter.java URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/mantissa/src/org/spaceroots/mantissa/fitting/PolynomialFitter.java?rev=651259&r1=651258&r2=651259&view=diff ============================================================================== --- commons/proper/math/branches/MATH_2_0/src/mantissa/src/org/spaceroots/mantissa/fitting/PolynomialFitter.java (original) +++ commons/proper/math/branches/MATH_2_0/src/mantissa/src/org/spaceroots/mantissa/fitting/PolynomialFitter.java Thu Apr 24 06:25:06 2008 @@ -78,78 +78,6 @@ super(coefficients, estimator); } - /** Simple constructor. - - *

The polynomial fitter built this way are complete polynoms, - * ie. a n-degree polynom has n+1 coefficients. In order to build - * fitter for sparse polynoms (for example a x^20 - b - * x^30, on should first build the coefficients array and - * provide it to {@link - * #PolynomialFitter(PolynomialCoefficient[], int, double, double, - * double)}.

- * @param degree maximal degree of the polynom - * @param maxIterations maximum number of iterations allowed - * @param convergence criterion threshold below which we do not need - * to improve the criterion anymore - * @param steadyStateThreshold steady state detection threshold, the - * problem has reached a steady state (read converged) if - * Math.abs (Jn - Jn-1) < Jn * convergence, where - * Jn and Jn-1 are the current and - * preceding criterion value (square sum of the weighted residuals - * of considered measurements). - * @param epsilon threshold under which the matrix of the linearized - * problem is considered singular (see {@link - * org.spaceroots.mantissa.linalg.SquareMatrix#solve( - * org.spaceroots.mantissa.linalg.Matrix,double) SquareMatrix.solve}). - - * @deprecated replaced by {@link #PolynomialFitter(int,Estimator)} - * as of version 7.0 - */ - public PolynomialFitter(int degree, - int maxIterations, double convergence, - double steadyStateThreshold, double epsilon) { - this(degree, - new GaussNewtonEstimator(maxIterations, steadyStateThreshold, - convergence, epsilon)); - } - - /** Simple constructor. - - *

This constructor can be used either when a first estimate of - * the coefficients is already known (which is of little interest - * because the fit cost is the same whether a first guess is known or - * not) or when one needs to handle sparse polynoms like a - * x^20 - b x^30.

- - * @param coefficients first estimate of the coefficients. - * A reference to this array is hold by the newly created - * object. Its elements will be adjusted during the fitting process - * and they will be set to the adjusted coefficients at the end. - * @param maxIterations maximum number of iterations allowed - * @param convergence criterion threshold below which we do not need - * to improve the criterion anymore - * @param steadyStateThreshold steady state detection threshold, the - * problem has reached a steady state (read converged) if - * Math.abs (Jn - Jn-1) < Jn * convergence, where - * Jn and Jn-1 are the current and - * preceding criterion value (square sum of the weighted residuals - * of considered measurements). - * @param epsilon threshold under which the matrix of the linearized - * problem is considered singular (see {@link - * org.spaceroots.mantissa.linalg.SquareMatrix#solve( - * org.spaceroots.mantissa.linalg.Matrix,double) SquareMatrix.solve}). - - * @deprecated replaced by {@link #PolynomialFitter(PolynomialCoefficient[], - * Estimator)} as of version 7.0 - */ - public PolynomialFitter(PolynomialCoefficient[] coefficients, - int maxIterations, double convergence, - double steadyStateThreshold, double epsilon) { - this(coefficients, - new GaussNewtonEstimator(maxIterations, steadyStateThreshold, - convergence, epsilon)); - } - /** Get the value of the function at x according to the current parameters value. * @param x abscissa at which the theoretical value is requested * @return theoretical value at x