You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2011/11/27 23:19:09 UTC
svn commit: r1206867 [2/4] - in /commons/proper/math/trunk/src:
main/java/org/apache/commons/math/analysis/
main/java/org/apache/commons/math/analysis/function/
main/java/org/apache/commons/math/analysis/integration/
main/java/org/apache/commons/math/a...
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=1206867&r1=1206866&r2=1206867&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 Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.analysis.integration;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.solvers.UnivariateRealSolverUtils;
import org.apache.commons.math.exception.MathIllegalArgumentException;
import org.apache.commons.math.exception.MaxCountExceededException;
@@ -63,7 +63,7 @@ public abstract class UnivariateRealInte
protected Incrementor evaluations;
/** Function to integrate. */
- protected UnivariateRealFunction function;
+ protected UnivariateFunction function;
/** Lower bound for the interval. */
protected double min;
@@ -220,7 +220,7 @@ public abstract class UnivariateRealInte
* @throws MathIllegalArgumentException if {@code min >= max}.
*/
protected void setup(final int maxEval,
- final UnivariateRealFunction f,
+ final UnivariateFunction f,
final double lower, final double upper)
throws NullArgumentException, MathIllegalArgumentException {
@@ -239,7 +239,7 @@ public abstract class UnivariateRealInte
}
/** {@inheritDoc} */
- public double integrate(final int maxEval, final UnivariateRealFunction f,
+ public double integrate(final int maxEval, final UnivariateFunction f,
final double lower, final double upper)
throws TooManyEvaluationsException, MaxCountExceededException,
MathIllegalArgumentException, NullArgumentException {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.analysis.interpolation;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction;
import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.exception.NoDataException;
@@ -83,7 +83,7 @@ public class BicubicSplineInterpolator
// Partial derivatives with respect to x at the grid knots
final double[][] dFdX = new double[xLen][yLen];
for (int j = 0; j < yLen; j++) {
- final UnivariateRealFunction f = ySplineX[j].derivative();
+ final UnivariateFunction f = ySplineX[j].derivative();
for (int i = 0; i < xLen; i++) {
dFdX[i][j] = f.value(xval[i]);
}
@@ -92,7 +92,7 @@ public class BicubicSplineInterpolator
// Partial derivatives with respect to y at the grid knots
final double[][] dFdY = new double[xLen][yLen];
for (int i = 0; i < xLen; i++) {
- final UnivariateRealFunction f = xSplineY[i].derivative();
+ final UnivariateFunction f = xSplineY[i].derivative();
for (int j = 0; j < yLen; j++) {
dFdY[i][j] = f.value(yval[j]);
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealInterpolator.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealInterpolator.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealInterpolator.java Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.analysis.interpolation;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
/**
* Interface representing a univariate real interpolating function.
@@ -34,5 +34,5 @@ public interface UnivariateRealInterpola
* if the arguments violate assumptions made by the interpolation
* algorithm.
*/
- UnivariateRealFunction interpolate(double xval[], double yval[]);
+ UnivariateFunction interpolate(double xval[], double yval[]);
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolator.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolator.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolator.java Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.analysis.interpolation;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.MathUtils;
import org.apache.commons.math.util.MathArrays;
import org.apache.commons.math.exception.NumberIsTooSmallException;
@@ -80,7 +80,7 @@ public class UnivariateRealPeriodicInter
* @throws NumberIsTooSmallException if the number of extension points
* iss larger then the size of {@code xval}.
*/
- public UnivariateRealFunction interpolate(double[] xval,
+ public UnivariateFunction interpolate(double[] xval,
double[] yval) {
if (xval.length < extend) {
throw new NumberIsTooSmallException(xval.length, extend, true);
@@ -111,8 +111,8 @@ public class UnivariateRealPeriodicInter
MathArrays.sortInPlace(x, y);
- final UnivariateRealFunction f = interpolator.interpolate(x, y);
- return new UnivariateRealFunction() {
+ final UnivariateFunction f = interpolator.interpolate(x, y);
+ return new UnivariateFunction() {
public double value(final double x) {
return f.value(MathUtils.reduce(x, period, offset));
}
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=1206867&r1=1206866&r2=1206867&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 Sun Nov 27 22:18:30 2011
@@ -22,9 +22,9 @@ import java.util.Arrays;
import org.apache.commons.math.exception.util.LocalizedFormats;
import org.apache.commons.math.exception.NoDataException;
import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.ParametricUnivariateRealFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.ParametricUnivariateFunction;
import org.apache.commons.math.util.FastMath;
import org.apache.commons.math.util.MathUtils;
@@ -36,7 +36,7 @@ import org.apache.commons.math.util.Math
*
* @version $Id$
*/
-public class PolynomialFunction implements DifferentiableUnivariateRealFunction, Serializable {
+public class PolynomialFunction implements DifferentiableUnivariateFunction, Serializable {
/**
* Serialization identifier
*/
@@ -86,7 +86,7 @@ public class PolynomialFunction implemen
*
* @param x Argument for which the function value should be computed.
* @return the value of the polynomial at the given point.
- * @see UnivariateRealFunction#value(double)
+ * @see UnivariateFunction#value(double)
*/
public double value(double x) {
return evaluate(coefficients, x);
@@ -259,11 +259,11 @@ public class PolynomialFunction implemen
}
/**
- * Returns the derivative as a {@link UnivariateRealFunction}.
+ * Returns the derivative as a {@link UnivariateFunction}.
*
* @return the derivative function.
*/
- public UnivariateRealFunction derivative() {
+ public UnivariateFunction derivative() {
return polynomialDerivative();
}
@@ -369,7 +369,7 @@ public class PolynomialFunction implemen
*
* @since 3.0
*/
- public static class Parametric implements ParametricUnivariateRealFunction {
+ public static class Parametric implements ParametricUnivariateFunction {
/** {@inheritDoc} */
public double[] gradient(double x, double ... parameters) {
final double[] gradient = new double[parameters.length];
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.analysis.polynomials;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.FastMath;
import org.apache.commons.math.util.MathArrays;
import org.apache.commons.math.exception.DimensionMismatchException;
@@ -35,7 +35,7 @@ import org.apache.commons.math.exception
* @version $Id$
* @since 1.2
*/
-public class PolynomialFunctionLagrangeForm implements UnivariateRealFunction {
+public class PolynomialFunctionLagrangeForm implements UnivariateFunction {
/**
* The coefficients of the polynomial, ordered by degree -- i.e.
* coefficients[0] is the constant term and coefficients[n] is the
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java Sun Nov 27 22:18:30 2011
@@ -18,7 +18,7 @@ package org.apache.commons.math.analysis
import org.apache.commons.math.exception.NoDataException;
import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.util.LocalizedFormats;
/**
@@ -34,7 +34,7 @@ import org.apache.commons.math.exception
* @version $Id$
* @since 1.2
*/
-public class PolynomialFunctionNewtonForm implements UnivariateRealFunction {
+public class PolynomialFunctionNewtonForm implements UnivariateFunction {
/**
* The coefficients of the polynomial, ordered by degree -- i.e.
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java Sun Nov 27 22:18:30 2011
@@ -19,8 +19,8 @@ package org.apache.commons.math.analysis
import java.util.Arrays;
import org.apache.commons.math.util.MathArrays;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.OutOfRangeException;
import org.apache.commons.math.exception.NumberIsTooSmallException;
import org.apache.commons.math.exception.DimensionMismatchException;
@@ -61,7 +61,7 @@ import org.apache.commons.math.exception
*
* @version $Id$
*/
-public class PolynomialSplineFunction implements DifferentiableUnivariateRealFunction {
+public class PolynomialSplineFunction implements DifferentiableUnivariateFunction {
/**
* Spline segment interval delimiters (knots).
* Size is n + 1 for n segments.
@@ -151,7 +151,7 @@ public class PolynomialSplineFunction im
*
* @return the derivative function.
*/
- public UnivariateRealFunction derivative() {
+ public UnivariateFunction derivative() {
return polynomialSplineDerivative();
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AbstractDifferentiableUnivariateRealSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AbstractDifferentiableUnivariateRealSolver.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AbstractDifferentiableUnivariateRealSolver.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AbstractDifferentiableUnivariateRealSolver.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.solvers;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
/**
* Provide a default implementation for several functions useful to generic
@@ -28,10 +28,10 @@ import org.apache.commons.math.analysis.
* @since 3.0
*/
public abstract class AbstractDifferentiableUnivariateRealSolver
- extends BaseAbstractUnivariateRealSolver<DifferentiableUnivariateRealFunction>
+ extends BaseAbstractUnivariateRealSolver<DifferentiableUnivariateFunction>
implements DifferentiableUnivariateRealSolver {
/** Derivative of the function to solve. */
- private UnivariateRealFunction functionDerivative;
+ private UnivariateFunction functionDerivative;
/**
* Construct a solver with given absolute accuracy.
@@ -72,7 +72,7 @@ public abstract class AbstractDifferenti
* {@inheritDoc}
*/
@Override
- protected void setup(int maxEval, DifferentiableUnivariateRealFunction f,
+ protected void setup(int maxEval, DifferentiableUnivariateFunction f,
double min, double max, double startValue) {
super.setup(maxEval, f, min, max, startValue);
functionDerivative = f.derivative();
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AbstractUnivariateRealSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AbstractUnivariateRealSolver.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AbstractUnivariateRealSolver.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AbstractUnivariateRealSolver.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.solvers;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
/**
* Base class for solvers.
@@ -26,7 +26,7 @@ import org.apache.commons.math.analysis.
* @since 3.0
*/
public abstract class AbstractUnivariateRealSolver
- extends BaseAbstractUnivariateRealSolver<UnivariateRealFunction>
+ extends BaseAbstractUnivariateRealSolver<UnivariateFunction>
implements UnivariateRealSolver {
/**
* Construct a solver with given absolute accuracy.
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseAbstractUnivariateRealSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseAbstractUnivariateRealSolver.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseAbstractUnivariateRealSolver.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseAbstractUnivariateRealSolver.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.solvers;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.MaxCountExceededException;
import org.apache.commons.math.exception.NoBracketingException;
import org.apache.commons.math.exception.TooManyEvaluationsException;
@@ -33,7 +33,7 @@ import org.apache.commons.math.util.Math
* @version $Id$
* @since 2.0
*/
-public abstract class BaseAbstractUnivariateRealSolver<FUNC extends UnivariateRealFunction>
+public abstract class BaseAbstractUnivariateRealSolver<FUNC extends UnivariateFunction>
implements BaseUnivariateRealSolver<FUNC> {
/** Default relative accuracy. */
private static final double DEFAULT_RELATIVE_ACCURACY = 1e-14;
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseSecantSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseSecantSolver.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseSecantSolver.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseSecantSolver.java Sun Nov 27 22:18:30 2011
@@ -18,7 +18,7 @@
package org.apache.commons.math.analysis.solvers;
import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.ConvergenceException;
import org.apache.commons.math.exception.MathInternalError;
@@ -48,7 +48,7 @@ import org.apache.commons.math.exception
*/
public abstract class BaseSecantSolver
extends AbstractUnivariateRealSolver
- implements BracketedUnivariateRealSolver<UnivariateRealFunction> {
+ implements BracketedUnivariateRealSolver<UnivariateFunction> {
/** Default absolute accuracy. */
protected static final double DEFAULT_ABSOLUTE_ACCURACY = 1e-6;
@@ -104,14 +104,14 @@ public abstract class BaseSecantSolver
}
/** {@inheritDoc} */
- public double solve(final int maxEval, final UnivariateRealFunction f,
+ public double solve(final int maxEval, final UnivariateFunction f,
final double min, final double max,
final AllowedSolution allowedSolution) {
return solve(maxEval, f, min, max, min + 0.5 * (max - min), allowedSolution);
}
/** {@inheritDoc} */
- public double solve(final int maxEval, final UnivariateRealFunction f,
+ public double solve(final int maxEval, final UnivariateFunction f,
final double min, final double max, final double startValue,
final AllowedSolution allowedSolution) {
this.allowed = allowedSolution;
@@ -120,7 +120,7 @@ public abstract class BaseSecantSolver
/** {@inheritDoc} */
@Override
- public double solve(final int maxEval, final UnivariateRealFunction f,
+ public double solve(final int maxEval, final UnivariateFunction f,
final double min, final double max, final double startValue) {
return solve(maxEval, f, min, max, startValue, AllowedSolution.ANY_SIDE);
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseUnivariateRealSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseUnivariateRealSolver.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseUnivariateRealSolver.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseUnivariateRealSolver.java Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.analysis.solvers;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
/**
@@ -35,7 +35,7 @@ import org.apache.commons.math.analysis.
* @see PolynomialSolver
* @see DifferentiableUnivariateRealSolver
*/
-public interface BaseUnivariateRealSolver<FUNC extends UnivariateRealFunction> {
+public interface BaseUnivariateRealSolver<FUNC extends UnivariateFunction> {
/**
* Get the maximum number of function evaluations.
*
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedUnivariateRealSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedUnivariateRealSolver.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedUnivariateRealSolver.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedUnivariateRealSolver.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.solvers;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
/** Interface for {@link UnivariateRealSolver (univariate real) root-finding
* algorithms} that maintain a bracketed solution. There are several advantages
@@ -44,7 +44,7 @@ import org.apache.commons.math.analysis.
* @since 3.0
* @version $Id$
*/
-public interface BracketedUnivariateRealSolver<FUNC extends UnivariateRealFunction>
+public interface BracketedUnivariateRealSolver<FUNC extends UnivariateFunction>
extends BaseUnivariateRealSolver<FUNC> {
/**
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolver.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolver.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolver.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.solvers;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.MathInternalError;
import org.apache.commons.math.exception.NoBracketingException;
import org.apache.commons.math.exception.NumberIsTooSmallException;
@@ -42,7 +42,7 @@ import org.apache.commons.math.util.Prec
*/
public class BracketingNthOrderBrentSolver
extends AbstractUnivariateRealSolver
- implements BracketedUnivariateRealSolver<UnivariateRealFunction> {
+ implements BracketedUnivariateRealSolver<UnivariateFunction> {
/** Default absolute accuracy. */
private static final double DEFAULT_ABSOLUTE_ACCURACY = 1e-6;
@@ -380,14 +380,14 @@ public class BracketingNthOrderBrentSolv
}
/** {@inheritDoc} */
- public double solve(int maxEval, UnivariateRealFunction f, double min,
+ public double solve(int maxEval, UnivariateFunction f, double min,
double max, AllowedSolution allowedSolution) {
this.allowed = allowedSolution;
return super.solve(maxEval, f, min, max);
}
/** {@inheritDoc} */
- public double solve(int maxEval, UnivariateRealFunction f, double min,
+ public double solve(int maxEval, UnivariateFunction f, double min,
double max, double startValue,
AllowedSolution allowedSolution) {
this.allowed = allowedSolution;
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/DifferentiableUnivariateRealSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/DifferentiableUnivariateRealSolver.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/DifferentiableUnivariateRealSolver.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/DifferentiableUnivariateRealSolver.java Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.analysis.solvers;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
/**
@@ -26,4 +26,4 @@ import org.apache.commons.math.analysis.
* @version $Id$
*/
public interface DifferentiableUnivariateRealSolver
- extends BaseUnivariateRealSolver<DifferentiableUnivariateRealFunction> {}
+ extends BaseUnivariateRealSolver<DifferentiableUnivariateFunction> {}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.solvers;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -61,7 +61,7 @@ public class NewtonSolver extends Abstra
* if {@code min >= max}.
*/
@Override
- public double solve(int maxEval, final DifferentiableUnivariateRealFunction f,
+ public double solve(int maxEval, final DifferentiableUnivariateFunction f,
final double min, final double max) {
return super.solve(maxEval, f, UnivariateRealSolverUtils.midpoint(min, max));
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.analysis.solvers;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
/**
@@ -26,4 +26,4 @@ import org.apache.commons.math.analysis.
* @version $Id$
*/
public interface UnivariateRealSolver
- extends BaseUnivariateRealSolver<UnivariateRealFunction> {}
+ extends BaseUnivariateRealSolver<UnivariateFunction> {}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.analysis.solvers;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.NoBracketingException;
import org.apache.commons.math.exception.NotStrictlyPositiveException;
import org.apache.commons.math.exception.NullArgumentException;
@@ -46,7 +46,7 @@ public class UnivariateRealSolverUtils {
* @throws IllegalArgumentException if f is null or the endpoints do not
* specify a valid interval.
*/
- public static double solve(UnivariateRealFunction function, double x0, double x1) {
+ public static double solve(UnivariateFunction function, double x0, double x1) {
if (function == null) {
throw new NullArgumentException(LocalizedFormats.FUNCTION);
}
@@ -67,7 +67,7 @@ public class UnivariateRealSolverUtils {
* the endpoints do not specify a valid interval, or the absolute accuracy
* is not valid for the default solver.
*/
- public static double solve(UnivariateRealFunction function,
+ public static double solve(UnivariateFunction function,
double x0, double x1,
double absoluteAccuracy) {
if (function == null) {
@@ -91,8 +91,8 @@ public class UnivariateRealSolverUtils {
* accept as solutions.
* @return a root approximation, on the specified side of the exact root
*/
- public static double forceSide(final int maxEval, final UnivariateRealFunction f,
- final BracketedUnivariateRealSolver<UnivariateRealFunction> bracketing,
+ public static double forceSide(final int maxEval, final UnivariateFunction f,
+ final BracketedUnivariateRealSolver<UnivariateFunction> bracketing,
final double baseRoot, final double min, final double max,
final AllowedSolution allowedSolution) {
@@ -187,7 +187,7 @@ public class UnivariateRealSolverUtils {
* <code>ConvergenceException.</code> Unless you are confident that there
* is a root between <code>lowerBound</code> and <code>upperBound</code>
* near <code>initial,</code> it is better to use
- * {@link #bracket(UnivariateRealFunction, double, double, double, int)},
+ * {@link #bracket(UnivariateFunction, double, double, double, int)},
* explicitly specifying the maximum number of iterations.</p>
*
* @param function Function.
@@ -201,7 +201,7 @@ public class UnivariateRealSolverUtils {
* @throws IllegalArgumentException if function is null, maximumIterations
* is not positive, or initial is not between lowerBound and upperBound.
*/
- public static double[] bracket(UnivariateRealFunction function,
+ public static double[] bracket(UnivariateFunction function,
double initial,
double lowerBound, double upperBound) {
return bracket(function, initial, lowerBound, upperBound, Integer.MAX_VALUE);
@@ -239,7 +239,7 @@ public class UnivariateRealSolverUtils {
* @throws IllegalArgumentException if function is null, maximumIterations
* is not positive, or initial is not between lowerBound and upperBound.
*/
- public static double[] bracket(UnivariateRealFunction function,
+ public static double[] bracket(UnivariateFunction function,
double initial,
double lowerBound, double upperBound,
int maximumIterations) {
@@ -299,7 +299,7 @@ public class UnivariateRealSolverUtils {
* @return {@code true} if the function values have opposite signs at the
* given points.
*/
- public static boolean isBracketing(UnivariateRealFunction function,
+ public static boolean isBracketing(UnivariateFunction function,
final double lower,
final double upper) {
if (function == null) {
@@ -365,7 +365,7 @@ public class UnivariateRealSolverUtils {
* @throws NoBracketingException if function has the same sign at the
* endpoints.
*/
- public static void verifyBracketing(UnivariateRealFunction function,
+ public static void verifyBracketing(UnivariateFunction function,
final double lower,
final double upper) {
if (function == null) {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractContinuousDistribution.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractContinuousDistribution.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractContinuousDistribution.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractContinuousDistribution.java Sun Nov 27 22:18:30 2011
@@ -18,7 +18,7 @@ package org.apache.commons.math.distribu
import java.io.Serializable;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.solvers.UnivariateRealSolverUtils;
import org.apache.commons.math.exception.MathInternalError;
import org.apache.commons.math.exception.NotStrictlyPositiveException;
@@ -80,8 +80,8 @@ public abstract class AbstractContinuous
// by default, do simple root finding using bracketing and default solver.
// subclasses can override if there is a better method.
- UnivariateRealFunction rootFindingFunction =
- new UnivariateRealFunction() {
+ UnivariateFunction rootFindingFunction =
+ new UnivariateFunction() {
public double value(double x) {
return cumulativeProbability(x) - p;
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java Sun Nov 27 22:18:30 2011
@@ -20,7 +20,7 @@ import java.io.Serializable;
import java.util.Arrays;
import java.util.Iterator;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.exception.NumberIsTooLargeException;
@@ -336,13 +336,13 @@ public class ArrayRealVector extends Rea
/** {@inheritDoc} */
@Override
- public ArrayRealVector map(UnivariateRealFunction function) {
+ public ArrayRealVector map(UnivariateFunction function) {
return copy().mapToSelf(function);
}
/** {@inheritDoc} */
@Override
- public ArrayRealVector mapToSelf(UnivariateRealFunction function) {
+ public ArrayRealVector mapToSelf(UnivariateFunction function) {
for (int i = 0; i < data.length; i++) {
data[i] = function.value(data[i]);
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/RealVector.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/RealVector.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/RealVector.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/RealVector.java Sun Nov 27 22:18:30 2011
@@ -28,7 +28,7 @@ import org.apache.commons.math.analysis.
import org.apache.commons.math.analysis.function.Add;
import org.apache.commons.math.analysis.function.Multiply;
import org.apache.commons.math.analysis.function.Divide;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.util.LocalizedFormats;
import org.apache.commons.math.util.FastMath;
@@ -734,7 +734,7 @@ public abstract class RealVector {
* @param function Function to apply to each entry.
* @return a new vector.
*/
- public RealVector map(UnivariateRealFunction function) {
+ public RealVector map(UnivariateFunction function) {
return copy().mapToSelf(function);
}
@@ -751,7 +751,7 @@ public abstract class RealVector {
* @param function Function to apply to each entry.
* @return a reference to this vector.
*/
- public RealVector mapToSelf(UnivariateRealFunction function) {
+ public RealVector mapToSelf(UnivariateFunction function) {
Iterator<Entry> it = (function.value(0) == 0) ? sparseIterator() : iterator();
Entry e;
while (it.hasNext() && (e = it.next()) != null) {
@@ -949,13 +949,13 @@ public abstract class RealVector {
return new RealVector() {
/** {@inheritDoc} */
@Override
- public RealVector mapToSelf(UnivariateRealFunction function) {
+ public RealVector mapToSelf(UnivariateFunction function) {
throw new MathUnsupportedOperationException();
}
/** {@inheritDoc} */
@Override
- public RealVector map(UnivariateRealFunction function) {
+ public RealVector map(UnivariateFunction function) {
return v.map(function);
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/events/EventState.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/events/EventState.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/events/EventState.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/events/EventState.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.ode.events;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.solvers.AllowedSolution;
import org.apache.commons.math.analysis.solvers.BracketedUnivariateRealSolver;
import org.apache.commons.math.analysis.solvers.PegasusSolver;
@@ -197,7 +197,7 @@ public class EventState {
final int n = FastMath.max(1, (int) FastMath.ceil(FastMath.abs(dt) / maxCheckInterval));
final double h = dt / n;
- final UnivariateRealFunction f = new UnivariateRealFunction() {
+ final UnivariateFunction f = new UnivariateFunction() {
public double value(final double t) {
interpolator.setInterpolatedTime(t);
return handler.g(t, interpolator.getInterpolatedState());
@@ -224,8 +224,8 @@ public class EventState {
final double root;
if (solver instanceof BracketedUnivariateRealSolver<?>) {
@SuppressWarnings("unchecked")
- BracketedUnivariateRealSolver<UnivariateRealFunction> bracketing =
- (BracketedUnivariateRealSolver<UnivariateRealFunction>) solver;
+ BracketedUnivariateRealSolver<UnivariateFunction> bracketing =
+ (BracketedUnivariateRealSolver<UnivariateFunction>) solver;
root = forward ?
bracketing.solve(maxIterationCount, f, ta, tb, AllowedSolution.RIGHT_SIDE) :
bracketing.solve(maxIterationCount, f, tb, ta, AllowedSolution.LEFT_SIDE);
@@ -234,7 +234,7 @@ public class EventState {
solver.solve(maxIterationCount, f, ta, tb) :
solver.solve(maxIterationCount, f, tb, ta);
final int remainingEval = maxIterationCount - solver.getEvaluations();
- BracketedUnivariateRealSolver<UnivariateRealFunction> bracketing =
+ BracketedUnivariateRealSolver<UnivariateFunction> bracketing =
new PegasusSolver(solver.getRelativeAccuracy(), solver.getAbsoluteAccuracy());
root = forward ?
UnivariateRealSolverUtils.forceSide(remainingEval, f, bracketing,
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/MultivariateRealFunctionMappingAdapter.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/MultivariateRealFunctionMappingAdapter.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/MultivariateRealFunctionMappingAdapter.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/MultivariateRealFunctionMappingAdapter.java Sun Nov 27 22:18:30 2011
@@ -18,7 +18,7 @@
package org.apache.commons.math.optimization.direct;
import org.apache.commons.math.analysis.MultivariateRealFunction;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.function.Logit;
import org.apache.commons.math.analysis.function.Sigmoid;
import org.apache.commons.math.exception.DimensionMismatchException;
@@ -271,10 +271,10 @@ public class MultivariateRealFunctionMap
private static class LowerUpperBoundMapper implements Mapper {
/** Function from unbounded to bounded. */
- private final UnivariateRealFunction boundingFunction;
+ private final UnivariateFunction boundingFunction;
/** Function from bounded to unbounded. */
- private final UnivariateRealFunction unboundingFunction;
+ private final UnivariateFunction unboundingFunction;
/** Simple constructor.
* @param lower lower bound
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java Sun Nov 27 22:18:30 2011
@@ -19,7 +19,7 @@ package org.apache.commons.math.optimiza
import org.apache.commons.math.util.FastMath;
import org.apache.commons.math.util.MathArrays;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.MultivariateRealFunction;
import org.apache.commons.math.exception.NumberIsTooSmallException;
import org.apache.commons.math.exception.NotStrictlyPositiveException;
@@ -264,7 +264,7 @@ public class PowellOptimizer
*/
public UnivariateRealPointValuePair search(final double[] p, final double[] d) {
final int n = p.length;
- final UnivariateRealFunction f = new UnivariateRealFunction() {
+ final UnivariateFunction f = new UnivariateFunction() {
public double value(double alpha) {
final double[] x = new double[n];
for (int i = 0; i < n; i++) {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/CurveFitter.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/CurveFitter.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/CurveFitter.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/CurveFitter.java Sun Nov 27 22:18:30 2011
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction;
-import org.apache.commons.math.analysis.ParametricUnivariateRealFunction;
+import org.apache.commons.math.analysis.ParametricUnivariateFunction;
import org.apache.commons.math.analysis.MultivariateMatrixFunction;
import org.apache.commons.math.optimization.DifferentiableMultivariateVectorialOptimizer;
import org.apache.commons.math.optimization.VectorialPointValuePair;
@@ -120,7 +120,7 @@ public class CurveFitter {
* @throws org.apache.commons.math.exception.DimensionMismatchException
* if the start point dimension is wrong.
*/
- public double[] fit(final ParametricUnivariateRealFunction f, final double[] initialGuess) {
+ public double[] fit(final ParametricUnivariateFunction f, final double[] initialGuess) {
return fit(Integer.MAX_VALUE, f, initialGuess);
}
@@ -141,7 +141,7 @@ public class CurveFitter {
* if the start point dimension is wrong.
* @since 3.0
*/
- public double[] fit(int maxEval, final ParametricUnivariateRealFunction f,
+ public double[] fit(int maxEval, final ParametricUnivariateFunction f,
final double[] initialGuess) {
// prepare least squares problem
double[] target = new double[observations.size()];
@@ -166,12 +166,12 @@ public class CurveFitter {
private class TheoreticalValuesFunction
implements DifferentiableMultivariateVectorialFunction {
/** Function to fit. */
- private final ParametricUnivariateRealFunction f;
+ private final ParametricUnivariateFunction f;
/** Simple constructor.
* @param f function to fit.
*/
- public TheoreticalValuesFunction(final ParametricUnivariateRealFunction f) {
+ public TheoreticalValuesFunction(final ParametricUnivariateFunction f) {
this.f = f;
}
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=1206867&r1=1206866&r2=1206867&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 Sun Nov 27 22:18:30 2011
@@ -21,7 +21,7 @@ import java.util.Arrays;
import java.util.Comparator;
import org.apache.commons.math.analysis.function.Gaussian;
-import org.apache.commons.math.analysis.ParametricUnivariateRealFunction;
+import org.apache.commons.math.analysis.ParametricUnivariateFunction;
import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.NumberIsTooSmallException;
import org.apache.commons.math.exception.OutOfRangeException;
@@ -82,8 +82,8 @@ public class GaussianFitter extends Curv
* @since 3.0
*/
public double[] fit(double[] initialGuess) {
- final ParametricUnivariateRealFunction f = new ParametricUnivariateRealFunction() {
- private final ParametricUnivariateRealFunction g = new Gaussian.Parametric();
+ final ParametricUnivariateFunction f = new ParametricUnivariateFunction() {
+ private final ParametricUnivariateFunction g = new Gaussian.Parametric();
public double value(double x, double ... p) {
double v = Double.POSITIVE_INFINITY;
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java Sun Nov 27 22:18:30 2011
@@ -18,7 +18,7 @@
package org.apache.commons.math.optimization.general;
import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.analysis.solvers.BrentSolver;
import org.apache.commons.math.analysis.solvers.UnivariateRealSolver;
import org.apache.commons.math.exception.util.LocalizedFormats;
@@ -181,7 +181,7 @@ public class NonLinearConjugateGradientO
}
// Find the optimal step in the search direction.
- final UnivariateRealFunction lsf = new LineSearchFunction(searchDirection);
+ final UnivariateFunction lsf = new LineSearchFunction(searchDirection);
final double uB = findUpperBound(lsf, 0, initialStep);
// XXX Last parameters is set to a value close to zero in order to
// work around the divergence problem in the "testCircleFitting"
@@ -244,7 +244,7 @@ public class NonLinearConjugateGradientO
* @return b such that f(a) and f(b) have opposite signs.
* @throws MathIllegalStateException if no bracket can be found.
*/
- private double findUpperBound(final UnivariateRealFunction f,
+ private double findUpperBound(final UnivariateFunction f,
final double a, final double h) {
final double yA = f.value(a);
double yB = yA;
@@ -276,7 +276,7 @@ public class NonLinearConjugateGradientO
* extremum along the search direction.
* </p>
*/
- private class LineSearchFunction implements UnivariateRealFunction {
+ private class LineSearchFunction implements UnivariateFunction {
/** Search direction. */
private final double[] searchDirection;
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java Sun Nov 27 22:18:30 2011
@@ -33,7 +33,7 @@
* function:
* <ul>
* <li>{@link org.apache.commons.math.optimization.univariate.UnivariateRealOptimizer
- * UnivariateRealOptimizer} for {@link org.apache.commons.math.analysis.UnivariateRealFunction
+ * UnivariateRealOptimizer} for {@link org.apache.commons.math.analysis.UnivariateFunction
* univariate real functions}</li>
* <li>{@link org.apache.commons.math.optimization.MultivariateRealOptimizer
* MultivariateRealOptimizer} for {@link org.apache.commons.math.analysis.MultivariateRealFunction
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java Sun Nov 27 22:18:30 2011
@@ -21,7 +21,7 @@ import org.apache.commons.math.util.Incr
import org.apache.commons.math.exception.MaxCountExceededException;
import org.apache.commons.math.exception.TooManyEvaluationsException;
import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.optimization.GoalType;
import org.apache.commons.math.optimization.ConvergenceChecker;
@@ -47,7 +47,7 @@ public abstract class AbstractUnivariate
/** Initial guess . */
private double searchStart;
/** Function to optimize. */
- private UnivariateRealFunction function;
+ private UnivariateFunction function;
/**
* @param checker Convergence checking procedure.
@@ -109,7 +109,7 @@ public abstract class AbstractUnivariate
}
/** {@inheritDoc} */
- public UnivariateRealPointValuePair optimize(int maxEval, UnivariateRealFunction f,
+ public UnivariateRealPointValuePair optimize(int maxEval, UnivariateFunction f,
GoalType goalType,
double min, double max,
double startValue) {
@@ -136,7 +136,7 @@ public abstract class AbstractUnivariate
/** {@inheritDoc} */
public UnivariateRealPointValuePair optimize(int maxEval,
- UnivariateRealFunction f,
+ UnivariateFunction f,
GoalType goalType,
double min, double max){
return optimize(maxEval, f, goalType, min, max, min + 0.5 * (max - min));
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.optimization.univariate;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.optimization.BaseOptimizer;
import org.apache.commons.math.optimization.GoalType;
@@ -34,7 +34,7 @@ import org.apache.commons.math.optimizat
* @version $Id$
* @since 3.0
*/
-public interface BaseUnivariateRealOptimizer<FUNC extends UnivariateRealFunction>
+public interface BaseUnivariateRealOptimizer<FUNC extends UnivariateFunction>
extends BaseOptimizer<UnivariateRealPointValuePair> {
/**
* Find an optimum in the given interval.
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BracketFinder.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BracketFinder.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BracketFinder.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BracketFinder.java Sun Nov 27 22:18:30 2011
@@ -20,7 +20,7 @@ import org.apache.commons.math.util.Incr
import org.apache.commons.math.exception.NotStrictlyPositiveException;
import org.apache.commons.math.exception.TooManyEvaluationsException;
import org.apache.commons.math.exception.MaxCountExceededException;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.optimization.GoalType;
/**
@@ -109,7 +109,7 @@ public class BracketFinder {
* @throws TooManyEvaluationsException if the maximum number of evaluations
* is exceeded.
*/
- public void search(UnivariateRealFunction func, GoalType goal, double xA, double xB) {
+ public void search(UnivariateFunction func, GoalType goal, double xA, double xB) {
evaluations.resetCount();
final boolean isMinim = goal == GoalType.MINIMIZE;
@@ -276,7 +276,7 @@ public class BracketFinder {
* @throws TooManyEvaluationsException if the maximal number of evaluations is
* exceeded.
*/
- private double eval(UnivariateRealFunction f, double x) {
+ private double eval(UnivariateFunction f, double x) {
try {
evaluations.incrementCount();
} catch (MaxCountExceededException e) {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizer.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizer.java Sun Nov 27 22:18:30 2011
@@ -20,7 +20,7 @@ package org.apache.commons.math.optimiza
import java.util.Arrays;
import java.util.Comparator;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.MathIllegalStateException;
import org.apache.commons.math.exception.NotStrictlyPositiveException;
import org.apache.commons.math.exception.NullArgumentException;
@@ -42,7 +42,7 @@ import org.apache.commons.math.optimizat
* @version $Id$
* @since 3.0
*/
-public class MultiStartUnivariateRealOptimizer<FUNC extends UnivariateRealFunction>
+public class MultiStartUnivariateRealOptimizer<FUNC extends UnivariateFunction>
implements BaseUnivariateRealOptimizer<FUNC> {
/** Underlying classical optimizer. */
private final BaseUnivariateRealOptimizer<FUNC> optimizer;
@@ -104,12 +104,12 @@ public class MultiStartUnivariateRealOpt
/**
* Get all the optima found during the last call to {@link
- * #optimize(int,UnivariateRealFunction,GoalType,double,double) optimize}.
+ * #optimize(int,UnivariateFunction,GoalType,double,double) optimize}.
* The optimizer stores all the optima found during a set of
- * restarts. The {@link #optimize(int,UnivariateRealFunction,GoalType,double,double) optimize}
+ * restarts. The {@link #optimize(int,UnivariateFunction,GoalType,double,double) optimize}
* method returns the best point only. This method returns all the points
* found at the end of each starts, including the best one already
- * returned by the {@link #optimize(int,UnivariateRealFunction,GoalType,double,double) optimize}
+ * returned by the {@link #optimize(int,UnivariateFunction,GoalType,double,double) optimize}
* method.
* <br/>
* The returned array as one element for each start as specified
@@ -119,14 +119,14 @@ public class MultiStartUnivariateRealOpt
* descending order if maximizing), followed by {@code null} elements
* corresponding to the runs that did not converge. This means all
* elements will be {@code null} if the {@link
- * #optimize(int,UnivariateRealFunction,GoalType,double,double) optimize}
+ * #optimize(int,UnivariateFunction,GoalType,double,double) optimize}
* method did throw an exception.
* This also means that if the first element is not {@code null}, it is
* the best point found across all starts.
*
* @return an array containing the optima.
* @throws MathIllegalStateException if {@link
- * #optimize(int,UnivariateRealFunction,GoalType,double,double) optimize}
+ * #optimize(int,UnivariateFunction,GoalType,double,double) optimize}
* has not been called.
*/
public UnivariateRealPointValuePair[] getOptima() {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateRealOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateRealOptimizer.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateRealOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateRealOptimizer.java Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.optimization.univariate;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
/**
* Interface for univariate optimization algorithms.
@@ -25,4 +25,4 @@ import org.apache.commons.math.analysis.
* @since 3.0
*/
public interface UnivariateRealOptimizer
- extends BaseUnivariateRealOptimizer<UnivariateRealFunction> {}
+ extends BaseUnivariateRealOptimizer<UnivariateFunction> {}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.transform;
import org.apache.commons.math.MathRuntimeException;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.complex.Complex;
import org.apache.commons.math.exception.util.LocalizedFormats;
import org.apache.commons.math.util.FastMath;
@@ -77,7 +77,7 @@ public class FastCosineTransformer imple
* @return the real transformed array
* @throws IllegalArgumentException if any parameters are invalid
*/
- public double[] transform(UnivariateRealFunction f,
+ public double[] transform(UnivariateFunction f,
double min, double max, int n)
throws IllegalArgumentException {
double data[] = FastFourierTransformer.sample(f, min, max, n);
@@ -116,7 +116,7 @@ public class FastCosineTransformer imple
* @return the real transformed array
* @throws IllegalArgumentException if any parameters are invalid
*/
- public double[] transform2(UnivariateRealFunction f,
+ public double[] transform2(UnivariateFunction f,
double min, double max, int n)
throws IllegalArgumentException {
@@ -156,7 +156,7 @@ public class FastCosineTransformer imple
* @return the real inversely transformed array
* @throws IllegalArgumentException if any parameters are invalid
*/
- public double[] inversetransform(UnivariateRealFunction f,
+ public double[] inversetransform(UnivariateFunction f,
double min, double max, int n)
throws IllegalArgumentException {
@@ -194,7 +194,7 @@ public class FastCosineTransformer imple
* @return the real inversely transformed array
* @throws IllegalArgumentException if any parameters are invalid
*/
- public double[] inversetransform2(UnivariateRealFunction f,
+ public double[] inversetransform2(UnivariateFunction f,
double min, double max, int n)
throws IllegalArgumentException {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java Sun Nov 27 22:18:30 2011
@@ -20,7 +20,7 @@ import java.io.Serializable;
import java.lang.reflect.Array;
import org.apache.commons.math.MathRuntimeException;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.complex.Complex;
import org.apache.commons.math.exception.util.LocalizedFormats;
import org.apache.commons.math.util.FastMath;
@@ -87,7 +87,7 @@ public class FastFourierTransformer impl
* @return the complex transformed array
* @throws IllegalArgumentException if any parameters are invalid
*/
- public Complex[] transform(UnivariateRealFunction f,
+ public Complex[] transform(UnivariateFunction f,
double min, double max, int n)
throws IllegalArgumentException {
double data[] = sample(f, min, max, n);
@@ -140,7 +140,7 @@ public class FastFourierTransformer impl
* @return the complex transformed array
* @throws IllegalArgumentException if any parameters are invalid
*/
- public Complex[] transform2(UnivariateRealFunction f,
+ public Complex[] transform2(UnivariateFunction f,
double min, double max, int n)
throws IllegalArgumentException {
@@ -197,7 +197,7 @@ public class FastFourierTransformer impl
* @return the complex inversely transformed array
* @throws IllegalArgumentException if any parameters are invalid
*/
- public Complex[] inversetransform(UnivariateRealFunction f,
+ public Complex[] inversetransform(UnivariateFunction f,
double min, double max, int n)
throws IllegalArgumentException {
@@ -254,7 +254,7 @@ public class FastFourierTransformer impl
* @return the complex inversely transformed array
* @throws IllegalArgumentException if any parameters are invalid
*/
- public Complex[] inversetransform2(UnivariateRealFunction f,
+ public Complex[] inversetransform2(UnivariateFunction f,
double min, double max, int n)
throws IllegalArgumentException {
@@ -417,7 +417,7 @@ public class FastFourierTransformer impl
* @return the samples array
* @throws IllegalArgumentException if any parameters are invalid
*/
- public static double[] sample(UnivariateRealFunction f, double min, double max, int n)
+ public static double[] sample(UnivariateFunction f, double min, double max, int n)
throws IllegalArgumentException {
if (n <= 0) {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastHadamardTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastHadamardTransformer.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastHadamardTransformer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastHadamardTransformer.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.transform;
import org.apache.commons.math.MathRuntimeException;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.util.LocalizedFormats;
/**
@@ -40,7 +40,7 @@ public class FastHadamardTransformer imp
}
/** {@inheritDoc} */
- public double[] transform(UnivariateRealFunction f,
+ public double[] transform(UnivariateFunction f,
double min, double max, int n)
throws IllegalArgumentException {
return fht(FastFourierTransformer.sample(f, min, max, n));
@@ -53,7 +53,7 @@ public class FastHadamardTransformer imp
}
/** {@inheritDoc} */
- public double[] inversetransform(UnivariateRealFunction f,
+ public double[] inversetransform(UnivariateFunction f,
double min, double max, int n)
throws IllegalArgumentException {
final double[] unscaled =
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastSineTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastSineTransformer.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastSineTransformer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastSineTransformer.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.transform;
import org.apache.commons.math.MathRuntimeException;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.complex.Complex;
import org.apache.commons.math.exception.util.LocalizedFormats;
import org.apache.commons.math.util.FastMath;
@@ -76,7 +76,7 @@ public class FastSineTransformer impleme
* @return the real transformed array
* @throws IllegalArgumentException if any parameters are invalid
*/
- public double[] transform(UnivariateRealFunction f,
+ public double[] transform(UnivariateFunction f,
double min, double max, int n)
throws IllegalArgumentException {
@@ -115,7 +115,7 @@ public class FastSineTransformer impleme
* @throws IllegalArgumentException if any parameters are invalid
*/
public double[] transform2(
- UnivariateRealFunction f, double min, double max, int n)
+ UnivariateFunction f, double min, double max, int n)
throws IllegalArgumentException {
double data[] = FastFourierTransformer.sample(f, min, max, n);
@@ -153,7 +153,7 @@ public class FastSineTransformer impleme
* @return the real inversely transformed array
* @throws IllegalArgumentException if any parameters are invalid
*/
- public double[] inversetransform(UnivariateRealFunction f, double min, double max, int n)
+ public double[] inversetransform(UnivariateFunction f, double min, double max, int n)
throws IllegalArgumentException {
double data[] = FastFourierTransformer.sample(f, min, max, n);
@@ -190,7 +190,7 @@ public class FastSineTransformer impleme
* @return the real inversely transformed array
* @throws IllegalArgumentException if any parameters are invalid
*/
- public double[] inversetransform2(UnivariateRealFunction f, double min, double max, int n)
+ public double[] inversetransform2(UnivariateFunction f, double min, double max, int n)
throws IllegalArgumentException {
return transform2(f, min, max, n);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/RealTransformer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/RealTransformer.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/RealTransformer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/RealTransformer.java Sun Nov 27 22:18:30 2011
@@ -16,7 +16,7 @@
*/
package org.apache.commons.math.transform;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
/**
* Interface for one-dimensional data sets transformations producing real results.
@@ -50,7 +50,7 @@ public interface RealTransformer {
* @return the real transformed array
* @throws IllegalArgumentException if any parameters are invalid
*/
- double[] transform(UnivariateRealFunction f, double min, double max, int n)
+ double[] transform(UnivariateFunction f, double min, double max, int n)
throws IllegalArgumentException;
/**
@@ -71,7 +71,7 @@ public interface RealTransformer {
* @return the real inversely transformed array
* @throws IllegalArgumentException if any parameters are invalid
*/
- double[] inversetransform(UnivariateRealFunction f, double min, double max, int n)
+ double[] inversetransform(UnivariateFunction f, double min, double max, int n)
throws IllegalArgumentException;
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/Expm1Function.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/Expm1Function.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/Expm1Function.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/Expm1Function.java Sun Nov 27 22:18:30 2011
@@ -23,14 +23,14 @@ import org.apache.commons.math.util.Fast
*
* @version $Id$
*/
-public class Expm1Function implements DifferentiableUnivariateRealFunction {
+public class Expm1Function implements DifferentiableUnivariateFunction {
public double value(double x) {
return FastMath.expm1(x);
}
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
public double value(double x) {
return FastMath.exp(x);
}