Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java?rev=1713510&r1=1713509&r2=1713510&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java [UTF-8] Mon Nov 9 18:55:56 2015 @@ -41,16 +41,16 @@ import static java.lang.Math.*; // N * * In our measurements, both the iterative process (USGS) and the series expansion (EPSG) have the * same accuracy when applied on the WGS84 ellipsoid. However the EPSG formula is 2 times faster. - * On the other hand, accuracy of the EPSG formula decreases when we increase the excentricity, + * On the other hand, accuracy of the EPSG formula decreases when we increase the eccentricity, * while the iterative process keeps its accuracy (at the cost of more iterations). - * For the Earth (excentricity of about 0.082) the errors are less than 0.01 millimetres. + * For the Earth (eccentricity of about 0.082) the errors are less than 0.01 millimetres. * But the errors become centimetric (for a hypothetical planet of the size of the Earth) - * before excentricity 0.2 and increase quickly after excentricity 0.3. + * before eccentricity 0.2 and increase quickly after eccentricity 0.3. * * <p>For the WGS84 ellipsoid and the iteration tolerance given by the {@link NormalizedProjection#ITERATION_TOLERANCE} * constant (currently about 0.25 cm on Earth), the two methods have equivalent precision. Computing φ values for * millions of random numbers and verifying which method is the most accurate give fifty-fifty results: each method - * win in about 50% of cases. But as we increase the excentricity, the iterative method wins more often.</p> + * win in about 50% of cases. But as we increase the eccentricity, the iterative method wins more often.</p> * * @author Martin Desruisseaux (Geomatys) * @since 0.6 @@ -65,9 +65,9 @@ public final class MercatorMethodCompari private static final PrintStream out = System.out; /** - * Ellipsoid excentricity. Value 0 means that the ellipsoid is spherical. + * Ellipsoid eccentricity. Value 0 means that the ellipsoid is spherical. */ - private final double excentricity; + private final double eccentricity; /** * Coefficients used in the series expansion. @@ -76,34 +76,34 @@ public final class MercatorMethodCompari /** * Creates a new instance for the excentricty of the WGS84 ellipsoid, which is approximatively 0.08181919084262157. - * Reminder: the excentricity of a sphere is 0. + * Reminder: the eccentricity of a sphere is 0. */ public MercatorMethodComparison() { - this(0.00669437999014133); // Squared excentricity. + this(0.00669437999014133); // Squared eccentricity. } /** - * Creates a new instance for the same excentricity than the given projection. + * Creates a new instance for the same eccentricity than the given projection. * - * @param projection the projection from which to take the excentricity. + * @param projection the projection from which to take the eccentricity. */ public MercatorMethodComparison(final NormalizedProjection projection) { - this(projection.excentricitySquared); + this(projection.eccentricitySquared); } /** - * Creates a new instance for the given squared excentricity. + * Creates a new instance for the given squared eccentricity. * - * @param e2 the square of the excentricity. + * @param e2 the square of the eccentricity. */ public MercatorMethodComparison(final double e2) { - excentricity = sqrt(e2); + eccentricity = sqrt(e2); final double e4 = e2 * e2; final double e6 = e2 * e4; final double e8 = e4 * e4; /* * For each line below, add the smallest values first in order to reduce rounding errors. - * The smallest values are the one using the excentricity raised to the highest power. + * The smallest values are the one using the eccentricity raised to the highest power. */ c2χ = 13/ 360.* e8 + 1/ 12.* e6 + 5/24.* e4 + e2/2; c4χ = 811/ 11520.* e8 + 29/240.* e6 + 7/48.* e4; @@ -159,10 +159,10 @@ public final class MercatorMethodCompari * @throws ProjectionException if the iteration does not converge. */ public double byIterativeMethod(final double t) throws ProjectionException { - final double hℯ = 0.5 * excentricity; + final double hℯ = 0.5 * eccentricity; double φ = (PI/2) - 2*atan(t); // Snyder (7-11) for (int it=0; it < NormalizedProjection.MAXIMUM_ITERATIONS; it++) { // Iteratively solve equation (7-9) from Snyder - final double ℯsinφ = excentricity * sin(φ); + final double ℯsinφ = eccentricity * sin(φ); final double Δφ = φ - (φ = PI/2 - 2*atan(t * pow((1 - ℯsinφ)/(1 + ℯsinφ), hℯ))); if (abs(Δφ) <= NormalizedProjection.ITERATION_TOLERANCE) { return φ; @@ -178,8 +178,8 @@ public final class MercatorMethodCompari * Basically a copy of {@link ConformalProjection#expOfNorthing(double, double)}. */ final double expOfNorthing(final double φ) { - final double ℯsinφ = excentricity * sin(φ); - return tan(PI/4 + 0.5*φ) * pow((1 - ℯsinφ) / (1 + ℯsinφ), 0.5*excentricity); + final double ℯsinφ = eccentricity * sin(φ); + return tan(PI/4 + 0.5*φ) * pow((1 - ℯsinφ) / (1 + ℯsinφ), 0.5*eccentricity); } /** @@ -221,13 +221,13 @@ public final class MercatorMethodCompari } } /* - * At this point we finished to collect the statistics for the excentricity of this particular + * At this point we finished to collect the statistics for the eccentricity of this particular * MercatorMethodComparison instance. If this method call is only part of a longer calculation * for various excentricty values, print a summary in a single line. * Otherwise print more verbose results. */ if (summarize != null) { - summarize.append(String.valueOf(excentricity)); summarize.nextColumn(); + summarize.append(String.valueOf(eccentricity)); summarize.nextColumn(); summarize.append(String.valueOf(iterativeMethodErrors.mean())); summarize.nextColumn(); summarize.append(String.valueOf(iterativeMethodErrors.maximum())); summarize.nextColumn(); summarize.append(String.valueOf(seriesExpansionErrors.mean())); summarize.nextColumn(); @@ -242,7 +242,7 @@ public final class MercatorMethodCompari if (projection == null) { stats = ArraysExt.remove(stats, 2, 1); } - out.println("Comparison of different ways to compute φ for excentricity " + excentricity + '.'); + out.println("Comparison of different ways to compute φ for eccentricity " + eccentricity + '.'); out.println("Values are in units of " + NormalizedProjection.ITERATION_TOLERANCE + " radians (about " + round(toDegrees(NormalizedProjection.ITERATION_TOLERANCE) * 60 * ReferencingServices.NAUTICAL_MILE * 1000) + " mm on Earth)."); @@ -258,21 +258,21 @@ public final class MercatorMethodCompari } /** - * Prints the error of the two methods for various excentricity values. - * The intend of this method is to find an excentricity threshold value where we consider the errors too high. + * Prints the error of the two methods for various eccentricity values. + * The intend of this method is to find an eccentricity threshold value where we consider the errors too high. * - * <p>This method is used for determining empirically a value for {@link ConformalProjection#EXCENTRICITY_THRESHOLD}. + * <p>This method is used for determining empirically a value for {@link ConformalProjection#ECCENTRICITY_THRESHOLD}. * The current threshold value is shown by inserting a horizontal line separator in the table when that threshold * is crossed.</p> * - * @param min The first excentricity value to test. - * @param max The maximal excentricity value to test. + * @param min The first eccentricity value to test. + * @param max The maximal eccentricity value to test. * @throws ProjectionException if an error occurred in {@link #φ(double)}. */ public static void printErrorForExcentricities(final double min, final double max) throws ProjectionException { final TableAppender table = new TableAppender(out); table.appendHorizontalSeparator(); - table.append("Excentricity"); table.nextColumn(); + table.append("Eccentricity"); table.nextColumn(); table.append("Mean iterative error"); table.nextColumn(); table.append("Maximal iterative error"); table.nextColumn(); table.append("Mean series error"); table.nextColumn(); @@ -280,13 +280,13 @@ public final class MercatorMethodCompari table.appendHorizontalSeparator(); boolean crossThreshold = false; final double step = 0.01; - double excentricity; - for (int i=0; (excentricity = min + step*i) < max; i++) { - if (!crossThreshold && excentricity >= ConformalProjection.EXCENTRICITY_THRESHOLD) { + double eccentricity; + for (int i=0; (eccentricity = min + step*i) < max; i++) { + if (!crossThreshold && eccentricity >= ConformalProjection.ECCENTRICITY_THRESHOLD) { crossThreshold = true; table.appendHorizontalSeparator(); } - final MercatorMethodComparison alt = new MercatorMethodComparison(excentricity * excentricity); + final MercatorMethodComparison alt = new MercatorMethodComparison(eccentricity * eccentricity); alt.compare(null, 10000, table); } table.appendHorizontalSeparator(); @@ -339,7 +339,7 @@ public final class MercatorMethodCompari * @throws InterruptedException if the thread has been interrupted between two benchmarks. */ public static void main(String[] args) throws ProjectionException, InterruptedException { - out.println("Comparison of the errors of series expension and iterative method for various excentricity values."); + out.println("Comparison of the errors of series expension and iterative method for various eccentricity values."); printErrorForExcentricities(0.08, 0.3); out.println(); @@ -351,7 +351,7 @@ public final class MercatorMethodCompari c.compare(projection, 10000, null); out.println(); - out.println("Comparison of the errors for the WGS84 excentricity."); + out.println("Comparison of the errors for the WGS84 eccentricity."); out.println("The 'ConformalProjection' errors should be the same than the series expansion errors:"); out.println(); projection = new NoOp(true); @@ -359,7 +359,7 @@ public final class MercatorMethodCompari c.compare(projection, 1000000, null); out.println(); - out.println("Comparison of the errors for the excentricity of an imaginary ellipsoid."); + out.println("Comparison of the errors for the eccentricity of an imaginary ellipsoid."); out.println("The 'ConformalProjection' errors should be the close to the iterative method errors:"); out.println(); projection = new NoOp(100, 95);
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java?rev=1713510&r1=1713509&r2=1713510&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java [UTF-8] Mon Nov 9 18:55:56 2015 @@ -66,7 +66,7 @@ public final strictfp class MercatorTest /** * Tests the WKT formatting of {@link NormalizedProjection}. For the Mercator projection, we expect only - * the ellipsoid excentricity. We expect nothing else because all other parameters are used + * the ellipsoid eccentricity. We expect nothing else because all other parameters are used * by the (de)normalization affine transforms instead than the {@link Mercator} class itself. * * @see LambertConicConformalTest#testNormalizedWKT() @@ -76,7 +76,7 @@ public final strictfp class MercatorTest createNormalizedProjection(true); assertWktEquals( "PARAM_MT[“Mercator”,\n" + - " PARAMETER[“excentricity”, 0.0818191908426215]]"); + " PARAMETER[“eccentricity”, 0.0818191908426215]]"); } /** Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java?rev=1713510&r1=1713509&r2=1713510&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java [UTF-8] Mon Nov 9 18:55:56 2015 @@ -59,13 +59,13 @@ public final strictfp class NormalizedPr } /** - * Tests the {@link NormalizedProjection#excentricity} value. + * Tests the {@link NormalizedProjection#eccentricity} value. */ @Test - public void testExcentricity() { + public void testEccentricity() { NormalizedProjection projection; transform = projection = new NoOp(false); - assertEquals("excentricity", 0.0, projection.excentricity, 0.0); + assertEquals("eccentricity", 0.0, projection.eccentricity, 0.0); /* * Tested methods. Note the similarity between (1) and (3). * @@ -74,9 +74,9 @@ public final strictfp class NormalizedPr * (3) Using double-double arithmetic and flattening: 0.0818191908426215 */ transform = projection = new NoOp(true, false); - assertEquals("excentricity", 0.08181919084262244, projection.excentricity, 0.0); + assertEquals("eccentricity", 0.08181919084262244, projection.eccentricity, 0.0); transform = projection = new NoOp(true, true); - assertEquals("excentricity", 0.0818191908426215, projection.excentricity, 0.0); + assertEquals("eccentricity", 0.0818191908426215, projection.eccentricity, 0.0); } } Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java?rev=1713510&r1=1713509&r2=1713510&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java [UTF-8] Mon Nov 9 18:55:56 2015 @@ -93,8 +93,8 @@ public final strictfp class ObliqueStere /* After kernel */ R = 6382644.571, // Radius of conformal sphere (m) a = 6377397.155, // Semi-major axis length (m) ivf = 299.15281, // Inverse flattening factor - e = 0.08169683, // Excentricity - /* Before kernel */ n = 1.000475857, // Coefficient computed from excentricity and φ₀. + e = 0.08169683, // Eccentricity + /* Before kernel */ n = 1.000475857, // Coefficient computed from eccentricity and φ₀. /* After kernel */ k0 = 0.9999079, // Scale factor /* After kernel */ FE = 155000.00, // False Easting (m) /* After kernel */ FN = 463000.00; // False Northing (m) Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ProjectionResultComparator.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ProjectionResultComparator.java?rev=1713510&r1=1713509&r2=1713510&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ProjectionResultComparator.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ProjectionResultComparator.java [UTF-8] Mon Nov 9 18:55:56 2015 @@ -105,7 +105,7 @@ final strictfp class ProjectionResultCom final Class<?> sphericalClass = spherical.getClass(); final Class<?> ellipticalClass = sphericalClass.getSuperclass(); assertEquals("Class name for the spherical formulas.", "Spherical", sphericalClass.getSimpleName()); - assertEquals("Excentricity of spherical case.", 0, spherical.excentricity, 0); + assertEquals("Eccentricity of spherical case.", 0, spherical.eccentricity, 0); assertSame("In SIS implementation, the spherical cases are defined as inner classes named “Spherical”" + " which extend their enclosing class. This is only a convention, which we verify here. But" + " there is nothing wrong if a future version choose to not follow this convention anymore.", Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidalToCartesianTransformTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidalToCartesianTransformTest.java?rev=1713510&r1=1713509&r2=1713510&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidalToCartesianTransformTest.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidalToCartesianTransformTest.java [UTF-8] Mon Nov 9 18:55:56 2015 @@ -128,7 +128,7 @@ public final strictfp class EllipsoidalT } /** - * Tests conversion of a point on an imaginary planet with high excentricity. + * Tests conversion of a point on an imaginary planet with high eccentricity. * The {@link EllipsoidalToCartesianTransform} may need to use an iterative method * for reaching the expected precision. * @@ -136,7 +136,7 @@ public final strictfp class EllipsoidalT * @throws TransformException if conversion of the sample point failed. */ @Test - public void testHighExcentricity() throws FactoryException, TransformException, FactoryException { + public void testHighEccentricity() throws FactoryException, TransformException, FactoryException { transform = EllipsoidalToCartesianTransform.createGeodeticConversion( DefaultFactories.forBuildin(MathTransformFactory.class), 6000000, 4000000, SI.METRE, true); @@ -264,7 +264,7 @@ public final strictfp class EllipsoidalT " Parameter[“elt_1_1”, 0.017453292519943295],\n" + " Parameter[“elt_2_2”, 1.567855942887398E-7]],\n" + " Param_MT[“Ellipsoidal to Cartesian”,\n" + - " Parameter[“excentricity”, 0.08181919084262157],\n" + + " Parameter[“eccentricity”, 0.08181919084262157],\n" + " Parameter[“dim”, 3]],\n" + " Param_MT[“Affine”,\n" + " Parameter[“num_row”, 4],\n" + @@ -282,7 +282,7 @@ public final strictfp class EllipsoidalT " Parameter[“elt_1_1”, 1.567855942887398E-7],\n" + " Parameter[“elt_2_2”, 1.567855942887398E-7]],\n" + " Param_MT[“Cartesian to ellipsoidal”,\n" + - " Parameter[“excentricity”, 0.08181919084262157],\n" + + " Parameter[“eccentricity”, 0.08181919084262157],\n" + " Parameter[“dim”, 3]],\n" + " Param_MT[“Affine”,\n" + " Parameter[“num_row”, 4],\n" + Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java?rev=1713510&r1=1713509&r2=1713510&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java [UTF-8] Mon Nov 9 18:55:56 2015 @@ -307,7 +307,7 @@ public final strictfp class MolodenskyTr " Parameter[“Semi-major axis length difference”, 251.0, Unit[“metre”, 1, Id[“EPSG”, 9001]]],\n" + " Parameter[“Flattening difference”, 1.4192702255886284E-5, Unit[“unity”, 1, Id[“EPSG”, 9201]]],\n" + " Parameter[“src_semi_major”, 6378137.0, Unit[“metre”, 1, Id[“EPSG”, 9001]]],\n" + - " Parameter[“excentricity”, 0.0818191908426215],\n" + + " Parameter[“eccentricity”, 0.0818191908426215],\n" + " Parameter[“abridged”, TRUE],\n" + " Parameter[“dim”, 3]],\n" + " Param_MT[“Affine”,\n" + Modified: sis/branches/JDK8/ide-project/NetBeans/nbproject/project.xml URL: http://svn.apache.org/viewvc/sis/branches/JDK8/ide-project/NetBeans/nbproject/project.xml?rev=1713510&r1=1713509&r2=1713510&view=diff ============================================================================== --- sis/branches/JDK8/ide-project/NetBeans/nbproject/project.xml (original) +++ sis/branches/JDK8/ide-project/NetBeans/nbproject/project.xml Mon Nov 9 18:55:56 2015 @@ -66,7 +66,6 @@ <word>deserialization</word> <word>deserialized</word> <word>endianness</word> - <word>excentricity</word> <word>geoidal</word> <word>hectopascals</word> <word>initially</word>
