From 8d97496f8df4ce634bc7e58fcfbc635da32a3edb Mon Sep 17 00:00:00 2001
From: Sebastian Bazley <sebb@apache.org>
Date: Tue, 7 Aug 2012 12:42:33 +0000
Subject: [PATCH] Raw types

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1370220 13f79535-47bb-0310-9956-ffa450edef68
---
 .../commons/math3/optimization/fitting/CurveFitterTest.java | 6 +++---
 .../math3/optimization/fitting/PolynomialFitterTest.java    | 3 ++-
 .../math3/optimization/univariate/BrentOptimizerTest.java   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/apache/commons/math3/optimization/fitting/CurveFitterTest.java b/src/test/java/org/apache/commons/math3/optimization/fitting/CurveFitterTest.java
index 77b29714c..4d3804bce 100644
--- a/src/test/java/org/apache/commons/math3/optimization/fitting/CurveFitterTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/fitting/CurveFitterTest.java
@@ -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);
diff --git a/src/test/java/org/apache/commons/math3/optimization/fitting/PolynomialFitterTest.java b/src/test/java/org/apache/commons/math3/optimization/fitting/PolynomialFitterTest.java
index 36e2c4a48..dcdea68e6 100644
--- a/src/test/java/org/apache/commons/math3/optimization/fitting/PolynomialFitterTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/fitting/PolynomialFitterTest.java
@@ -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);
diff --git a/src/test/java/org/apache/commons/math3/optimization/univariate/BrentOptimizerTest.java b/src/test/java/org/apache/commons/math3/optimization/univariate/BrentOptimizerTest.java
index d0d5b0d08..7c590ed5d 100644
--- a/src/test/java/org/apache/commons/math3/optimization/univariate/BrentOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/univariate/BrentOptimizerTest.java
@@ -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.