commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject svn commit: r1033486 [2/2] - in /commons/proper/math/trunk/src: main/java/org/apache/commons/math/ main/java/org/apache/commons/math/estimation/ main/java/org/apache/commons/math/exception/ main/java/org/apache/commons/math/exception/util/ main/java/or...
Date Wed, 10 Nov 2010 14:23:38 GMT
Modified: commons/proper/math/trunk/src/main/resources/META-INF/localization/LocalizedFormats_fr.properties
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/resources/META-INF/localization/LocalizedFormats_fr.properties?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/resources/META-INF/localization/LocalizedFormats_fr.properties
(original)
+++ commons/proper/math/trunk/src/main/resources/META-INF/localization/LocalizedFormats_fr.properties
Wed Nov 10 14:23:36 2010
@@ -153,6 +153,7 @@ ALPHA = alpha
 BETA = beta
 NOT_POSITIVE_COLUMNDIMENSION = nombre de colonnes invalide : {0} (doit \u00eatre positif)
 NOT_POSITIVE_DEFINITE_MATRIX = matrice non d\u00e9finie positive
+NON_POSITIVE_DEFINITE_MATRIX = matrice non d\u00e9finie positive: l''\u00e9l\u00e9ment diagonal
({0},{0}) est sup\u00e9rieur \u0061 {1}
 NOT_POSITIVE_DEGREES_OF_FREEDOM = les degr\u00e9s de libert\u00e9 doivent \u00eatre positifs
({0})
 DEGREES_OF_FREEDOM = degr\u00e9s de libert\u00e9 ({0})
 NOT_POSITIVE_ELEMENT_AT_INDEX = l''\u00e9l\u00e9ment {0} n''est pas positif : {1}
@@ -189,6 +190,7 @@ NOT_STRICTLY_INCREASING_NUMBER_OF_POINTS
 NOT_STRICTLY_INCREASING_SEQUENCE = les points {3} et {2} ne sont pas strictement croissants
({1} >= {0})
 NOT_SUBTRACTION_COMPATIBLE_MATRICES = les dimensions {0}x{1} et {2}x{3} sont incompatibles
pour la soustraction matricielle
 NOT_SYMMETRIC_MATRIX = matrice non symm\u00e9trique
+NON_SYMMETRIC_MATRIX = matrice non symm\u00e9trique: la diff\u00e9rence entre les \u00e9l\u00e9ments
({0},{1}) et ({1},{0}) est sup\u00e9rieure \u0061 {2}
 NO_BIN_SELECTED = aucun compartiment s\u00e9lectionn\u00e9
 NO_CONVERGENCE_WITH_ANY_START_POINT = aucun des {0} points de d\u00e9part n''aboutit \u00e0
une convergence
 NO_DATA = aucune donn\u00e9e

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/Array2DRowRealMatrixTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/Array2DRowRealMatrixTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/Array2DRowRealMatrixTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/Array2DRowRealMatrixTest.java
Wed Nov 10 14:23:36 2010
@@ -24,6 +24,7 @@ import org.apache.commons.math.exception
 import org.apache.commons.math.exception.OutOfRangeException;
 import org.apache.commons.math.exception.ZeroException;
 import org.apache.commons.math.exception.NumberIsTooSmallException;
