You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/07/19 01:41:03 UTC
svn commit: r1504723 - in
/commons/proper/math/trunk/src/test/java/org/apache/commons/math3: ./
analysis/integration/gauss/ complex/ distribution/ genetics/ util/
Author: sebb
Date: Thu Jul 18 23:41:02 2013
New Revision: 1504723
URL: http://svn.apache.org/r1504723
Log:
Boxing OK here
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/PerfTestUtils.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/HermiteParametricTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/LegendreHighPrecisionParametricTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/LegendreParametricTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/complex/RootsOfUnityTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/distribution/BetaDistributionTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/distribution/MultivariateNormalMixtureModelDistributionTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/genetics/RandomKeyTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/genetics/UniformCrossoverTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/MultidimensionalCounterTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/OpenIntToDoubleHashMapTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/PairTest.java
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/PerfTestUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/PerfTestUtils.java?rev=1504723&r1=1504722&r2=1504723&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/PerfTestUtils.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/PerfTestUtils.java Thu Jul 18 23:41:02 2013
@@ -115,7 +115,7 @@ public class PerfTestUtils {
// Timed block.
final long start = System.nanoTime();
for (int i = 0; i < repeatChunk; i++) {
- result[i] = r.call();
+ result[i] = r.call().doubleValue();
}
final long stop = System.nanoTime();
@@ -158,6 +158,7 @@ public class PerfTestUtils {
* {@code call} method (i.e. the time taken by each timed block divided
* by {@code repeatChunk}).
*/
+ @SuppressWarnings("boxing")
public static StatisticalSummary[] timeAndReport(String title,
int repeatChunk,
int repeatStat,
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/HermiteParametricTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/HermiteParametricTest.java?rev=1504723&r1=1504722&r2=1504723&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/HermiteParametricTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/HermiteParametricTest.java Thu Jul 18 23:41:02 2013
@@ -68,6 +68,7 @@ public class HermiteParametricTest exten
*
* @return the collection of parameters for this parameterized test.
*/
+ @SuppressWarnings("boxing") // OK here
@Parameters
public static Collection<Object[]> getParameters() {
final ArrayList<Object[]> parameters = new ArrayList<Object[]>();
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/LegendreHighPrecisionParametricTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/LegendreHighPrecisionParametricTest.java?rev=1504723&r1=1504722&r2=1504723&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/LegendreHighPrecisionParametricTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/LegendreHighPrecisionParametricTest.java Thu Jul 18 23:41:02 2013
@@ -66,6 +66,7 @@ public class LegendreHighPrecisionParame
*
* @return the collection of parameters for this parameterized test.
*/
+ @SuppressWarnings("boxing") // OK here
@Parameters
public static Collection<Object[]> getParameters() {
final ArrayList<Object[]> parameters = new ArrayList<Object[]>();
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/LegendreParametricTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/LegendreParametricTest.java?rev=1504723&r1=1504722&r2=1504723&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/LegendreParametricTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/LegendreParametricTest.java Thu Jul 18 23:41:02 2013
@@ -66,6 +66,7 @@ public class LegendreParametricTest exte
*
* @return the collection of parameters for this parameterized test.
*/
+ @SuppressWarnings("boxing") // OK here
@Parameters
public static Collection<Object[]> getParameters() {
final ArrayList<Object[]> parameters = new ArrayList<Object[]>();
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/complex/RootsOfUnityTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/complex/RootsOfUnityTest.java?rev=1504723&r1=1504722&r2=1504723&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/complex/RootsOfUnityTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/complex/RootsOfUnityTest.java Thu Jul 18 23:41:02 2013
@@ -93,6 +93,7 @@ public class RootsOfUnityTest {
final double tol = 10 * Math.ulp(1.0);
for (int k = 0; k < n; k++) {
final double t = 2.0 * FastMath.PI * k / n;
+ @SuppressWarnings("boxing")
final String msg = String.format("n = %d, k = %d", n, k);
Assert.assertEquals(msg, FastMath.cos(t), roots.getReal(k), tol);
Assert.assertEquals(msg, FastMath.sin(t), roots.getImaginary(k), tol);
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/distribution/BetaDistributionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/distribution/BetaDistributionTest.java?rev=1504723&r1=1504722&r2=1504723&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/distribution/BetaDistributionTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/distribution/BetaDistributionTest.java Thu Jul 18 23:41:02 2013
@@ -282,6 +282,7 @@ public class BetaDistributionTest {
}
+ @SuppressWarnings("boxing")
private void checkDensity(double alpha, double beta, double[] x, double[] expected) {
BetaDistribution d = new BetaDistribution(alpha, beta);
for (int i = 0; i < x.length; i++) {
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/distribution/MultivariateNormalMixtureModelDistributionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/distribution/MultivariateNormalMixtureModelDistributionTest.java?rev=1504723&r1=1504722&r2=1504723&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/distribution/MultivariateNormalMixtureModelDistributionTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/distribution/MultivariateNormalMixtureModelDistributionTest.java Thu Jul 18 23:41:02 2013
@@ -45,8 +45,8 @@ public class MultivariateNormalMixtureMo
final List<Pair<Double, MultivariateNormalDistribution>> comp = d.getComponents();
- Assert.assertEquals(1d / 3, comp.get(0).getFirst(), Math.ulp(1d));
- Assert.assertEquals(2d / 3, comp.get(1).getFirst(), Math.ulp(1d));
+ Assert.assertEquals(1d / 3, comp.get(0).getFirst().doubleValue(), Math.ulp(1d));
+ Assert.assertEquals(2d / 3, comp.get(1).getFirst().doubleValue(), Math.ulp(1d));
}
@Test(expected=MathArithmeticException.class)
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/genetics/RandomKeyTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/genetics/RandomKeyTest.java?rev=1504723&r1=1504722&r2=1504723&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/genetics/RandomKeyTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/genetics/RandomKeyTest.java Thu Jul 18 23:41:02 2013
@@ -24,6 +24,7 @@ import java.util.List;
import org.junit.Assert;
import org.junit.Test;
+@SuppressWarnings("boxing")
public class RandomKeyTest {
@Test(expected=IllegalArgumentException.class)
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/genetics/UniformCrossoverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/genetics/UniformCrossoverTest.java?rev=1504723&r1=1504722&r2=1504723&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/genetics/UniformCrossoverTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/genetics/UniformCrossoverTest.java Thu Jul 18 23:41:02 2013
@@ -32,6 +32,7 @@ public class UniformCrossoverTest {
private static final List<Integer> p1 = new ArrayList<Integer>(LEN);
private static final List<Integer> p2 = new ArrayList<Integer>(LEN);
+ @SuppressWarnings("boxing")
@BeforeClass
public static void setUpBeforeClass() {
for (int i = 0; i < LEN; i++) {
@@ -83,8 +84,8 @@ public class UniformCrossoverTest {
}
}
- Assert.assertEquals(1.0 - ratio, Double.valueOf((double) from1 / LEN), 0.1);
- Assert.assertEquals(ratio, Double.valueOf((double) from2 / LEN), 0.1);
+ Assert.assertEquals(1.0 - ratio, (double) from1 / LEN, 0.1);
+ Assert.assertEquals(ratio, (double) from2 / LEN, 0.1);
from1 = 0;
from2 = 0;
@@ -98,14 +99,16 @@ public class UniformCrossoverTest {
}
}
- Assert.assertEquals(ratio, Double.valueOf((double) from1 / LEN), 0.1);
- Assert.assertEquals(1.0 - ratio, Double.valueOf((double) from2 / LEN), 0.1);
+ Assert.assertEquals(ratio, (double) from1 / LEN, 0.1);
+ Assert.assertEquals(1.0 - ratio, (double) from2 / LEN, 0.1);
}
}
@Test(expected = DimensionMismatchException.class)
public void testCrossoverDimensionMismatchException(){
+ @SuppressWarnings("boxing")
final Integer[] p1 = new Integer[] {1,0,1,0,0,1,0,1,1};
+ @SuppressWarnings("boxing")
final Integer[] p2 = new Integer[] {0,1,1,0,1};
final BinaryChromosome p1c = new DummyBinaryChromosome(p1);
@@ -117,6 +120,7 @@ public class UniformCrossoverTest {
@Test(expected = MathIllegalArgumentException.class)
public void testCrossoverInvalidFixedLengthChromosomeFirst() {
+ @SuppressWarnings("boxing")
final Integer[] p1 = new Integer[] {1,0,1,0,0,1,0,1,1};
final BinaryChromosome p1c = new DummyBinaryChromosome(p1);
final Chromosome p2c = new Chromosome() {
@@ -132,6 +136,7 @@ public class UniformCrossoverTest {
@Test(expected = MathIllegalArgumentException.class)
public void testCrossoverInvalidFixedLengthChromosomeSecond() {
+ @SuppressWarnings("boxing")
final Integer[] p1 = new Integer[] {1,0,1,0,0,1,0,1,1};
final BinaryChromosome p2c = new DummyBinaryChromosome(p1);
final Chromosome p1c = new Chromosome() {
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/MultidimensionalCounterTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/MultidimensionalCounterTest.java?rev=1504723&r1=1504722&r2=1504723&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/MultidimensionalCounterTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/MultidimensionalCounterTest.java Thu Jul 18 23:41:02 2013
@@ -156,7 +156,7 @@ public class MultidimensionalCounterTest
if (!iter.hasNext()) {
Assert.fail("Too short");
}
- final int uniDimIndex = iter.next();
+ final int uniDimIndex = iter.next().intValue();
Assert.assertEquals("Wrong iteration at " + i, i, uniDimIndex);
for (int dimIndex = 0; dimIndex < nDim; dimIndex++) {
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/OpenIntToDoubleHashMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/OpenIntToDoubleHashMapTest.java?rev=1504723&r1=1504722&r2=1504723&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/OpenIntToDoubleHashMapTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/OpenIntToDoubleHashMapTest.java Thu Jul 18 23:41:02 2013
@@ -32,6 +32,7 @@ import org.junit.Test;
/**
* Test cases for the {@link OpenIntToDoubleHashMap}.
*/
+@SuppressWarnings("boxing")
public class OpenIntToDoubleHashMapTest {
private Map<Integer, Double> javaMap = new HashMap<Integer, Double>();
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/PairTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/PairTest.java?rev=1504723&r1=1504722&r2=1504723&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/PairTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/PairTest.java Thu Jul 18 23:41:02 2013
@@ -26,7 +26,7 @@ public class PairTest {
final Pair<Integer, Double> p
= new Pair<Integer, Double>(new Integer(1), new Double(2));
Assert.assertEquals(new Integer(1), p.getKey());
- Assert.assertEquals(new Double(2), p.getValue(), Math.ulp(1d));
+ Assert.assertEquals(2, p.getValue().doubleValue(), Math.ulp(1d));
}
@Test