This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 6a46a8c Add tests.
6a46a8c is described below
commit 6a46a8c4d27fc48dfa8ee814d9ea6d46b73bbb77
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Thu Oct 4 01:27:12 2018 -0400
Add tests.
---
.../apache/sis/geometry/GeneralEnvelopeTest.java | 20 ++-
.../builder/LocalizationGridBuilderTest.java | 2 +-
.../operation/builder/ResidualGridTest.java | 152 +++++++++++++++++++++
.../sis/test/suite/ReferencingTestSuite.java | 1 +
4 files changed, 173 insertions(+), 2 deletions(-)
diff --git
a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
index ca1088d..add8c08 100644
---
a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
@@ -39,7 +39,7 @@ import static
org.apache.sis.geometry.AbstractEnvelopeTest.WGS84;
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Johann Sorel (Geomatys)
- * @version 0.8
+ * @version 1.0
* @since 0.3
* @module
*/
@@ -445,6 +445,24 @@ public strictfp class GeneralEnvelopeTest extends TestCase
{
}
/**
+ * Tests {@link GeneralEnvelope#setEnvelope(Envelope)}.
+ */
+ @Test
+ public void testCopy() {
+ final GeneralEnvelope e = create(2, -4, 3, -3);
+ e.setEnvelope(create(3, -5, -8, 2));
+ assertEnvelopeEquals(e, 3, -5, -8, 2);
+ verifyInvariants(e);
+ /*
+ * Tests with a different implementation, for testing another code
path.
+ * Constructor argument are (x, y, width, height).
+ */
+ e.setEnvelope(new Envelope2D(null, -2, 3, 8, 5));
+ assertEnvelopeEquals(e, -2, 3, 6, 8);
+ verifyInvariants(e);
+ }
+
+ /**
* Tests {@link GeneralEnvelope#setEnvelope(double...)} with valid ranges,
* then with a range which is known to be invalid.
*/
diff --git
a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
index 0134f56..ecba94d 100644
---
a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
* @since 0.8
* @module
*/
-@DependsOn(LinearTransformBuilderTest.class)
+@DependsOn({LinearTransformBuilderTest.class, ResidualGridTest.class})
public final strictfp class LocalizationGridBuilderTest extends
TransformTestCase {
/**
* Creates a builder initialized with control points computed from the
given affine transform.
diff --git
a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
new file mode 100644
index 0000000..b15d4f0
--- /dev/null
+++
b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
@@ -0,0 +1,152 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.referencing.operation.builder;
+
+import org.apache.sis.referencing.operation.matrix.Matrix2;
+import org.opengis.referencing.operation.Matrix;
+import org.opengis.referencing.operation.TransformException;
+import org.apache.sis.referencing.operation.transform.MathTransforms;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.test.TestCase;
+import org.junit.Test;
+
+import static org.opengis.test.Assert.*;
+
+
+/**
+ * Tests {@link ResidualGrid}.
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ * @version 1.0
+ * @since 1.0
+ * @module
+ */
+public final strictfp class ResidualGridTest extends TestCase {
+ /**
+ * The grid to test.
+ */
+ private final ResidualGrid grid;
+
+ /**
+ * Creates a new test case with a 3×4 grid with 2 values in each cells.
+ * Those two values are typically the horizontal components of translation
vectors.
+ * The grid has no "source to grid" or "grid to CRS" transformations.
+ */
+ public ResidualGridTest() {
+ grid = new ResidualGrid(MathTransforms.identity(2),
MathTransforms.identity(2), 3, 4, 2, new double[] {
+ 0,2 , 1,2 , 2,1,
+ 1,3 , 2,2 , 1,1,
+ 0,4 , 2,3 , 3,2,
+ 1,4 , 3,3 , 3,2}, 0.1);
+ }
+
+ /**
+ * Verifies some global properties.
+ */
+ @Test
+ public void verifyGlobalProperties() {
+ assertEquals("translationDimensions", 2,
grid.getTranslationDimensions());
+ assertTrue("coordinateToGrid.isIdentity",
grid.getCoordinateToGrid().isIdentity());
+ assertTrue("gridToTarget.isIdentity",
grid.gridToTarget().isIdentity());
+ }
+
+ /**
+ * Tests {@link ResidualGrid#getCellValue(int, int, int)}.
+ * That method fetches values directly, without interpolations.
+ */
+ @Test
+ public void testGetCellValue() {
+ assertEquals(0, grid.getCellValue(0, 0, 0), STRICT);
+ assertEquals(2, grid.getCellValue(1, 0, 0), STRICT);
+ assertEquals(1, grid.getCellValue(0, 1, 0), STRICT);
+ assertEquals(2, grid.getCellValue(1, 1, 0), STRICT);
+ assertEquals(2, grid.getCellValue(0, 2, 0), STRICT);
+ assertEquals(1, grid.getCellValue(1, 2, 0), STRICT);
+ assertEquals(1, grid.getCellValue(0, 0, 3), STRICT);
+ assertEquals(4, grid.getCellValue(1, 0, 3), STRICT);
+ assertEquals(3, grid.getCellValue(0, 2, 3), STRICT);
+ assertEquals(2, grid.getCellValue(1, 2, 3), STRICT);
+ }
+
+ /**
+ * Tests {@link ResidualGrid#interpolateAt(double...)} without
interpolation.
+ * This test checks the same values than {@link #testGetCellValue()}.
+ *
+ * @throws TransformException if an error occurred while transforming a
coordinate.
+ */
+ @Test
+ @DependsOnMethod("testGetCellValue")
+ public void testInterpolateAtExactLocation() throws TransformException {
+ assertArrayEquals(new double[] {0, 2}, grid.interpolateAt(0, 0),
STRICT);
+ assertArrayEquals(new double[] {1, 2}, grid.interpolateAt(1, 0),
STRICT);
+ assertArrayEquals(new double[] {2, 1}, grid.interpolateAt(2, 0),
STRICT);
+ assertArrayEquals(new double[] {1, 4}, grid.interpolateAt(0, 3),
STRICT);
+ assertArrayEquals(new double[] {3, 2}, grid.interpolateAt(2, 3),
STRICT);
+ }
+
+ /**
+ * Tests {@link ResidualGrid#interpolateAt(double...)} at the median point
between cells.
+ * The result in this special case is equivalent to the average of all 4
surrounding cells.
+ *
+ * @throws TransformException if an error occurred while transforming a
coordinate.
+ */
+ @Test
+ @DependsOnMethod("testInterpolateAtExactLocation")
+ public void testInterpolateAtIntersection() throws TransformException {
+ assertArrayEquals(new double[] {1, 2.25}, grid.interpolateAt(0.5,
0.5), STRICT);
+ assertArrayEquals(new double[] {1.5, 1.5 }, grid.interpolateAt(1.5,
0.5), STRICT);
+ assertArrayEquals(new double[] {1.25, 3 }, grid.interpolateAt(0.5,
1.5), STRICT);
+ assertArrayEquals(new double[] {2, 2 }, grid.interpolateAt(1.5,
1.5), STRICT);
+ assertArrayEquals(new double[] {1.5, 3.5 }, grid.interpolateAt(0.5,
2.5), STRICT);
+ assertArrayEquals(new double[] {2.75, 2.5 }, grid.interpolateAt(1.5,
2.5), STRICT);
+ }
+
+ /**
+ * Tests {@link ResidualGrid#interpolateAt(double...)} at other locations.
+ *
+ * @throws TransformException if an error occurred while transforming a
coordinate.
+ */
+ @Test
+ @DependsOnMethod("testInterpolateAtIntersection")
+ public void testInterpolateAt() throws TransformException {
+ assertArrayEquals(new double[] {0.25, 2 }, grid.interpolateAt(0.25,
0 ), STRICT);
+ assertArrayEquals(new double[] {1.75, 1.25}, grid.interpolateAt(1.75,
0 ), STRICT);
+ assertArrayEquals(new double[] {1.25, 2 }, grid.interpolateAt(1,
0.25), STRICT);
+ assertArrayEquals(new double[] {1.625, 1.25}, grid.interpolateAt(1.75,
0.25), STRICT);
+ }
+
+ /**
+ * Tests {@link ResidualGrid#derivativeInCell(double, double)}.
+ * The Jacobian is computed with those values:
+ *
+ * {@preformat text
+ * (0,4) (2,3)
+ * (1,4) (3,3)
+ * }
+ *
+ * So this mean for example that when moving from 1 cell to the right, the
residual change from (0,4) to (2,3).
+ * Consequently the <var>x</var> position is increased from (2-0) = 2
cells in addition to the move to the right
+ * (so the total increase is 3), and the <var>y</var> position is
increased from (3-4) = -1.
+ */
+ @Test
+ @DependsOnMethod("testGetCellValue")
+ public void testDerivativeInCell() {
+ final Matrix expected = new Matrix2(3, 1, -1, 1);
+ final Matrix actual = grid.derivativeInCell(0.5, 2.5);
+ assertMatrixEquals("derivativeInCell", expected, actual, STRICT);
+ }
+}
diff --git
a/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
b/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
index c63c51e..efbd5ee 100644
---
a/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
@@ -231,6 +231,7 @@ import org.junit.BeforeClass;
org.apache.sis.referencing.operation.CoordinateOperationRegistryTest.class,
org.apache.sis.referencing.operation.CoordinateOperationFinderTest.class,
org.apache.sis.referencing.operation.DefaultCoordinateOperationFactoryTest.class,
+ org.apache.sis.referencing.operation.builder.ResidualGridTest.class,
org.apache.sis.referencing.operation.builder.LinearTransformBuilderTest.class,
org.apache.sis.referencing.operation.builder.LocalizationGridBuilderTest.class,