+import org.apache.commons.math.exception.NonSquareMatrixException;
 
 /**
  * Test cases for the {@link Array2DRowRealMatrix} class.

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BlockFieldMatrixTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BlockFieldMatrixTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BlockFieldMatrixTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BlockFieldMatrixTest.java
Wed Nov 10 14:23:36 2010
@@ -29,6 +29,7 @@ import org.apache.commons.math.exception
 import org.apache.commons.math.exception.OutOfRangeException;
 import org.apache.commons.math.exception.NumberIsTooSmallException;
 import org.apache.commons.math.exception.NotStrictlyPositiveException;
+import org.apache.commons.math.exception.NonSquareMatrixException;
 
 /**
  * Test cases for the {@link BlockFieldMatrix} class.

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BlockRealMatrixTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BlockRealMatrixTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BlockRealMatrixTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BlockRealMatrixTest.java
Wed Nov 10 14:23:36 2010
@@ -27,6 +27,7 @@ import org.apache.commons.math.exception
 import org.apache.commons.math.exception.OutOfRangeException;
 import org.apache.commons.math.exception.ZeroException;
 import org.apache.commons.math.exception.NumberIsTooSmallException;
+import org.apache.commons.math.exception.NonSquareMatrixException;
 
 /**
  * Test cases for the {@link BlockRealMatrix} class.

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/CholeskyDecompositionImplTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/CholeskyDecompositionImplTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/CholeskyDecompositionImplTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/CholeskyDecompositionImplTest.java
Wed Nov 10 14:23:36 2010
@@ -21,13 +21,9 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertTrue;
 
 import org.apache.commons.math.MathException;
-import org.apache.commons.math.linear.CholeskyDecomposition;
-import org.apache.commons.math.linear.CholeskyDecompositionImpl;
-import org.apache.commons.math.linear.MatrixUtils;
-import org.apache.commons.math.linear.NonSquareMatrixException;
-import org.apache.commons.math.linear.NotPositiveDefiniteMatrixException;
-import org.apache.commons.math.linear.NotSymmetricMatrixException;
-import org.apache.commons.math.linear.RealMatrix;
+import org.apache.commons.math.exception.NonSquareMatrixException;
+import org.apache.commons.math.exception.NonPositiveDefiniteMatrixException;
+import org.apache.commons.math.exception.NonSymmetricMatrixException;
 import org.junit.Test;
 
 public class CholeskyDecompositionImplTest {
@@ -58,7 +54,7 @@ public class CholeskyDecompositionImplTe
     }
 
     /** test non-symmetric matrix */
-    @Test(expected = NotSymmetricMatrixException.class)
+    @Test(expected = NonSymmetricMatrixException.class)
     public void testNotSymmetricMatrixException() throws MathException {
         double[][] changed = testData.clone();
         changed[0][changed[0].length - 1] += 1.0e-5;
@@ -66,7 +62,7 @@ public class CholeskyDecompositionImplTe
     }
 
     /** test non positive definite matrix */
-    @Test(expected = NotPositiveDefiniteMatrixException.class)
+    @Test(expected = NonPositiveDefiniteMatrixException.class)
     public void testNotPositiveDefinite() throws MathException {
         new CholeskyDecompositionImpl(MatrixUtils.createRealMatrix(new double[][] {
                 { 14, 11, 13, 15, 24 },
@@ -77,7 +73,7 @@ public class CholeskyDecompositionImplTe
         }));
     }
 
-    @Test(expected = NotPositiveDefiniteMatrixException.class)
+    @Test(expected = NonPositiveDefiniteMatrixException.class)
     public void testMath274() throws MathException {
         new CholeskyDecompositionImpl(MatrixUtils.createRealMatrix(new double[][] {
                 { 0.40434286, -0.09376327, 0.30328980, 0.04909388 },

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/EigenSolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/EigenSolverTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/EigenSolverTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/EigenSolverTest.java
Wed Nov 10 14:23:36 2010
@@ -19,6 +19,7 @@ package org.apache.commons.math.linear;
 
 import java.util.Random;
 
+import org.apache.commons.math.exception.SingularMatrixException;
 import junit.framework.TestCase;
 
 import org.apache.commons.math.util.MathUtils;
@@ -42,7 +43,7 @@ public class EigenSolverTest extends Tes
         try {
             es.getInverse();
             fail("an exception should have been thrown");
-        } catch (InvalidMatrixException ime) {
+        } catch (SingularMatrixException ime) {
             // expected behavior
         }
     }

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionImplTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionImplTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionImplTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionImplTest.java
Wed Nov 10 14:23:36 2010
@@ -22,6 +22,7 @@ import junit.framework.TestCase;
 import org.apache.commons.math.TestUtils;
 import org.apache.commons.math.fraction.Fraction;
 import org.apache.commons.math.fraction.FractionField;
+import org.apache.commons.math.exception.NonSquareMatrixException;
 
 public class FieldLUDecompositionImplTest extends TestCase {
     private Fraction[][] testData = {
@@ -77,7 +78,7 @@ public class FieldLUDecompositionImplTes
                     { Fraction.ZERO, Fraction.ZERO },
                     { Fraction.ZERO, Fraction.ZERO }
             }));
-        } catch (InvalidMatrixException ime) {
+        } catch (NonSquareMatrixException ime) {
             // expected behavior
         }
     }

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldMatrixImplTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldMatrixImplTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldMatrixImplTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/FieldMatrixImplTest.java
Wed Nov 10 14:23:36 2010
@@ -27,6 +27,7 @@ import org.apache.commons.math.exception
 import org.apache.commons.math.exception.NumberIsTooSmallException;
 import org.apache.commons.math.exception.NotStrictlyPositiveException;
 import org.apache.commons.math.exception.NullArgumentException;
