svn commit: r1245807 - in /commons/proper/math/trunk/src: main/java/org/apache/commons/math3/optimization/direct/CMAESOptimizer.java test/java/org/apache/commons/math3/optimization/direct/CMAESOptimizerTest.java

[erans]

Author: erans
Date: Fri Feb 17 23:25:58 2012
New Revision: 1245807

URL: http://svn.apache.org/viewvc?rev=1245807&view=rev
Log:
Fixed exception type.

Modified:
    
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/CMAESOptimizer.java
    
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optimization/direct/CMAESOptimizerTest.java

Modified: 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/CMAESOptimizer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/CMAESOptimizer.java?rev=1245807&r1=1245806&r2=1245807&view=diff
==============================================================================
--- 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/CMAESOptimizer.java
 (original)
+++ 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/direct/CMAESOptimizer.java
 Fri Feb 17 23:25:58 2012
@@ -22,7 +22,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.math3.analysis.MultivariateFunction;
-import org.apache.commons.math3.exception.MultiDimensionMismatchException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
 import org.apache.commons.math3.exception.NoDataException;
 import org.apache.commons.math3.exception.NotPositiveException;
 import org.apache.commons.math3.exception.OutOfRangeException;
@@ -509,22 +509,16 @@ public class CMAESOptimizer
         double[] init = getStartPoint();
         if (boundaries != null) {
             if (boundaries.length != 2) {
-                throw new MultiDimensionMismatchException(
-                        new Integer[] { boundaries.length },
-                        new Integer[] { 2 });
+                throw new DimensionMismatchException(boundaries.length, 2);
             }
             if (boundaries[0] == null || boundaries[1] == null) {
                 throw new NoDataException();
             }
             if (boundaries[0].length != init.length) {
-                throw new MultiDimensionMismatchException(
-                        new Integer[] { boundaries[0].length },
-                        new Integer[] { init.length });
+                throw new DimensionMismatchException(boundaries[0].length, 
init.length);
             }
             if (boundaries[1].length != init.length) {
-                throw new MultiDimensionMismatchException(
-                        new Integer[] { boundaries[1].length },
-                        new Integer[] { init.length });
+                throw new DimensionMismatchException(boundaries[1].length, 
init.length);
             }
             for (int i = 0; i < init.length; i++) {
                 if (boundaries[0][i] > init[i] || boundaries[1][i] < init[i]) {
@@ -535,9 +529,7 @@ public class CMAESOptimizer
         }
         if (inputSigma != null) {
             if (inputSigma.length != init.length) {
-                throw new MultiDimensionMismatchException(
-                        new Integer[] { inputSigma.length },
-                        new Integer[] { init.length });
+                throw new DimensionMismatchException(inputSigma.length, 
init.length);
             }
             for (int i = 0; i < init.length; i++) {
                 if (inputSigma[i] < 0) {

Modified: 
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optimization/direct/CMAESOptimizerTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optimization/direct/CMAESOptimizerTest.java?rev=1245807&r1=1245806&r2=1245807&view=diff
==============================================================================
--- 
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optimization/direct/CMAESOptimizerTest.java
 (original)
+++ 
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optimization/direct/CMAESOptimizerTest.java
 Fri Feb 17 23:25:58 2012
@@ -22,7 +22,7 @@ import java.util.Random;
 import org.apache.commons.math3.Retry;
 import org.apache.commons.math3.RetryRunner;
 import org.apache.commons.math3.analysis.MultivariateFunction;
-import org.apache.commons.math3.exception.MultiDimensionMismatchException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
 import org.apache.commons.math3.exception.NoDataException;
 import org.apache.commons.math3.exception.NotPositiveException;
 import org.apache.commons.math3.exception.OutOfRangeException;
@@ -55,7 +55,7 @@ public class CMAESOptimizerTest {
                 1e-13, 1e-6, 100000, expected);
     }
     
-    @Test(expected = MultiDimensionMismatchException.class)
+    @Test(expected = DimensionMismatchException.class)
     public void testBoundariesDimensionMismatch() {
         double[] startPoint = point(DIM,0.5);
         double[] insigma = null;
@@ -104,7 +104,7 @@ public class CMAESOptimizerTest {
                 1e-13, 1e-6, 100000, expected);
     }
 
-    @Test(expected = MultiDimensionMismatchException.class)
+    @Test(expected = DimensionMismatchException.class)
     public void testInputSigmaDimensionMismatch() {
         double[] startPoint = point(DIM,0.5);
         double[] insigma = point(DIM+1,-0.5);