You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2013/11/03 13:48:41 UTC
svn commit: r1538354 - in /commons/proper/math/trunk/src: changes/
main/java/org/apache/commons/math3/fitting/
main/java/org/apache/commons/math3/ode/
main/java/org/apache/commons/math3/optimization/fitting/
main/java/org/apache/commons/math3/special/ ...
Author: tn
Date: Sun Nov 3 12:48:40 2013
New Revision: 1538354
URL: http://svn.apache.org/r1538354
Log:
[MATH-1055] Fixed some invalid links inside javadoc and added missing deprecated annotations, thanks to Sean Owen.
Modified:
commons/proper/math/trunk/src/changes/changes.xml
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/fitting/HarmonicFitter.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/ode/JacobianMatrices.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/fitting/HarmonicFitter.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/special/Beta.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatistic.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/ArithmeticUtils.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Combinations.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/MidPointIntegratorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/special/BetaTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/stat/CertifiedDataTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/transform/RealTransformerAbstractTest.java
Modified: commons/proper/math/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/changes/changes.xml?rev=1538354&r1=1538353&r2=1538354&view=diff
==============================================================================
--- commons/proper/math/trunk/src/changes/changes.xml (original)
+++ commons/proper/math/trunk/src/changes/changes.xml Sun Nov 3 12:48:40 2013
@@ -51,6 +51,9 @@ If the output is not quite correct, chec
</properties>
<body>
<release version="3.3" date="TBD" description="TBD">
+ <action dev="tn" type="fix" issue="MATH-1055" due-to="Sean Owen">
+ Fixed some invalid links inside javadoc and added missing deprecated annotations.
+ </action>
<action dev="tn" type="add" issue="MATH-983">
Added a graphical overview of available continuous distributions to the userguide.
</action>
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/fitting/HarmonicFitter.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/fitting/HarmonicFitter.java?rev=1538354&r1=1538353&r2=1538354&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/fitting/HarmonicFitter.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/fitting/HarmonicFitter.java Sun Nov 3 12:48:40 2013
@@ -260,7 +260,7 @@ public class HarmonicFitter extends Curv
/**
* Estimate a first guess of the amplitude and angular frequency.
- * This method assumes that the {@link #sortObservations()} method
+ * This method assumes that the {@link #sortObservations(WeightedObservedPoint[])} method
* has been called previously.
*
* @param observations Observations, sorted w.r.t. abscissa.
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/ode/JacobianMatrices.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/ode/JacobianMatrices.java?rev=1538354&r1=1538353&r2=1538354&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/ode/JacobianMatrices.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/ode/JacobianMatrices.java Sun Nov 3 12:48:40 2013
@@ -429,7 +429,6 @@ public class JacobianMatrices {
/** Wrap a {@link FirstOrderDifferentialEquations} into a {@link MainStateJacobianProvider}.
* @param ode original ODE problem, without jacobians computation skill
* @param hY step sizes to compute the jacobian df/dy
- * @see JacobianMatrices#setMainStateSteps(double[])
* @exception DimensionMismatchException if there is a dimension mismatch between
* the steps array {@code hY} and the equation dimension
*/
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/fitting/HarmonicFitter.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/fitting/HarmonicFitter.java?rev=1538354&r1=1538353&r2=1538354&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/fitting/HarmonicFitter.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/fitting/HarmonicFitter.java Sun Nov 3 12:48:40 2013
@@ -260,7 +260,7 @@ public class HarmonicFitter extends Curv
/**
* Estimate a first guess of the amplitude and angular frequency.
- * This method assumes that the {@link #sortObservations()} method
+ * This method assumes that the {@link #sortObservations(WeightedObservedPoint[])} method
* has been called previously.
*
* @param observations Observations, sorted w.r.t. abscissa.
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/special/Beta.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/special/Beta.java?rev=1538354&r1=1538353&r2=1538354&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/special/Beta.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/special/Beta.java Sun Nov 3 12:48:40 2013
@@ -257,7 +257,7 @@ public class Beta {
/**
* Returns the value of log Î(a + b) for 1 ⤠a, b ⤠2. Based on the
* <em>NSWC Library of Mathematics Subroutines</em> double precision
- * implementation, {@code DGSMLN}. In {@link BetaTest#testLogGammaSum()},
+ * implementation, {@code DGSMLN}. In {@code BetaTest.testLogGammaSum()},
* this private method is accessed through reflection.
*
* @param a First argument.
@@ -290,7 +290,7 @@ public class Beta {
* Returns the value of log[Î(b) / Î(a + b)] for a ⥠0 and b ⥠10. Based on
* the <em>NSWC Library of Mathematics Subroutines</em> double precision
* implementation, {@code DLGDIV}. In
- * {@link BetaTest#testLogGammaMinusLogGammaSum()}, this private method is
+ * {@code BetaTest.testLogGammaMinusLogGammaSum()}, this private method is
* accessed through reflection.
*
* @param a First argument.
@@ -377,7 +377,7 @@ public class Beta {
* Returns the value of Î(p) + Î(q) - Î(p + q), with p, q ⥠10. Based on
* the <em>NSWC Library of Mathematics Subroutines</em> double precision
* implementation, {@code DBCORR}. In
- * {@link BetaTest#testSumDeltaMinusDeltaSum()}, this private method is
+ * {@code BetaTest.testSumDeltaMinusDeltaSum()}, this private method is
* accessed through reflection.
*
* @param p First argument.
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatistic.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatistic.java?rev=1538354&r1=1538353&r2=1538354&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatistic.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatistic.java Sun Nov 3 12:48:40 2013
@@ -151,7 +151,7 @@ public abstract class AbstractUnivariate
* @param length the number of elements to include
* @return true if the parameters are valid and designate a subarray of positive length
* @throws MathIllegalArgumentException if the indices are invalid or the array is null
- * @deprecated 3.3 Use {@link MathArrays#test(double[], int, int)} instead
+ * @deprecated 3.3 Use {@link MathArrays#verifyValues(double[], int, int)} instead
*/
@Deprecated
protected boolean test(
@@ -181,7 +181,7 @@ public abstract class AbstractUnivariate
* @return true if the parameters are valid
* @throws MathIllegalArgumentException if the indices are invalid or the array is null
* @since 3.0
- * @deprecated 3.3 Use {@link MathArrays#test(double[], int, int, boolean)} instead
+ * @deprecated 3.3 Use {@link MathArrays#verifyValues(double[], int, int, boolean)} instead
*/
@Deprecated
protected boolean test(final double[] values, final int begin,
@@ -217,7 +217,7 @@ public abstract class AbstractUnivariate
* @return true if the parameters are valid and designate a subarray of positive length
* @throws MathIllegalArgumentException if the indices are invalid or the array is null
* @since 2.1
- * @deprecated 3.3 Use {@link MathArrays#test(double[], double[], int, int)} instead
+ * @deprecated 3.3 Use {@link MathArrays#verifyValues(double[], double[], int, int)} instead
*/
@Deprecated
protected boolean test(
@@ -260,7 +260,7 @@ public abstract class AbstractUnivariate
* the weights array contains NaN, infinite or negative elements, or there
* are no positive weights.
* @since 3.0
- * @deprecated 3.3 Use {@link MathArrays#test(double[], double[], int, int, boolean)} instead
+ * @deprecated 3.3 Use {@link MathArrays#verifyValues(double[], double[], int, int, boolean)} instead
*/
@Deprecated
protected boolean test(final double[] values, final double[] weights,
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/ArithmeticUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/ArithmeticUtils.java?rev=1538354&r1=1538353&r2=1538354&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/ArithmeticUtils.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/ArithmeticUtils.java Sun Nov 3 12:48:40 2013
@@ -96,6 +96,7 @@ public final class ArithmeticUtils {
* represented by a long integer.
* @deprecated use {@link CombinatoricsUtils#binomialCoefficient(int, int)}
*/
+ @Deprecated
public static long binomialCoefficient(final int n, final int k)
throws NotPositiveException, NumberIsTooLargeException, MathArithmeticException {
return CombinatoricsUtils.binomialCoefficient(n, k);
@@ -127,6 +128,7 @@ public final class ArithmeticUtils {
* represented by a long integer.
* @deprecated use {@link CombinatoricsUtils#binomialCoefficientDouble(int, int)}
*/
+ @Deprecated
public static double binomialCoefficientDouble(final int n, final int k)
throws NotPositiveException, NumberIsTooLargeException, MathArithmeticException {
return CombinatoricsUtils.binomialCoefficientDouble(n, k);
@@ -154,6 +156,7 @@ public final class ArithmeticUtils {
* represented by a long integer.
* @deprecated use {@link CombinatoricsUtils#binomialCoefficientLog(int, int)}
*/
+ @Deprecated
public static double binomialCoefficientLog(final int n, final int k)
throws NotPositiveException, NumberIsTooLargeException, MathArithmeticException {
return CombinatoricsUtils.binomialCoefficientLog(n, k);
@@ -184,6 +187,7 @@ public final class ArithmeticUtils {
* large to fit in a {@code long}.
* @deprecated use {@link CombinatoricsUtils#factorial(int)}
*/
+ @Deprecated
public static long factorial(final int n) throws NotPositiveException, MathArithmeticException {
return CombinatoricsUtils.factorial(n);
}
@@ -202,6 +206,7 @@ public final class ArithmeticUtils {
* @throws NotPositiveException if {@code n < 0}.
* @deprecated use {@link CombinatoricsUtils#factorialDouble(int)}
*/
+ @Deprecated
public static double factorialDouble(final int n) throws NotPositiveException {
return CombinatoricsUtils.factorialDouble(n);
}
@@ -214,6 +219,7 @@ public final class ArithmeticUtils {
* @throws NotPositiveException if {@code n < 0}.
* @deprecated use {@link CombinatoricsUtils#factorialLog(int)}
*/
+ @Deprecated
public static double factorialLog(final int n) throws NotPositiveException {
return CombinatoricsUtils.factorialLog(n);
}
@@ -864,6 +870,7 @@ public final class ArithmeticUtils {
* @since 3.1
* @deprecated use {@link CombinatoricsUtils#stirlingS2(int, int)}
*/
+ @Deprecated
public static long stirlingS2(final int n, final int k)
throws NotPositiveException, NumberIsTooLargeException, MathArithmeticException {
return CombinatoricsUtils.stirlingS2(n, k);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Combinations.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Combinations.java?rev=1538354&r1=1538353&r2=1538354&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Combinations.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Combinations.java Sun Nov 3 12:48:40 2013
@@ -322,7 +322,7 @@ public class Combinations implements Ite
/**
* Defines the lexicographic ordering of combinations, using
- * the {@link #lexNorm(int[],int)} method.
+ * the {@link #lexNorm(int[])} method.
*/
private static class LexicographicComparator
implements Comparator<int[]>, Serializable {
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/MidPointIntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/MidPointIntegratorTest.java?rev=1538354&r1=1538353&r2=1538354&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/MidPointIntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/MidPointIntegratorTest.java Sun Nov 3 12:48:40 2013
@@ -31,7 +31,7 @@ import org.junit.Test;
* Test runs show that for a default relative accuracy of 1E-6, it generally
* takes 10 to 15 iterations for the integral to converge.
*
- * @version $Id: MidPointIntegratorTest.java 1374632 2012-08-18 18:11:11Z luc $
+ * @version $Id$
*/
public final class MidPointIntegratorTest {
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/special/BetaTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/special/BetaTest.java?rev=1538354&r1=1538353&r2=1538354&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/special/BetaTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/special/BetaTest.java Sun Nov 3 12:48:40 2013
@@ -170,7 +170,7 @@ public class BetaTest {
}
/**
- * Reference data for the {@link Gamma#logGammaSum(double, double)}
+ * Reference data for the {@link #logGammaSum(double, double)}
* function. This data was generated with the following
* <a href="http://maxima.sourceforge.net/">Maxima</a> script.
*
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/stat/CertifiedDataTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/stat/CertifiedDataTest.java?rev=1538354&r1=1538353&r2=1538354&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/stat/CertifiedDataTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/stat/CertifiedDataTest.java Sun Nov 3 12:48:40 2013
@@ -96,8 +96,6 @@ public class CertifiedDataTest {
/**
* loads a DescriptiveStatistics off of a test file
- * @param file
- * @param statistical summary
*/
private void loadStats(String resource, Object u) throws Exception {
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/transform/RealTransformerAbstractTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/transform/RealTransformerAbstractTest.java?rev=1538354&r1=1538353&r2=1538354&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/transform/RealTransformerAbstractTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/transform/RealTransformerAbstractTest.java Sun Nov 3 12:48:40 2013
@@ -99,9 +99,7 @@ public abstract class RealTransformerAbs
/**
* Returns a function for the accuracy check of
- * {@link RealTransformer#transform(UnivariateFunction, double, double, int)}
- * and
- * {@link RealTransformer#inverseTransform(UnivariateFunction, double, double, int)}.
+ * {@link RealTransformer#transform(UnivariateFunction, double, double, int, TransformType)}.
* This function should be valid. In other words, none of the above methods
* should throw an exception when passed this function.
*
@@ -111,9 +109,7 @@ public abstract class RealTransformerAbs
/**
* Returns a sampling lower bound for the accuracy check of
- * {@link RealTransformer#transform(UnivariateFunction, double, double, int)}
- * and
- * {@link RealTransformer#inverseTransform(UnivariateFunction, double, double, int)}.
+ * {@link RealTransformer#transform(UnivariateFunction, double, double, int, TransformType)}.
* This lower bound should be valid. In other words, none of the above
* methods should throw an exception when passed this bound.
*
@@ -123,9 +119,7 @@ public abstract class RealTransformerAbs
/**
* Returns a sampling upper bound for the accuracy check of
- * {@link RealTransformer#transform(UnivariateFunction, double, double, int)}
- * and
- * {@link RealTransformer#inverseTransform(UnivariateFunction, double, double, int)}.
+ * {@link RealTransformer#transform(UnivariateFunction, double, double, int, TransformType)}.
* This upper bound should be valid. In other words, none of the above
* methods should throw an exception when passed this bound.
*