Apache/commons-math
1
0
Fork 0
mirror of https://github.com/apache/commons-math.git synced 2025-02-06 10:09:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed FieldUnivariateFunction to RealFieldUnivariateFunction.

Browse Source
This commit is contained in:
Phil Steitz 2015-11-15 15:40:23 -07:00
parent 029b692aab
commit d510921649
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/apache/commons/math4/analysis/FieldUnivariateFunction.java → src/main/java/org/apache/commons/math4/analysis/RealFieldUnivariateFunction.java
View File

@ -69,7 +69,7 @@ import org.apache.commons.math4.RealFieldElement;
* @since 3.6 * @since 3.6
* @see UnivariateFunction * @see UnivariateFunction
*/ */
public interface FieldUnivariateFunction<T extends RealFieldElement<T>> { public interface RealFieldUnivariateFunction<T extends RealFieldElement<T>> {
/** /**
* Compute the value of the function. * Compute the value of the function.
* *

6
src/main/java/org/apache/commons/math4/analysis/solvers/FieldBracketingNthOrderBrentSolver.java
View File

@ -19,7 +19,7 @@ package org.apache.commons.math4.analysis.solvers;
import org.apache.commons.math4.Field; import org.apache.commons.math4.Field;
import org.apache.commons.math4.RealFieldElement; import org.apache.commons.math4.RealFieldElement;
import org.apache.commons.math4.analysis.FieldUnivariateFunction; import org.apache.commons.math4.analysis.RealFieldUnivariateFunction;
import org.apache.commons.math4.exception.MathInternalError; import org.apache.commons.math4.exception.MathInternalError;
import org.apache.commons.math4.exception.NoBracketingException; import org.apache.commons.math4.exception.NoBracketingException;
import org.apache.commons.math4.exception.NullArgumentException; import org.apache.commons.math4.exception.NullArgumentException;
@ -162,7 +162,7 @@ public class FieldBracketingNthOrderBrentSolver<T extends RealFieldElement<T>> {
* @exception NullArgumentException if f is null. * @exception NullArgumentException if f is null.
* @exception NoBracketingException if root cannot be bracketed * @exception NoBracketingException if root cannot be bracketed
*/ */
public T solve(final int maxEval, final FieldUnivariateFunction<T> f, public T solve(final int maxEval, final RealFieldUnivariateFunction<T> f,
final T min, final T max, final AllowedSolution allowedSolution) final T min, final T max, final AllowedSolution allowedSolution)
throws NullArgumentException, NoBracketingException { throws NullArgumentException, NoBracketingException {
return solve(maxEval, f, min, max, min.add(max).divide(2), allowedSolution); return solve(maxEval, f, min, max, min.add(max).divide(2), allowedSolution);
@ -185,7 +185,7 @@ public class FieldBracketingNthOrderBrentSolver<T extends RealFieldElement<T>> {
* @exception NullArgumentException if f is null. * @exception NullArgumentException if f is null.
* @exception NoBracketingException if root cannot be bracketed * @exception NoBracketingException if root cannot be bracketed
*/ */
public T solve(final int maxEval, final FieldUnivariateFunction<T> f, public T solve(final int maxEval, final RealFieldUnivariateFunction<T> f,
final T min, final T max, final T startValue, final T min, final T max, final T startValue,
final AllowedSolution allowedSolution) final AllowedSolution allowedSolution)
throws NullArgumentException, NoBracketingException { throws NullArgumentException, NoBracketingException {

18
src/test/java/org/apache/commons/math4/analysis/solvers/FieldBracketingNthOrderBrentSolverTest.java
View File

@ -17,7 +17,7 @@
package org.apache.commons.math4.analysis.solvers; package org.apache.commons.math4.analysis.solvers;
import org.apache.commons.math4.analysis.FieldUnivariateFunction; import org.apache.commons.math4.analysis.RealFieldUnivariateFunction;
import org.apache.commons.math4.analysis.solvers.AllowedSolution; import org.apache.commons.math4.analysis.solvers.AllowedSolution;
import org.apache.commons.math4.dfp.Dfp; import org.apache.commons.math4.dfp.Dfp;
import org.apache.commons.math4.dfp.DfpField; import org.apache.commons.math4.dfp.DfpField;
@ -53,7 +53,7 @@ public final class FieldBracketingNthOrderBrentSolverTest {
FieldBracketingNthOrderBrentSolver<Dfp> solver = FieldBracketingNthOrderBrentSolver<Dfp> solver =
new FieldBracketingNthOrderBrentSolver<Dfp>(relativeAccuracy, absoluteAccuracy, new FieldBracketingNthOrderBrentSolver<Dfp>(relativeAccuracy, absoluteAccuracy,
field.newDfp(1.0e-20), 20); field.newDfp(1.0e-20), 20);
FieldUnivariateFunction<Dfp> f = new FieldUnivariateFunction<Dfp>() { RealFieldUnivariateFunction<Dfp> f = new RealFieldUnivariateFunction<Dfp>() {
public Dfp value(Dfp x) { public Dfp value(Dfp x) {
Dfp one = field.getOne(); Dfp one = field.getOne();
Dfp oneHalf = one.divide(2); Dfp oneHalf = one.divide(2);
@ -85,37 +85,37 @@ public final class FieldBracketingNthOrderBrentSolverTest {
// intern J. Computer Math Vol 23 pp 265-282 // intern J. Computer Math Vol 23 pp 265-282
// available here: http://www.math.nps.navy.mil/~bneta/SeveralNewMethods.PDF // available here: http://www.math.nps.navy.mil/~bneta/SeveralNewMethods.PDF
for (AllowedSolution allowed : AllowedSolution.values()) { for (AllowedSolution allowed : AllowedSolution.values()) {
check(new FieldUnivariateFunction<Dfp>() { check(new RealFieldUnivariateFunction<Dfp>() {
public Dfp value(Dfp x) { public Dfp value(Dfp x) {
return DfpMath.sin(x).subtract(x.divide(2)); return DfpMath.sin(x).subtract(x.divide(2));
} }
}, 200, -2.0, 2.0, allowed); }, 200, -2.0, 2.0, allowed);
check(new FieldUnivariateFunction<Dfp>() { check(new RealFieldUnivariateFunction<Dfp>() {
public Dfp value(Dfp x) { public Dfp value(Dfp x) {
return DfpMath.pow(x, 5).add(x).subtract(field.newDfp(10000)); return DfpMath.pow(x, 5).add(x).subtract(field.newDfp(10000));
} }
}, 200, -5.0, 10.0, allowed); }, 200, -5.0, 10.0, allowed);
check(new FieldUnivariateFunction<Dfp>() { check(new RealFieldUnivariateFunction<Dfp>() {
public Dfp value(Dfp x) { public Dfp value(Dfp x) {
return x.sqrt().subtract(field.getOne().divide(x)).subtract(field.newDfp(3)); return x.sqrt().subtract(field.getOne().divide(x)).subtract(field.newDfp(3));
} }
}, 200, 0.001, 10.0, allowed); }, 200, 0.001, 10.0, allowed);
check(new FieldUnivariateFunction<Dfp>() { check(new RealFieldUnivariateFunction<Dfp>() {
public Dfp value(Dfp x) { public Dfp value(Dfp x) {
return DfpMath.exp(x).add(x).subtract(field.newDfp(20)); return DfpMath.exp(x).add(x).subtract(field.newDfp(20));
} }
}, 200, -5.0, 5.0, allowed); }, 200, -5.0, 5.0, allowed);
check(new FieldUnivariateFunction<Dfp>() { check(new RealFieldUnivariateFunction<Dfp>() {
public Dfp value(Dfp x) { public Dfp value(Dfp x) {
return DfpMath.log(x).add(x.sqrt()).subtract(field.newDfp(5)); return DfpMath.log(x).add(x.sqrt()).subtract(field.newDfp(5));
} }
}, 200, 0.001, 10.0, allowed); }, 200, 0.001, 10.0, allowed);
check(new FieldUnivariateFunction<Dfp>() { check(new RealFieldUnivariateFunction<Dfp>() {
public Dfp value(Dfp x) { public Dfp value(Dfp x) {
return x.subtract(field.getOne()).multiply(x).multiply(x).subtract(field.getOne()); return x.subtract(field.getOne()).multiply(x).multiply(x).subtract(field.getOne());
} }
@ -124,7 +124,7 @@ public final class FieldBracketingNthOrderBrentSolverTest {
} }
private void check(FieldUnivariateFunction<Dfp> f, int maxEval, double min, double max, private void check(RealFieldUnivariateFunction<Dfp> f, int maxEval, double min, double max,
AllowedSolution allowedSolution) { AllowedSolution allowedSolution) {
FieldBracketingNthOrderBrentSolver<Dfp> solver = FieldBracketingNthOrderBrentSolver<Dfp> solver =
new FieldBracketingNthOrderBrentSolver<Dfp>(relativeAccuracy, absoluteAccuracy, new FieldBracketingNthOrderBrentSolver<Dfp>(relativeAccuracy, absoluteAccuracy,