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 [1/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...
Author: erans
Date: Sun Nov 27 22:18:30 2011
New Revision: 1206867
URL: http://svn.apache.org/viewvc?rev=1206867&view=rev
Log:
MATH-707
Changed "...UnivariateRealFunction" to "...UnivariateFunction".
Added:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateFunction.java
- copied, changed from r1206856, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateRealFunction.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ParametricUnivariateFunction.java
- copied, changed from r1206856, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ParametricUnivariateRealFunction.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/UnivariateFunction.java
- copied, changed from r1206856, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/UnivariateRealFunction.java
Removed:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateRealFunction.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ParametricUnivariateRealFunction.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/UnivariateRealFunction.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/FunctionUtils.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Abs.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Acos.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Acosh.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Asin.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Asinh.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Atan.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Atanh.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cbrt.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Ceil.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Constant.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cos.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cosh.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Exp.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Expm1.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Floor.java
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/Identity.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Inverse.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log10.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log1p.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/Minus.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Power.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Rint.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/function/Signum.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sin.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sinc.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sinh.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sqrt.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/StepFunction.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Tan.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Tanh.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Ulp.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegratorImpl.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolator.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/analysis/polynomials/PolynomialFunctionLagrangeForm.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AbstractDifferentiableUnivariateRealSolver.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/AbstractUnivariateRealSolver.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseAbstractUnivariateRealSolver.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseSecantSolver.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BaseUnivariateRealSolver.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketedUnivariateRealSolver.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolver.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/DifferentiableUnivariateRealSolver.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolver.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractContinuousDistribution.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/RealVector.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/events/EventState.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/MultivariateRealFunctionMappingAdapter.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/CurveFitter.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/GaussianFitter.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/AbstractUnivariateRealOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateRealOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/BracketFinder.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateRealOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastHadamardTransformer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastSineTransformer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/RealTransformer.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/Expm1Function.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/FunctionUtilsTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/MonitoredFunction.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/QuinticFunction.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SinFunction.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SincFunction.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SumSincFunction.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/XMinus5Function.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/GaussianTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/HarmonicOscillatorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/LogisticTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/LogitTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SigmoidTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SincTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/SqrtTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/function/StepFunctionTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegratorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/RombergIntegratorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/SimpsonIntegratorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/integration/TrapezoidIntegratorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolatorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/LinearInterpolatorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolatorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/SplineInterpolatorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/interpolation/UnivariateRealPeriodicInterpolatorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunctionTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtilsTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BaseSecantSolverAbstractTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BisectionSolverTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolverTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/BrentSolverTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/MullerSolver2Test.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/MullerSolverTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/NewtonSolverTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolverTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/RiddersSolverTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtilsTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/ArrayRealVectorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/RealVectorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseRealVectorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/UnmodifiableRealVectorAbstractTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/fitting/CurveFitterTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/univariate/BracketFinderTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/univariate/BrentOptimizerTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/univariate/MultiStartUnivariateRealOptimizerTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/transform/FastCosineTransformerTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/transform/FastFourierTransformerTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/transform/FastSineTransformerTest.java
Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateFunction.java (from r1206856, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateRealFunction.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateFunction.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateFunction.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateRealFunction.java&r1=1206856&r2=1206867&rev=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateRealFunction.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateFunction.java Sun Nov 27 22:18:30 2011
@@ -17,18 +17,18 @@
package org.apache.commons.math.analysis;
/**
- * Extension of {@link UnivariateRealFunction} representing a differentiable univariate real function.
+ * Extension of {@link UnivariateFunction} representing a differentiable univariate real function.
*
* @version $Id$
*/
-public interface DifferentiableUnivariateRealFunction
- extends UnivariateRealFunction {
+public interface DifferentiableUnivariateFunction
+ extends UnivariateFunction {
/**
* Returns the derivative of the function
*
* @return the derivative function
*/
- UnivariateRealFunction derivative();
+ UnivariateFunction derivative();
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/FunctionUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/FunctionUtils.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/FunctionUtils.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/FunctionUtils.java Sun Nov 27 22:18:30 2011
@@ -39,8 +39,8 @@ public class FunctionUtils {
* @param f List of functions.
* @return the composite function.
*/
- public static UnivariateRealFunction compose(final UnivariateRealFunction ... f) {
- return new UnivariateRealFunction() {
+ public static UnivariateFunction compose(final UnivariateFunction ... f) {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
double r = x;
@@ -60,8 +60,8 @@ public class FunctionUtils {
* @param f List of functions.
* @return the composite function.
*/
- public static DifferentiableUnivariateRealFunction compose(final DifferentiableUnivariateRealFunction ... f) {
- return new DifferentiableUnivariateRealFunction() {
+ public static DifferentiableUnivariateFunction compose(final DifferentiableUnivariateFunction ... f) {
+ return new DifferentiableUnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
double r = x;
@@ -72,8 +72,8 @@ public class FunctionUtils {
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
double p = 1;
@@ -95,8 +95,8 @@ public class FunctionUtils {
* @param f List of functions.
* @return a function that computes the sum of the functions.
*/
- public static UnivariateRealFunction add(final UnivariateRealFunction ... f) {
- return new UnivariateRealFunction() {
+ public static UnivariateFunction add(final UnivariateFunction ... f) {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
double r = f[0].value(x);
@@ -114,8 +114,8 @@ public class FunctionUtils {
* @param f List of functions.
* @return a function that computes the sum of the functions.
*/
- public static DifferentiableUnivariateRealFunction add(final DifferentiableUnivariateRealFunction ... f) {
- return new DifferentiableUnivariateRealFunction() {
+ public static DifferentiableUnivariateFunction add(final DifferentiableUnivariateFunction ... f) {
+ return new DifferentiableUnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
double r = f[0].value(x);
@@ -126,8 +126,8 @@ public class FunctionUtils {
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
double r = f[0].derivative().value(x);
@@ -147,8 +147,8 @@ public class FunctionUtils {
* @param f List of functions.
* @return a function that computes the product of the functions.
*/
- public static UnivariateRealFunction multiply(final UnivariateRealFunction ... f) {
- return new UnivariateRealFunction() {
+ public static UnivariateFunction multiply(final UnivariateFunction ... f) {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
double r = f[0].value(x);
@@ -166,8 +166,8 @@ public class FunctionUtils {
* @param f List of functions.
* @return a function that computes the product of the functions.
*/
- public static DifferentiableUnivariateRealFunction multiply(final DifferentiableUnivariateRealFunction ... f) {
- return new DifferentiableUnivariateRealFunction() {
+ public static DifferentiableUnivariateFunction multiply(final DifferentiableUnivariateFunction ... f) {
+ return new DifferentiableUnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
double r = f[0].value(x);
@@ -178,8 +178,8 @@ public class FunctionUtils {
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
double sum = 0;
@@ -208,10 +208,10 @@ public class FunctionUtils {
* @param g Function.
* @return the composite function.
*/
- public static UnivariateRealFunction combine(final BivariateRealFunction combiner,
- final UnivariateRealFunction f,
- final UnivariateRealFunction g) {
- return new UnivariateRealFunction() {
+ public static UnivariateFunction combine(final BivariateRealFunction combiner,
+ final UnivariateFunction f,
+ final UnivariateFunction g) {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return combiner.value(f.value(x), g.value(x));
@@ -230,7 +230,7 @@ public class FunctionUtils {
* @return a collector function.
*/
public static MultivariateRealFunction collector(final BivariateRealFunction combiner,
- final UnivariateRealFunction f,
+ final UnivariateFunction f,
final double initialValue) {
return new MultivariateRealFunction() {
/** {@inheritDoc} */
@@ -265,9 +265,9 @@ public class FunctionUtils {
* @param fixed Value to which the first argument of {@code f} is set.
* @return the unary function h(x) = f(fixed, x)
*/
- public static UnivariateRealFunction fix1stArgument(final BivariateRealFunction f,
+ public static UnivariateFunction fix1stArgument(final BivariateRealFunction f,
final double fixed) {
- return new UnivariateRealFunction() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return f.value(fixed, x);
@@ -281,9 +281,9 @@ public class FunctionUtils {
* @param fixed Value to which the second argument of {@code f} is set.
* @return the unary function h(x) = f(x, fixed)
*/
- public static UnivariateRealFunction fix2ndArgument(final BivariateRealFunction f,
+ public static UnivariateFunction fix2ndArgument(final BivariateRealFunction f,
final double fixed) {
- return new UnivariateRealFunction() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return f.value(x, fixed);
Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ParametricUnivariateFunction.java (from r1206856, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ParametricUnivariateRealFunction.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ParametricUnivariateFunction.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ParametricUnivariateFunction.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ParametricUnivariateRealFunction.java&r1=1206856&r2=1206867&rev=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ParametricUnivariateRealFunction.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ParametricUnivariateFunction.java Sun Nov 27 22:18:30 2011
@@ -24,7 +24,7 @@ package org.apache.commons.math.analysis
* @since 3.0
* @version $Id$
*/
-public interface ParametricUnivariateRealFunction {
+public interface ParametricUnivariateFunction {
/**
* Compute the value of the function.
*
Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/UnivariateFunction.java (from r1206856, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/UnivariateRealFunction.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/UnivariateFunction.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/UnivariateFunction.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/UnivariateRealFunction.java&r1=1206856&r2=1206867&rev=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/UnivariateRealFunction.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/UnivariateFunction.java Sun Nov 27 22:18:30 2011
@@ -41,7 +41,7 @@ package org.apache.commons.math.analysis
* }
* }
*
- * private static class MyFunction implements UnivariateRealFunction {
+ * private static class MyFunction implements UnivariateFunction {
* public double value(double x) {
* double y = hugeFormula(x);
* if (somethingBadHappens) {
@@ -65,7 +65,7 @@ package org.apache.commons.math.analysis
*
* @version $Id$
*/
-public interface UnivariateRealFunction {
+public interface UnivariateFunction {
/**
* Compute the value of the function.
*
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Abs.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Abs.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Abs.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Abs.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -26,7 +26,7 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Abs implements UnivariateRealFunction {
+public class Abs implements UnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.abs(x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Acos.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Acos.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Acos.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Acos.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Acos implements DifferentiableUnivariateRealFunction {
+public class Acos implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.acos(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return -1 / FastMath.sqrt(1 - x * x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Acosh.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Acosh.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Acosh.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Acosh.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Acosh implements DifferentiableUnivariateRealFunction {
+public class Acosh implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.acosh(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return 1 / FastMath.sqrt(x * x - 1);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Asin.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Asin.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Asin.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Asin.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Asin implements DifferentiableUnivariateRealFunction {
+public class Asin implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.asin(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return 1 / FastMath.sqrt(1 - x * x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Asinh.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Asinh.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Asinh.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Asinh.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Asinh implements DifferentiableUnivariateRealFunction {
+public class Asinh implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.asinh(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return 1 / FastMath.sqrt(1 + x * x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Atan.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Atan.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Atan.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Atan.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Atan implements DifferentiableUnivariateRealFunction {
+public class Atan implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.atan(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return 1 / (1 + x * x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Atanh.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Atanh.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Atanh.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Atanh.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Atanh implements DifferentiableUnivariateRealFunction {
+public class Atanh implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.atanh(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return 1 / (1 - x * x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cbrt.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cbrt.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cbrt.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cbrt.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Cbrt implements DifferentiableUnivariateRealFunction {
+public class Cbrt implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.cbrt(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return 1 / (3 * FastMath.cbrt(x * x));
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Ceil.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Ceil.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Ceil.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Ceil.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -26,7 +26,7 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Ceil implements UnivariateRealFunction {
+public class Ceil implements UnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.ceil(x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Constant.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Constant.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Constant.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Constant.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
/**
* Constant function.
@@ -25,7 +25,7 @@ import org.apache.commons.math.analysis.
* @version $Id$
* @since 3.0
*/
-public class Constant implements DifferentiableUnivariateRealFunction {
+public class Constant implements DifferentiableUnivariateFunction {
/** Constant. */
private final double c;
@@ -42,7 +42,7 @@ public class Constant implements Differe
}
/** {@inheritDoc} */
- public DifferentiableUnivariateRealFunction derivative() {
+ public DifferentiableUnivariateFunction derivative() {
return new Constant(0);
}
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cos.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cos.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cos.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cos.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Cos implements DifferentiableUnivariateRealFunction {
+public class Cos implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.cos(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return -FastMath.sin(x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cosh.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cosh.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cosh.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Cosh.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -26,14 +26,14 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Cosh implements DifferentiableUnivariateRealFunction {
+public class Cosh implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.cosh(x);
}
/** {@inheritDoc} */
- public DifferentiableUnivariateRealFunction derivative() {
+ public DifferentiableUnivariateFunction derivative() {
return new Sinh();
}
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Exp.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Exp.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Exp.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Exp.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Exp implements DifferentiableUnivariateRealFunction {
+public class Exp implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.exp(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.exp(x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Expm1.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Expm1.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Expm1.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Expm1.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Expm1 implements DifferentiableUnivariateRealFunction {
+public class Expm1 implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.expm1(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.exp(x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Floor.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Floor.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Floor.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Floor.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -26,7 +26,7 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Floor implements UnivariateRealFunction {
+public class Floor implements UnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.floor(x);
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=1206867&r1=1206866&r2=1206867&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 Sun Nov 27 22:18:30 2011
@@ -17,9 +17,9 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
-import org.apache.commons.math.analysis.ParametricUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
+import org.apache.commons.math.analysis.ParametricUnivariateFunction;
import org.apache.commons.math.exception.NotStrictlyPositiveException;
import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.DimensionMismatchException;
@@ -32,7 +32,7 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Gaussian implements DifferentiableUnivariateRealFunction {
+public class Gaussian implements DifferentiableUnivariateFunction {
/** Mean. */
private final double mean;
/** Inverse of twice the square of the standard deviation. */
@@ -85,8 +85,8 @@ public class Gaussian implements Differe
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
final double diff = x - mean;
@@ -111,7 +111,7 @@ public class Gaussian implements Differe
* <li>Standard deviation</li>
* </ul>
*/
- public static class Parametric implements ParametricUnivariateRealFunction {
+ public static class Parametric implements ParametricUnivariateFunction {
/**
* Computes the value of the Gaussian at {@code x}.
*
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=1206867&r1=1206866&r2=1206867&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 Sun Nov 27 22:18:30 2011
@@ -17,9 +17,9 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
-import org.apache.commons.math.analysis.ParametricUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
+import org.apache.commons.math.analysis.ParametricUnivariateFunction;
import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.util.FastMath;
@@ -31,7 +31,7 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class HarmonicOscillator implements DifferentiableUnivariateRealFunction {
+public class HarmonicOscillator implements DifferentiableUnivariateFunction {
/** Amplitude. */
private final double amplitude;
/** Angular frequency. */
@@ -60,8 +60,8 @@ public class HarmonicOscillator implemen
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return -amplitude * omega * FastMath.sin(omega * x + phase);
@@ -78,7 +78,7 @@ public class HarmonicOscillator implemen
* <li>Phase</li>
* </ul>
*/
- public static class Parametric implements ParametricUnivariateRealFunction {
+ public static class Parametric implements ParametricUnivariateFunction {
/**
* Computes the value of the harmonic oscillator at {@code x}.
*
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Identity.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Identity.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Identity.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Identity.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
/**
* Identity function.
@@ -25,14 +25,14 @@ import org.apache.commons.math.analysis.
* @version $Id$
* @since 3.0
*/
-public class Identity implements DifferentiableUnivariateRealFunction {
+public class Identity implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return x;
}
/** {@inheritDoc} */
- public DifferentiableUnivariateRealFunction derivative() {
+ public DifferentiableUnivariateFunction derivative() {
return new Constant(1);
}
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Inverse.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Inverse.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Inverse.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Inverse.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
/**
* Inverse function.
@@ -26,15 +26,15 @@ import org.apache.commons.math.analysis.
* @version $Id$
* @since 3.0
*/
-public class Inverse implements DifferentiableUnivariateRealFunction {
+public class Inverse implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return 1 / x;
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return -1 / (x * x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Log implements DifferentiableUnivariateRealFunction {
+public class Log implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.log(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return 1 / x;
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log10.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log10.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log10.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log10.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,7 +27,7 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Log10 implements DifferentiableUnivariateRealFunction {
+public class Log10 implements DifferentiableUnivariateFunction {
/** ln(10) = {@value}.*/
private static final double LN_10 = FastMath.log(10);
@@ -37,8 +37,8 @@ public class Log10 implements Differenti
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return 1 / (x * LN_10);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log1p.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log1p.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log1p.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Log1p.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Log1p implements DifferentiableUnivariateRealFunction {
+public class Log1p implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.log1p(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return 1 / (1 + x);
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=1206867&r1=1206866&r2=1206867&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 Sun Nov 27 22:18:30 2011
@@ -17,9 +17,9 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
-import org.apache.commons.math.analysis.ParametricUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
+import org.apache.commons.math.analysis.ParametricUnivariateFunction;
import org.apache.commons.math.exception.NotStrictlyPositiveException;
import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.DimensionMismatchException;
@@ -32,7 +32,7 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Logistic implements DifferentiableUnivariateRealFunction {
+public class Logistic implements DifferentiableUnivariateFunction {
/** Lower asymptote. */
private final double a;
/** Upper asymptote. */
@@ -83,8 +83,8 @@ public class Logistic implements Differe
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
final double exp = q * FastMath.exp(b * (m - x));
@@ -106,7 +106,7 @@ public class Logistic implements Differe
* <li>Higher asymptote</li>
* </ul>
*/
- public static class Parametric implements ParametricUnivariateRealFunction {
+ public static class Parametric implements ParametricUnivariateFunction {
/**
* Computes the value of the sigmoid at {@code x}.
*
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=1206867&r1=1206866&r2=1206867&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 Sun Nov 27 22:18:30 2011
@@ -17,9 +17,9 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
-import org.apache.commons.math.analysis.ParametricUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
+import org.apache.commons.math.analysis.ParametricUnivariateFunction;
import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.exception.OutOfRangeException;
@@ -33,7 +33,7 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Logit implements DifferentiableUnivariateRealFunction {
+public class Logit implements DifferentiableUnivariateFunction {
/** Lower bound. */
private final double lo;
/** Higher bound. */
@@ -65,8 +65,8 @@ public class Logit implements Differenti
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return (hi - lo) / ((x - lo) * (hi - x));
@@ -82,7 +82,7 @@ public class Logit implements Differenti
* <li>Higher bound</li>
* </ul>
*/
- public static class Parametric implements ParametricUnivariateRealFunction {
+ public static class Parametric implements ParametricUnivariateFunction {
/**
* Computes the value of the logit at {@code x}.
*
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Minus.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Minus.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Minus.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Minus.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
/**
* Minus function.
@@ -25,14 +25,14 @@ import org.apache.commons.math.analysis.
* @version $Id$
* @since 3.0
*/
-public class Minus implements DifferentiableUnivariateRealFunction {
+public class Minus implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return -x;
}
/** {@inheritDoc} */
- public DifferentiableUnivariateRealFunction derivative() {
+ public DifferentiableUnivariateFunction derivative() {
return new Constant(-1);
}
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Power.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Power.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Power.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Power.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,7 +27,7 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Power implements DifferentiableUnivariateRealFunction {
+public class Power implements DifferentiableUnivariateFunction {
/** Power. */
private final double p;
@@ -44,8 +44,8 @@ public class Power implements Differenti
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return p * FastMath.pow(x, p - 1);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Rint.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Rint.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Rint.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Rint.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -26,7 +26,7 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Rint implements UnivariateRealFunction {
+public class Rint implements UnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.rint(x);
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=1206867&r1=1206866&r2=1206867&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 Sun Nov 27 22:18:30 2011
@@ -17,9 +17,9 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
-import org.apache.commons.math.analysis.ParametricUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
+import org.apache.commons.math.analysis.ParametricUnivariateFunction;
import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.util.FastMath;
@@ -34,7 +34,7 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Sigmoid implements DifferentiableUnivariateRealFunction {
+public class Sigmoid implements DifferentiableUnivariateFunction {
/** Lower asymptote. */
private final double lo;
/** Higher asymptote. */
@@ -61,8 +61,8 @@ public class Sigmoid implements Differen
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
final double exp = FastMath.exp(-x);
@@ -89,7 +89,7 @@ public class Sigmoid implements Differen
* <li>Higher asymptote</li>
* </ul>
*/
- public static class Parametric implements ParametricUnivariateRealFunction {
+ public static class Parametric implements ParametricUnivariateFunction {
/**
* Computes the value of the sigmoid at {@code x}.
*
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Signum.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Signum.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Signum.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Signum.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -26,7 +26,7 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Signum implements UnivariateRealFunction {
+public class Signum implements UnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.signum(x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sin.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sin.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sin.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sin.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -26,14 +26,14 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Sin implements DifferentiableUnivariateRealFunction {
+public class Sin implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.sin(x);
}
/** {@inheritDoc} */
- public DifferentiableUnivariateRealFunction derivative() {
+ public DifferentiableUnivariateFunction derivative() {
return new Cos();
}
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sinc.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sinc.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sinc.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sinc.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -32,7 +32,7 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Sinc implements DifferentiableUnivariateRealFunction {
+public class Sinc implements DifferentiableUnivariateFunction {
/**
* Value below which the result of the computation will not change
* anymore due to the finite precision of the "double" representation
@@ -70,9 +70,9 @@ public class Sinc implements Differentia
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
+ public UnivariateFunction derivative() {
if (normalized) {
- return new UnivariateRealFunction() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
final double piTimesX = Math.PI * x;
@@ -80,7 +80,7 @@ public class Sinc implements Differentia
}
};
} else {
- return new UnivariateRealFunction() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return sincDerivative(x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sinh.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sinh.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sinh.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sinh.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -26,14 +26,14 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Sinh implements DifferentiableUnivariateRealFunction {
+public class Sinh implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.sinh(x);
}
/** {@inheritDoc} */
- public DifferentiableUnivariateRealFunction derivative() {
+ public DifferentiableUnivariateFunction derivative() {
return new Cosh();
}
}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sqrt.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sqrt.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sqrt.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Sqrt.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Sqrt implements DifferentiableUnivariateRealFunction {
+public class Sqrt implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.sqrt(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
return 1 / (2 * FastMath.sqrt(x));
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/StepFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/StepFunction.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/StepFunction.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/StepFunction.java Sun Nov 27 22:18:30 2011
@@ -18,7 +18,7 @@
package org.apache.commons.math.analysis.function;
import java.util.Arrays;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.NoDataException;
@@ -31,7 +31,7 @@ import org.apache.commons.math.util.Math
* @version $Id$
* @since 3.0
*/
-public class StepFunction implements UnivariateRealFunction {
+public class StepFunction implements UnivariateFunction {
/** Abscissae. */
private final double[] abscissa;
/** Ordinates. */
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Tan.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Tan.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Tan.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Tan.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Tan implements DifferentiableUnivariateRealFunction {
+public class Tan implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.tan(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
final double tanX = FastMath.tan(x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Tanh.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Tanh.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Tanh.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Tanh.java Sun Nov 27 22:18:30 2011
@@ -17,8 +17,8 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
-import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -27,15 +27,15 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Tanh implements DifferentiableUnivariateRealFunction {
+public class Tanh implements DifferentiableUnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.tanh(x);
}
/** {@inheritDoc} */
- public UnivariateRealFunction derivative() {
- return new UnivariateRealFunction() {
+ public UnivariateFunction derivative() {
+ return new UnivariateFunction() {
/** {@inheritDoc} */
public double value(double x) {
final double tanhX = FastMath.tanh(x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Ulp.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Ulp.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Ulp.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/function/Ulp.java Sun Nov 27 22:18:30 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.analysis.function;
-import org.apache.commons.math.analysis.UnivariateRealFunction;
+import org.apache.commons.math.analysis.UnivariateFunction;
import org.apache.commons.math.util.FastMath;
/**
@@ -26,7 +26,7 @@ import org.apache.commons.math.util.Fast
* @version $Id$
* @since 3.0
*/
-public class Ulp implements UnivariateRealFunction {
+public class Ulp implements UnivariateFunction {
/** {@inheritDoc} */
public double value(double x) {
return FastMath.ulp(x);
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java?rev=1206867&r1=1206866&r2=1206867&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegrator.java 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.exception.MathIllegalArgumentException;
import org.apache.commons.math.exception.MaxCountExceededException;
import org.apache.commons.math.exception.NullArgumentException;
@@ -73,7 +73,7 @@ public interface UnivariateRealIntegrato
* satisfy the requirements specified by the integrator
* @throws NullArgumentException if {@code f} is {@code null}.
*/
- double integrate(int maxEval, UnivariateRealFunction f, double min,
+ double integrate(int maxEval, UnivariateFunction f, double min,
double max)
throws TooManyEvaluationsException, MaxCountExceededException,
MathIllegalArgumentException, NullArgumentException;