From commits-return-22119-apmail-commons-commits-archive=commons.apache.org@commons.apache.org Thu Sep 15 14:28:07 2011 Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 874038713 for ; Thu, 15 Sep 2011 14:28:07 +0000 (UTC) Received: (qmail 63235 invoked by uid 500); 15 Sep 2011 14:28:07 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 63173 invoked by uid 500); 15 Sep 2011 14:28:07 -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 63166 invoked by uid 99); 15 Sep 2011 14:28:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Sep 2011 14:28:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Sep 2011 14:28:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0E5FD23889E2 for ; Thu, 15 Sep 2011 14:27:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1171111 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/ Date: Thu, 15 Sep 2011 14:27:41 -0000 To: commits@commons.apache.org From: celestin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110915142742.0E5FD23889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: celestin Date: Thu Sep 15 14:27:41 2011 New Revision: 1171111 URL: http://svn.apache.org/viewvc?rev=1171111&view=rev Log: Removed references to checked exception ConvergenceException in package o.a.c.m.analysis.integration. See JIRA MATH-669. Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegratorImpl.java Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java?rev=1171111&r1=1171110&r2=1171111&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java Thu Sep 15 14:27:41 2011 @@ -16,8 +16,8 @@ */ package org.apache.commons.math.analysis.integration; -import org.apache.commons.math.ConvergenceException; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.MaxCountExceededException; import org.apache.commons.math.exception.NotStrictlyPositiveException; import org.apache.commons.math.exception.NumberIsTooSmallException; import org.apache.commons.math.exception.TooManyEvaluationsException; @@ -195,7 +195,7 @@ public class LegendreGaussIntegrator ext /** {@inheritDoc} */ protected double doIntegrate() - throws TooManyEvaluationsException, ConvergenceException { + throws TooManyEvaluationsException, MaxCountExceededException { // compute first estimate with a single step double oldt = stage(1); Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java?rev=1171111&r1=1171110&r2=1171111&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java Thu Sep 15 14:27:41 2011 @@ -16,7 +16,7 @@ */ package org.apache.commons.math.analysis.integration; -import org.apache.commons.math.ConvergenceException; +import org.apache.commons.math.exception.MaxCountExceededException; import org.apache.commons.math.exception.NotStrictlyPositiveException; import org.apache.commons.math.exception.NumberIsTooLargeException; import org.apache.commons.math.exception.NumberIsTooSmallException; @@ -99,7 +99,7 @@ public class RombergIntegrator extends U /** {@inheritDoc} */ protected double doIntegrate() - throws TooManyEvaluationsException, ConvergenceException { + throws TooManyEvaluationsException, MaxCountExceededException { final int m = iterations.getMaximalCount() + 1; double previousRow[] = new double[m]; Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java?rev=1171111&r1=1171110&r2=1171111&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java Thu Sep 15 14:27:41 2011 @@ -16,7 +16,7 @@ */ package org.apache.commons.math.analysis.integration; -import org.apache.commons.math.ConvergenceException; +import org.apache.commons.math.exception.MaxCountExceededException; import org.apache.commons.math.exception.NotStrictlyPositiveException; import org.apache.commons.math.exception.NumberIsTooLargeException; import org.apache.commons.math.exception.NumberIsTooSmallException; @@ -98,7 +98,7 @@ public class SimpsonIntegrator extends U /** {@inheritDoc} */ protected double doIntegrate() - throws TooManyEvaluationsException, ConvergenceException { + throws TooManyEvaluationsException, MaxCountExceededException { TrapezoidIntegrator qtrap = new TrapezoidIntegrator(); if (minimalIterationCount == 1) { Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java?rev=1171111&r1=1171110&r2=1171111&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java Thu Sep 15 14:27:41 2011 @@ -16,7 +16,7 @@ */ package org.apache.commons.math.analysis.integration; -import org.apache.commons.math.ConvergenceException; +import org.apache.commons.math.exception.MaxCountExceededException; import org.apache.commons.math.exception.NotStrictlyPositiveException; import org.apache.commons.math.exception.NumberIsTooLargeException; import org.apache.commons.math.exception.NumberIsTooSmallException; @@ -107,7 +107,7 @@ public class TrapezoidIntegrator extends * arbitrary m sections because this configuration can best utilize the * alrealy computed values.

