You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by lu...@apache.org on 2011/03/23 15:04:45 UTC
svn commit: r1084591 - in /commons/proper/math/trunk/src:
main/java/org/apache/commons/math/analysis/function/
main/java/org/apache/commons/math/analysis/polynomials/
main/java/org/apache/commons/math/optimization/fitting/
test/java/org/apache/commons/...
Author: luc
Date: Wed Mar 23 14:04:45 2011
New Revision: 1084591
URL: http://svn.apache.org/viewvc?rev=1084591&view=rev
Log:
fixed varargs declaration warnings
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Gaussian.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/HarmonicOscillator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Logistic.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Logit.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sigmoid.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/GaussianFitter.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/fitting/CurveFitterTest.java
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Gaussian.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Gaussian.java?rev=1084591&r1=1084590&r2=1084591&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Gaussian.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Gaussian.java Wed Mar 23 14:04:45 2011
@@ -123,8 +123,7 @@ public class Gaussian implements Differe
* not 3.
* @throws NotStrictlyPositiveException if {@code param[2]} is negative.
*/
- public double value(double x,
- double[] param) {
+ public double value(double x, double ... param) {
validateParameters(param);
final double diff = x - param[1];
@@ -146,7 +145,7 @@ public class Gaussian implements Differe
* not 3.
* @throws NotStrictlyPositiveException if {@code param[2]} is negative.
*/
- public double[] gradient(double x, double[] param) {
+ public double[] gradient(double x, double ... param) {
validateParameters(param);
final double norm = param[0];
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/HarmonicOscillator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/HarmonicOscillator.java?rev=1084591&r1=1084590&r2=1084591&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/HarmonicOscillator.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/HarmonicOscillator.java Wed Mar 23 14:04:45 2011
@@ -89,8 +89,7 @@ public class HarmonicOscillator implemen
* @throws DimensionMismatchException if the size of {@code param} is
* not 3.
*/
- public double value(double x,
- double[] param) {
+ public double value(double x, double ... param) {
validateParameters(param);
return HarmonicOscillator.value(x * param[1] + param[2], param[0]);
}
@@ -108,7 +107,7 @@ public class HarmonicOscillator implemen
* @throws DimensionMismatchException if the size of {@code param} is
* not 3.
*/
- public double[] gradient(double x, double[] param) {
+ public double[] gradient(double x, double ... param) {
validateParameters(param);
final double amplitude = param[0];
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Logistic.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Logistic.java?rev=1084591&r1=1084590&r2=1084591&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Logistic.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Logistic.java Wed Mar 23 14:04:45 2011
@@ -118,8 +118,7 @@ public class Logistic implements Differe
* @throws DimensionMismatchException if the size of {@code param} is
* not 6.
*/
- public double value(double x,
- double[] param) {
+ public double value(double x, double ... param) {
validateParameters(param);
return Logistic.value(param[1] - x, param[0],
param[2], param[3],
@@ -140,7 +139,7 @@ public class Logistic implements Differe
* @throws DimensionMismatchException if the size of {@code param} is
* not 6.
*/
- public double[] gradient(double x, double[] param) {
+ public double[] gradient(double x, double ... param) {
validateParameters(param);
final double b = param[2];
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Logit.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Logit.java?rev=1084591&r1=1084590&r2=1084591&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Logit.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Logit.java Wed Mar 23 14:04:45 2011
@@ -93,8 +93,7 @@ public class Logit implements Differenti
* @throws DimensionMismatchException if the size of {@code param} is
* not 2.
*/
- public double value(double x,
- double[] param) {
+ public double value(double x, double ... param) {
validateParameters(param);
return Logit.value(x, param[0], param[1]);
}
@@ -112,7 +111,7 @@ public class Logit implements Differenti
* @throws DimensionMismatchException if the size of {@code param} is
* not 2.
*/
- public double[] gradient(double x, double[] param) {
+ public double[] gradient(double x, double ... param) {
validateParameters(param);
final double lo = param[0];
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sigmoid.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sigmoid.java?rev=1084591&r1=1084590&r2=1084591&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sigmoid.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sigmoid.java Wed Mar 23 14:04:45 2011
@@ -100,8 +100,7 @@ public class Sigmoid implements Differen
* @throws DimensionMismatchException if the size of {@code param} is
* not 2.
*/
- public double value(double x,
- double[] param) {
+ public double value(double x, double ... param) {
validateParameters(param);
return Sigmoid.value(x, param[0], param[1]);
}
@@ -119,7 +118,7 @@ public class Sigmoid implements Differen
* @throws DimensionMismatchException if the size of {@code param} is
* not 2.
*/
- public double[] gradient(double x, double[] param) {
+ public double[] gradient(double x, double ... param) {
validateParameters(param);
final double lo = param[0];
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java?rev=1084591&r1=1084590&r2=1084591&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java Wed Mar 23 14:04:45 2011
@@ -361,7 +361,7 @@ public class PolynomialFunction implemen
*/
public static class Parametric implements ParametricUnivariateRealFunction {
/** {@inheritDoc} */
- public double[] gradient(double x, double[] parameters) {
+ public double[] gradient(double x, double ... parameters) {
final double[] gradient = new double[parameters.length];
double xn = 1.0;
for (int i = 0; i < parameters.length; ++i) {
@@ -372,7 +372,7 @@ public class PolynomialFunction implemen
}
/** {@inheritDoc} */
- public double value(final double x, final double[] parameters) {
+ public double value(final double x, final double ... parameters) {
return PolynomialFunction.evaluate(parameters, x);
}
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/GaussianFitter.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/GaussianFitter.java?rev=1084591&r1=1084590&r2=1084591&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/GaussianFitter.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/GaussianFitter.java Wed Mar 23 14:04:45 2011
@@ -84,7 +84,7 @@ public class GaussianFitter extends Curv
final ParametricUnivariateRealFunction f = new ParametricUnivariateRealFunction() {
private final ParametricUnivariateRealFunction g = new Gaussian.Parametric();
- public double value(double x, double[] p) {
+ public double value(double x, double ... p) {
double v = Double.POSITIVE_INFINITY;
try {
v = g.value(x, p);
@@ -94,7 +94,7 @@ public class GaussianFitter extends Curv
return v;
}
- public double[] gradient(double x, double[] p) {
+ public double[] gradient(double x, double ... p) {
double[] v = { Double.POSITIVE_INFINITY,
Double.POSITIVE_INFINITY,
Double.POSITIVE_INFINITY };
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/fitting/CurveFitterTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/fitting/CurveFitterTest.java?rev=1084591&r1=1084590&r2=1084591&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/fitting/CurveFitterTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/fitting/CurveFitterTest.java Wed Mar 23 14:04:45 2011
@@ -88,7 +88,7 @@ public class CurveFitterTest {
ParametricUnivariateRealFunction f = new ParametricUnivariateRealFunction() {
- public double value(double x, double[] parameters) {
+ public double value(double x, double ... parameters) {
double a = parameters[0];
double b = parameters[1];
@@ -98,7 +98,7 @@ public class CurveFitterTest {
return d + ((a - d) / (1 + FastMath.pow(x / c, b)));
}
- public double[] gradient(double x, double[] parameters) {
+ public double[] gradient(double x, double ... parameters) {
double a = parameters[0];
double b = parameters[1];
@@ -139,11 +139,11 @@ public class CurveFitterTest {
private static class SimpleInverseFunction implements ParametricUnivariateRealFunction {
- public double value(double x, double[] parameters) {
+ public double value(double x, double ... parameters) {
return parameters[0] / x + (parameters.length < 2 ? 0 : parameters[1]);
}
- public double[] gradient(double x, double[] doubles) {
+ public double[] gradient(double x, double ... doubles) {
double[] gradientVector = new double[doubles.length];
gradientVector[0] = 1 / x;
if (doubles.length >= 2) {