Author: desruisseaux
Date: Mon Oct 5 15:52:54 2015
New Revision: 1706863
URL: http://svn.apache.org/viewvc?rev=1706863&view=rev
Log:
Documentation and variable name fixes (no significant code change in this commit).
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java?rev=1706863&r1=1706862&r2=1706863&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
[UTF-8] Mon Oct 5 15:52:54 2015
@@ -206,13 +206,13 @@ abstract class ConformalProjection exten
* Same formula than above, be rewriten using trigonometric identities in order
to have only two
* calls to Math.sin/cos instead than 5. The performance gain is twice faster
on some machines.
*/
- final double sin2χ = sin(2*φ);
- final double sin_cos2χ = cos(2*φ) * sin2χ;
- final double sin_sin2χ = sin2χ * sin2χ;
- φ += c8χ * (0.50 - sin_sin2χ)*sin_cos2χ // ÷8 compared to original formula
- + c6χ * (0.75 - sin_sin2χ)*sin2χ // ÷4 compared to original formula
- + c4χ * ( sin_cos2χ) // ÷2 compared to original formula
- + c2χ * sin2χ;
+ final double sin2φ = sin(2*φ);
+ final double sin_cos2φ = cos(2*φ) * sin2φ;
+ final double sin_sin2φ = sin2φ * sin2φ;
+ φ += c8χ * (0.50 - sin_sin2φ)*sin_cos2φ // ÷8 compared to original formula
+ + c6χ * (0.75 - sin_sin2φ)*sin2φ // ÷4 compared to original formula
+ + c4χ * ( sin_cos2φ) // ÷2 compared to original formula
+ + c2χ * sin2φ;
}
/*
* Note: a previous version checked if the value of the smallest term c8χ⋅sin(8φ)
was smaller than
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java?rev=1706863&r1=1706862&r2=1706863&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
[UTF-8] Mon Oct 5 15:52:54 2015
@@ -533,7 +533,7 @@ public final strictfp class WKTParserTes
* AXIS[“longitude”,east,ORDER[2]],
* ANGLEUNIT[“degree”,0.0174532925199433]],
* VERTCRS[“NAVD88”,
- * VDATUM[“North American Vertical Datum 1983”],
+ * VDATUM[“North American Vertical Datum 1988”],
* CS[vertical,1],
* AXIS[“gravity-related height (H)”,up],
* LENGTHUNIT[“metre”,1]]]
|