* - * @param baseIntegrator integrator holdingintegration parameters + * @param baseIntegrator integrator holding integration parameters * @param n the stage of 1/2 refinement, n = 0 is no refinement * @return the value of n-th stage integral * @throws TooManyEvaluationsException if the maximal number of evaluations @@ -139,7 +139,7 @@ public class TrapezoidIntegrator extends /** {@inheritDoc} */ protected double doIntegrate() - throws TooManyEvaluationsException, ConvergenceException { + throws TooManyEvaluationsException, MaxCountExceededException { double oldt = stage(this, 0); iterations.incrementCount(); Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java?rev=1171111&r1=1171110&r2=1171111&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java Thu Sep 15 14:27:41 2011 @@ -16,9 +16,9 @@ */ package org.apache.commons.math.analysis.integration; -import org.apache.commons.math.ConvergenceException; import org.apache.commons.math.analysis.UnivariateRealFunction; import org.apache.commons.math.exception.MathIllegalArgumentException; +import org.apache.commons.math.exception.MaxCountExceededException; import org.apache.commons.math.exception.NullArgumentException; import org.apache.commons.math.exception.TooManyEvaluationsException; @@ -67,14 +67,15 @@ public interface UnivariateRealIntegrato * @return the value of integral * @throws TooManyEvaluationsException if the maximal number of evaluations * is exceeded. - * @throws ConvergenceException if the maximum iteration count is exceeded + * @throws MaxCountExceededException if the maximum iteration count is exceeded * or the integrator detects convergence problems otherwise * @throws MathIllegalArgumentException if min > max or the endpoints do not * satisfy the requirements specified by the integrator * @throws NullArgumentException if {@code f} is {@code null}. */ - double integrate(int maxEval, UnivariateRealFunction f, double min, double max) - throws TooManyEvaluationsException, ConvergenceException, + double integrate(int maxEval, UnivariateRealFunction f, double min, + double max) + throws TooManyEvaluationsException, MaxCountExceededException, MathIllegalArgumentException, NullArgumentException; /** Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegratorImpl.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegratorImpl.java?rev=1171111&r1=1171110&r2=1171111&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegratorImpl.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegratorImpl.java Thu Sep 15 14:27:41 2011 @@ -16,7 +16,6 @@ */ package org.apache.commons.math.analysis.integration; -import org.apache.commons.math.ConvergenceException; import org.apache.commons.math.analysis.UnivariateRealFunction; import org.apache.commons.math.analysis.solvers.UnivariateRealSolverUtils; import org.apache.commons.math.exception.MathIllegalArgumentException; @@ -242,7 +241,7 @@ public abstract class UnivariateRealInte /** {@inheritDoc} */ public double integrate(final int maxEval, final UnivariateRealFunction f, final double min, final double max) - throws TooManyEvaluationsException, ConvergenceException, + throws TooManyEvaluationsException, MaxCountExceededException, MathIllegalArgumentException, NullArgumentException { // Initialization. @@ -260,10 +259,10 @@ public abstract class UnivariateRealInte * @return the root. * @throws TooManyEvaluationsException if the maximal number of evaluations * is exceeded. - * @throws ConvergenceException if the maximum iteration count is exceeded + * @throws MaxCountExceededException if the maximum iteration count is exceeded * or the integrator detects convergence problems otherwise */ protected abstract double doIntegrate() - throws TooManyEvaluationsException, ConvergenceException; + throws TooManyEvaluationsException, MaxCountExceededException; }