Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Raw types 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1370220 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2012-08-07 12:42:33 +00:00
parent 2e16492cbf
commit 8d97496f8d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/java/org/apache/commons/math3/optimization/fitting/CurveFitterTest.java
View File

@ -29,7 +29,7 @@ public class CurveFitterTest {
public void testMath303() {
LevenbergMarquardtOptimizer optimizer = new LevenbergMarquardtOptimizer();
CurveFitter fitter = new CurveFitter(optimizer);
CurveFitter<ParametricUnivariateFunction> fitter = new CurveFitter<ParametricUnivariateFunction>(optimizer);
fitter.addObservedPoint(2.805d, 0.6934785852953367d);
fitter.addObservedPoint(2.74333333333333d, 0.6306772025518496d);
fitter.addObservedPoint(1.655d, 0.9474675497289684);
@ -52,7 +52,7 @@ public class CurveFitterTest {
public void testMath304() {
LevenbergMarquardtOptimizer optimizer = new LevenbergMarquardtOptimizer();
CurveFitter fitter = new CurveFitter(optimizer);
CurveFitter<ParametricUnivariateFunction> fitter = new CurveFitter<ParametricUnivariateFunction>(optimizer);
fitter.addObservedPoint(2.805d, 0.6934785852953367d);
fitter.addObservedPoint(2.74333333333333d, 0.6306772025518496d);
fitter.addObservedPoint(1.655d, 0.9474675497289684);
@ -73,7 +73,7 @@ public class CurveFitterTest {
@Test
public void testMath372() {
LevenbergMarquardtOptimizer optimizer = new LevenbergMarquardtOptimizer();
CurveFitter curveFitter = new CurveFitter(optimizer);
CurveFitter<ParametricUnivariateFunction> curveFitter = new CurveFitter<ParametricUnivariateFunction>(optimizer);
curveFitter.addObservedPoint( 15, 4443);
curveFitter.addObservedPoint( 31, 8493);

3
src/test/java/org/apache/commons/math3/optimization/fitting/PolynomialFitterTest.java
View File

@ -20,6 +20,7 @@ package org.apache.commons.math3.optimization.fitting;
import java.util.Random;
import org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
import org.apache.commons.math3.analysis.polynomials.PolynomialFunction.Parametric;
import org.apache.commons.math3.exception.ConvergenceException;
import org.apache.commons.math3.exception.TooManyEvaluationsException;
import org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer;
@ -154,7 +155,7 @@ public class PolynomialFitterTest {
private double[] doMath798(DifferentiableMultivariateVectorOptimizer optimizer,
int maxEval,
double[] init) {
final CurveFitter fitter = new CurveFitter(optimizer);
final CurveFitter<Parametric> fitter = new CurveFitter<Parametric>(optimizer);
fitter.addObservedPoint(-0.2, -7.12442E-13);
fitter.addObservedPoint(-0.199, -4.33397E-13);

2
src/test/java/org/apache/commons/math3/optimization/univariate/BrentOptimizerTest.java
View File

@ -56,7 +56,7 @@ public final class BrentOptimizerTest {
@Test
public void testSinMinWithValueChecker() {
final UnivariateFunction f = new SinFunction();
final ConvergenceChecker checker = new SimpleUnivariateValueChecker(1e-5, 1e-14);
final ConvergenceChecker<UnivariatePointValuePair> checker = new SimpleUnivariateValueChecker(1e-5, 1e-14);
// The default stopping criterion of Brent's algorithm should not
// pass, but the search will stop at the given relative tolerance
// for the function value.