+import org.apache.commons.math.exception.NonSquareMatrixException;
 
 /**
  * Test cases for the {@link Array2DRowFieldMatrix} class.

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/LUDecompositionImplTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/LUDecompositionImplTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/LUDecompositionImplTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/LUDecompositionImplTest.java
Wed Nov 10 14:23:36 2010
@@ -17,6 +17,7 @@
 
 package org.apache.commons.math.linear;
 
+import org.apache.commons.math.exception.NonSquareMatrixException;
 import junit.framework.TestCase;
 
 public class LUDecompositionImplTest extends TestCase {
@@ -73,8 +74,8 @@ public class LUDecompositionImplTest ext
     public void testNonSquare() {
         try {
             new LUDecompositionImpl(MatrixUtils.createRealMatrix(new double[3][2]));
-            fail("Expecting InvalidMatrixException");
-        } catch (InvalidMatrixException ime) {
+            fail("Expecting NonSquareMatrixException");
+        } catch (NonSquareMatrixException ime) {
             // expected behavior
         }
     }

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/LUSolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/LUSolverTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/LUSolverTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/LUSolverTest.java
Wed Nov 10 14:23:36 2010
@@ -17,6 +17,7 @@
 
 package org.apache.commons.math.linear;
 
+import org.apache.commons.math.exception.SingularMatrixException;
 import junit.framework.TestCase;
 
 public class LUSolverTest extends TestCase {
@@ -102,25 +103,25 @@ public class LUSolverTest extends TestCa
         try {
             solver.solve(b);
             fail("an exception should have been thrown");
-        } catch (InvalidMatrixException ime) {
+        } catch (SingularMatrixException ime) {
             // expected behavior
         }
         try {
             solver.solve(b.getColumn(0));
             fail("an exception should have been thrown");
-        } catch (InvalidMatrixException ime) {
+        } catch (SingularMatrixException ime) {
             // expected behavior
         }
         try {
             solver.solve(b.getColumnVector(0));
             fail("an exception should have been thrown");
-        } catch (InvalidMatrixException ime) {
+        } catch (SingularMatrixException ime) {
             // expected behavior
         }
         try {
             solver.solve(new ArrayRealVectorTest.RealVectorTestImpl(b.getColumn(0)));
             fail("an exception should have been thrown");
-        } catch (InvalidMatrixException ime) {
+        } catch (SingularMatrixException ime) {
             // expected behavior
         }
     }

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/QRSolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/QRSolverTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/QRSolverTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/QRSolverTest.java
Wed Nov 10 14:23:36 2010
@@ -19,6 +19,7 @@ package org.apache.commons.math.linear;
 
 import java.util.Random;
 
+import org.apache.commons.math.exception.SingularMatrixException;
 import junit.framework.TestCase;
 
 public class QRSolverTest extends TestCase {
@@ -101,19 +102,19 @@ public class QRSolverTest extends TestCa
         try {
             solver.solve(b);
             fail("an exception should have been thrown");
-        } catch (InvalidMatrixException iae) {
+        } catch (SingularMatrixException iae) {
             // expected behavior
         }
         try {
             solver.solve(b.getColumn(0));
             fail("an exception should have been thrown");
-        } catch (InvalidMatrixException iae) {
+        } catch (SingularMatrixException iae) {
             // expected behavior
         }
         try {
             solver.solve(b.getColumnVector(0));
             fail("an exception should have been thrown");
-        } catch (InvalidMatrixException iae) {
+        } catch (SingularMatrixException iae) {
             // expected behavior
         }
     }

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseFieldMatrixTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseFieldMatrixTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseFieldMatrixTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseFieldMatrixTest.java
Wed Nov 10 14:23:36 2010
@@ -26,6 +26,7 @@ import org.apache.commons.math.exception
 import org.apache.commons.math.exception.OutOfRangeException;
 import org.apache.commons.math.exception.NumberIsTooSmallException;
 import org.apache.commons.math.exception.NullArgumentException;
+import org.apache.commons.math.exception.NonSquareMatrixException;
 
 /**
  * Test cases for the {@link SparseFieldMatrix} class.

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseRealMatrixTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseRealMatrixTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseRealMatrixTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseRealMatrixTest.java
Wed Nov 10 14:23:36 2010
@@ -22,6 +22,7 @@ import org.apache.commons.math.TestUtils
 import org.apache.commons.math.exception.OutOfRangeException;
 import org.apache.commons.math.exception.ZeroException;
 import org.apache.commons.math.exception.NumberIsTooSmallException;
+import org.apache.commons.math.exception.NonSquareMatrixException;
 
 /**
  * Test cases for the {@link OpenMapRealMatrix} class.

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/TriDiagonalTransformerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/TriDiagonalTransformerTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/TriDiagonalTransformerTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/TriDiagonalTransformerTest.java
Wed Nov 10 14:23:36 2010
@@ -20,6 +20,7 @@ package org.apache.commons.math.linear;
 import java.util.Arrays;
 
 import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math.exception.NonSquareMatrixException;
 
 import junit.framework.TestCase;
 
@@ -47,7 +48,7 @@ public class TriDiagonalTransformerTest 
         try {
             new TriDiagonalTransformer(MatrixUtils.createRealMatrix(new double[3][2]));
             fail("an exception should have been thrown");
-        } catch (InvalidMatrixException ime) {
+        } catch (NonSquareMatrixException ime) {
             // expected behavior
         }
     }

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java
Wed Nov 10 14:23:36 2010
@@ -24,6 +24,7 @@ import java.util.Arrays;
 
 import junit.framework.TestCase;
 
+import org.apache.commons.math.exception.SingularMatrixException;
 import org.apache.commons.math.exception.FunctionEvaluationException;
 import org.apache.commons.math.exception.ConvergenceException;
 import org.apache.commons.math.exception.TooManyEvaluationsException;
@@ -278,7 +279,6 @@ extends TestCase {
         } catch (ConvergenceException ee) {
             // expected behavior
         }
-
     }
 
     public void testMoreEstimatedParametersUnsorted() throws Exception {
@@ -362,7 +362,7 @@ extends TestCase {
                                new double[] { 1 },
                                new double[] { 0, 0 });
             fail("an exception should have been thrown");
-        } catch (FunctionEvaluationException oe) {
+        } catch (DimensionMismatchException oe) {
             // expected behavior
         }
 

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java?rev=1033486&r1=1033485&r2=1033486&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java
Wed Nov 10 14:23:36 2010
@@ -25,10 +25,12 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.apache.commons.math.exception.SingularMatrixException;
 import org.apache.commons.math.exception.FunctionEvaluationException;
 import org.apache.commons.math.exception.ConvergenceException;
 import org.apache.commons.math.exception.DimensionMismatchException;
 import org.apache.commons.math.exception.TooManyEvaluationsException;
+import org.apache.commons.math.exception.NumberIsTooSmallException;
 import org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction;
 import org.apache.commons.math.analysis.MultivariateMatrixFunction;
 import org.apache.commons.math.linear.BlockRealMatrix;
@@ -107,7 +109,7 @@ public class LevenbergMarquardtOptimizer
         super(name);
     }
 
-    public void testTrivial() throws FunctionEvaluationException {
+    public void testTrivial() {
         LinearProblem problem =
             new LinearProblem(new double[][] { { 2 } }, new double[] { 3 });
         LevenbergMarquardtOptimizer optimizer = new LevenbergMarquardtOptimizer();
@@ -117,14 +119,14 @@ public class LevenbergMarquardtOptimizer
         try {
             optimizer.guessParametersErrors();
             fail("an exception should have been thrown");
-        } catch (ConvergenceException ee) {
+        } catch (NumberIsTooSmallException ee) {
             // expected behavior
         }
         assertEquals(1.5, optimum.getPoint()[0], 1.0e-10);
         assertEquals(3.0, optimum.getValue()[0], 1.0e-10);
     }
 
-    public void testQRColumnsPermutation() throws FunctionEvaluationException {
+    public void testQRColumnsPermutation() {
 
         LinearProblem problem =
             new LinearProblem(new double[][] { { 1.0, -1.0 }, { 0.0, 2.0 }, { 1.0, -2.0 }
},
@@ -141,7 +143,7 @@ public class LevenbergMarquardtOptimizer
         assertEquals(1.0, optimum.getValue()[2], 1.0e-10);
     }
 
-    public void testNoDependency() throws FunctionEvaluationException {
+    public void testNoDependency() {
         LinearProblem problem = new LinearProblem(new double[][] {
                 { 2, 0, 0, 0, 0, 0 },
                 { 0, 2, 0, 0, 0, 0 },
@@ -160,7 +162,7 @@ public class LevenbergMarquardtOptimizer
         }
     }
 
-    public void testOneSet() throws FunctionEvaluationException {
+    public void testOneSet() {
 
         LinearProblem problem = new LinearProblem(new double[][] {
                 {  1,  0, 0 },
@@ -176,7 +178,7 @@ public class LevenbergMarquardtOptimizer
         assertEquals(3.0, optimum.getPoint()[2], 1.0e-10);
     }
 
-    public void testTwoSets() throws FunctionEvaluationException {
+    public void testTwoSets() {
         double epsilon = 1.0e-7;
         LinearProblem problem = new LinearProblem(new double[][] {
                 {  2,  1,   0,  4,       0, 0 },
@@ -200,7 +202,7 @@ public class LevenbergMarquardtOptimizer
         assertEquals( 1.0 - epsilon, optimum.getPoint()[5], 1.0e-10);
     }
 
-    public void testNonInversible() throws FunctionEvaluationException {
+    public void testNonInvertible() {
 
         LinearProblem problem = new LinearProblem(new double[][] {
                 {  1, 2, -3 },
@@ -214,12 +216,12 @@ public class LevenbergMarquardtOptimizer
         try {
             optimizer.getCovariances();
             fail("an exception should have been thrown");
-        } catch (ConvergenceException ee) {
+        } catch (SingularMatrixException ee) {
             // expected behavior
         }
     }
 
-    public void testIllConditioned() throws FunctionEvaluationException {
+    public void testIllConditioned() {
         LinearProblem problem1 = new LinearProblem(new double[][] {
                 { 10.0, 7.0,  8.0,  7.0 },
                 {  7.0, 5.0,  6.0,  5.0 },
@@ -252,7 +254,7 @@ public class LevenbergMarquardtOptimizer
         assertEquals( 22.0, optimum2.getPoint()[3], 1.0e-8);
     }
 
-    public void testMoreEstimatedParametersSimple() throws FunctionEvaluationException {
+    public void testMoreEstimatedParametersSimple() {
 
         LinearProblem problem = new LinearProblem(new double[][] {
                 { 3.0, 2.0,  0.0, 0.0 },
@@ -266,7 +268,7 @@ public class LevenbergMarquardtOptimizer
         assertEquals(0, optimizer.getRMS(), 1.0e-10);
     }
 
-    public void testMoreEstimatedParametersUnsorted() throws FunctionEvaluationException
{
+    public void testMoreEstimatedParametersUnsorted() {
         LinearProblem problem = new LinearProblem(new double[][] {
                 { 1.0, 1.0,  0.0,  0.0, 0.0,  0.0 },
                 { 0.0, 0.0,  1.0,  1.0, 1.0,  0.0 },
@@ -286,7 +288,7 @@ public class LevenbergMarquardtOptimizer
         assertEquals(6.0, optimum.getPointRef()[5], 1.0e-10);
     }
 
-    public void testRedundantEquations() throws FunctionEvaluationException {
+    public void testRedundantEquations() {
         LinearProblem problem = new LinearProblem(new double[][] {
                 { 1.0,  1.0 },
                 { 1.0, -1.0 },
@@ -302,7 +304,7 @@ public class LevenbergMarquardtOptimizer
         assertEquals(1.0, optimum.getPointRef()[1], 1.0e-10);
     }
 
-    public void testInconsistentEquations() throws FunctionEvaluationException {
+    public void testInconsistentEquations() {
         LinearProblem problem = new LinearProblem(new double[][] {
                 { 1.0,  1.0 },
                 { 1.0, -1.0 },
@@ -314,7 +316,7 @@ public class LevenbergMarquardtOptimizer
         assertTrue(optimizer.getRMS() > 0.1);
     }
 
-    public void testInconsistentSizes() throws FunctionEvaluationException {
+    public void testInconsistentSizes() {
         LinearProblem problem =
             new LinearProblem(new double[][] { { 1, 0 }, { 0, 1 } }, new double[] { -1, 1
});
         LevenbergMarquardtOptimizer optimizer = new LevenbergMarquardtOptimizer();
@@ -339,7 +341,7 @@ public class LevenbergMarquardtOptimizer
                                new double[] { 1 },
                                new double[] { 0, 0 });
             fail("an exception should have been thrown");
-        } catch (FunctionEvaluationException oe) {
+        } catch (DimensionMismatchException oe) {
             // expected behavior
         }
     }
@@ -373,14 +375,14 @@ public class LevenbergMarquardtOptimizer
             optimizer.optimize(problem, new double[] { 0, 0, 0, 0, 0 }, new double[] { 1,
1, 1, 1, 1 },
                                new double[] { 98.680, 47.345 });
             assertTrue(!shouldFail);
-        } catch (FunctionEvaluationException ee) {
+        } catch (DimensionMismatchException ee) {
             assertTrue(shouldFail);
         } catch (TooManyEvaluationsException ee) {
             assertTrue(shouldFail);
         }
     }
 
-    public void testCircleFitting() throws FunctionEvaluationException {
+    public void testCircleFitting() {
         Circle circle = new Circle();
         circle.addPoint( 30.0,  68.0);
         circle.addPoint( 50.0,  -6.0);
@@ -428,7 +430,7 @@ public class LevenbergMarquardtOptimizer
         assertEquals(0.004, errors[1], 0.001);
     }
 
-    public void testCircleFittingBadInit() throws FunctionEvaluationException {
+    public void testCircleFittingBadInit() {
         Circle circle = new Circle();
         double[][] points = new double[][] {
                 {-0.312967,  0.072366}, {-0.339248,  0.132965}, {-0.379780,  0.202724},
@@ -481,7 +483,7 @@ public class LevenbergMarquardtOptimizer
         assertEquals( 0.2075001, center.y,      1.0e-6);
     }
 
-    public void testMath199() throws FunctionEvaluationException {
+    public void testMath199() {
         try {
             QuadraticProblem problem = new QuadraticProblem();
             problem.addPoint (0, -3.182591015485607);



Mime
View raw message