You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2015/04/01 00:38:56 UTC
svn commit: r1670505 [5/12] - in /sis/trunk: ./
application/sis-console/src/main/java/org/apache/sis/console/
application/sis-webapp/src/main/java/org/apache/sis/services/
core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/
core/sis-fea...
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -74,7 +74,7 @@ import org.opengis.referencing.cs.Coordi
* </tr>
* </table>
*
- * {@section Discussion on axis order}
+ * <div class="section">Discussion on axis order</div>
* The axis order is specified by the authority (typically a national agency) defining the Coordinate Reference System
* (CRS). The order depends on the CRS type and the country defining the CRS. In the case of geographic CRS, the
* (<var>latitude</var>, <var>longitude</var>) axis order is widely used by geographers and pilotes for centuries.
@@ -92,7 +92,7 @@ import org.opengis.referencing.cs.Coordi
* with older OGC specifications or other softwares, CRS forced to "longitude first" axis order can be created using the
* {@link #CONVENTIONALLY_ORIENTED} or {@link #NORMALIZED} enumeration value.</p>
*
- * {@section Range of longitude values}
+ * <div class="section">Range of longitude values</div>
* Most geographic CRS have a longitude axis defined in the [-180 … +180]° range. All map projections in Apache SIS are
* designed to work in that range. This is also the range of {@link Math} trigonometric functions like {@code atan2(y,x)}.
* However some data use the [0 … 360]° range instead. A geographic CRS can be shifted to that range of longitude values
@@ -170,9 +170,9 @@ public enum AxesConvention {
*
* Then, axes are ordered for {@link #RIGHT_HANDED} coordinate system.
*
- * {@section Usage}
+ * <div class="section">Usage</div>
* This enum is often used for deriving a coordinate system with the (<var>longitude</var>, <var>latitude</var>) or
- * (<var>x</var>,<var>y</var>) axis order. We do not provide a "<cite>longitude or <var>x</var> axis first</cite>"
+ * (<var>x</var>,<var>y</var>) axis order. We do not provide a <cite>"longitude or <var>x</var> axis first"</cite>
* enumeration value because such criterion is hard to apply to inter-cardinal directions and has no meaning for
* map projections over a pole, while the right-handed rule can apply everywhere.
*
@@ -232,7 +232,7 @@ public enum AxesConvention {
* a non-affine conversion. Some geometries may need to be separated in two parts, and others may
* need to be merged.</p>
*
- * {@section Usage}
+ * <div class="section">Usage</div>
* The most frequent usage of this enum is for shifting longitude values from the [-180 … +180]° range
* to the [0 … 360]° range. However this enum could also be used with climatological calendars if their
* time axis has a wrapround range meaning.
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -61,10 +61,10 @@ public final class CoordinateSystems ext
* Names are case-insensitive. They may be:
*
* <ul>
- * <li>Cardinal directions like "<cite>north</cite>" and "<cite>east</cite>".</li>
- * <li>Inter-cardinal directions "<cite>north-east</cite>" and "<cite>south-south-east</cite>",
+ * <li>Cardinal directions like <cite>"north"</cite> and <cite>"east"</cite>.</li>
+ * <li>Inter-cardinal directions <cite>"north-east"</cite> and <cite>"south-south-east"</cite>,
* using either {@code '-'}, {@code '_'} or spaces as separator between the cardinal points.</li>
- * <li>Directions from a pole like "<cite>South along 180 deg</cite>" and "<cite>South along 90° East</cite>",
+ * <li>Directions from a pole like <cite>"South along 180 deg"</cite> and <cite>"South along 90° East"</cite>,
* using either the {@code "deg"} or {@code "°"} symbol.</li>
* </ul>
*
@@ -101,17 +101,17 @@ public final class CoordinateSystems ext
* Returns the arithmetic (counterclockwise) angle from the first axis direction to the second direction.
* This method returns a value between -180° and +180°, or {@code null} if no angle can be computed.
*
- * {@section Horizontal directions}
+ * <div class="section">Horizontal directions</div>
* For any pair of compass directions which are not opposite directions, a positive angle denotes
* a right-handed system while a negative angle denotes a left-handed system. Examples:
*
* <ul>
* <li>The angle from {@link AxisDirection#EAST EAST} to {@link AxisDirection#NORTH NORTH} is 90°</li>
* <li>The angle from {@link AxisDirection#SOUTH SOUTH} to {@link AxisDirection#WEST WEST} is -90°</li>
- * <li>The angle from "<cite>North along 90° East</cite>" to "<cite>North along 0°</cite>" is 90°.</li>
+ * <li>The angle from <cite>"North along 90° East"</cite> to <cite>"North along 0°"</cite> is 90°.</li>
* </ul>
*
- * {@section Horizontal and vertical directions}
+ * <div class="section">Horizontal and vertical directions</div>
* By convention this method defines the angle from any compass direction to the {@link AxisDirection#UP UP}
* vertical direction as 90°, and the angle of any compass direction to the {@link AxisDirection#DOWN DOWN}
* vertical direction as -90°. The sign of those angles gives no indication about whether the coordinate system
@@ -120,7 +120,7 @@ public final class CoordinateSystems ext
* <p>All angles are approximative since this method does not take the Earth ellipsoidal or geoidal shape in
* account.</p>
*
- * {@section Invariants}
+ * <div class="section">Invariants</div>
* For any non-null return value:
* <ul>
* <li>{@code angle(A, A) = 0°}</li>
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -44,7 +44,7 @@ import org.apache.sis.measure.Units;
* <td>unspecified</td>
* </tr></table>
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* and the {@link CoordinateSystemAxis} instances given to the constructor are also immutable. Unless otherwise
* noted in the javadoc, this condition holds if all components were created using only SIS factories and static
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -49,7 +49,7 @@ import org.apache.sis.measure.Angle;
* <td>unspecified</td>
* </tr></table>
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* and the {@link CoordinateSystemAxis} instances given to the constructor are also immutable. Unless otherwise
* noted in the javadoc, this condition holds if all components were created using only SIS factories and static
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -44,7 +44,7 @@ import static org.apache.sis.util.Utilit
* <td>(not applicable)</td>
* </tr></table>
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* and the {@link CoordinateSystemAxis} instances given to the constructor are also immutable. Unless otherwise
* noted in the javadoc, this condition holds if all components were created using only SIS factories and static
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -64,15 +64,15 @@ import org.apache.sis.internal.jdk7.Obje
/**
* Coordinate system axis name, direction, unit and range of values.
*
- * {@section Axis names}
+ * <div class="section">Axis names</div>
* In some case, the axis name is constrained by ISO 19111 depending on the
* {@linkplain org.opengis.referencing.crs.CoordinateReferenceSystem coordinate reference system} type.
- * This constraint works in two directions. For example the names "<cite>geodetic latitude</cite>" and
- * "<cite>geodetic longitude</cite>" shall be used to designate the coordinate axis names associated
+ * This constraint works in two directions. For example the names <cite>"geodetic latitude"</cite> and
+ * <cite>"geodetic longitude"</cite> shall be used to designate the coordinate axis names associated
* with a {@link org.opengis.referencing.crs.GeographicCRS}. Conversely, these names shall not be used
* in any other context. See the GeoAPI {@link CoordinateSystemAxis} javadoc for more information.
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* given to the constructor are also immutable. Unless otherwise noted in the javadoc, this condition holds if all
* components were created using only SIS factories and static constants.
@@ -173,7 +173,7 @@ public class DefaultCoordinateSystemAxis
/**
* The abbreviation used for this coordinate system axes.
- * Examples are "<var>X</var>" and "<var>Y</var>".
+ * Examples are <cite>"X"</cite> and <cite>"Y"</cite>.
*/
@XmlElement(name = "axisAbbrev", required = true)
private final String abbreviation;
@@ -412,7 +412,7 @@ public class DefaultCoordinateSystemAxis
/**
* Returns the abbreviation used for this coordinate system axes.
- * Examples are "<var>X</var>" and "<var>Y</var>".
+ * Examples are <cite>"X"</cite> and <cite>"Y"</cite>.
*
* @return The coordinate system axis abbreviation.
*/
@@ -542,11 +542,11 @@ public class DefaultCoordinateSystemAxis
*
* The above special cases are needed in order to workaround a conflict in specifications:
* ISO 19111 states explicitly that the latitude and longitude axis names shall be
- * "<cite>Geodetic latitude</cite>" and "<cite>Geodetic longitude</cite>", while the legacy
+ * <cite>"Geodetic latitude"</cite> and <cite>"Geodetic longitude"</cite>, while the legacy
* OGC 01-009 (where version 1 of the WKT format is defined) said that the default values shall be
- * "<cite>Lat</cite>" and "<cite>Lon</cite>".
+ * <cite>"Lat"</cite> and <cite>"Lon"</cite>.
*
- * {@section Future evolutions}
+ * <div class="section">Future evolutions</div>
* This method implements heuristic rules learned from experience while trying to provide inter-operability
* with different data producers. Those rules may be adjusted in any future SIS version according experience
* gained while working with more data producers.
@@ -735,7 +735,7 @@ public class DefaultCoordinateSystemAxis
/**
* Formats this axis as a <cite>Well Known Text</cite> {@code Axis[…]} element.
*
- * {@section Constraints for WKT validity}
+ * <div class="section">Constraints for WKT validity</div>
* The ISO 19162 specification puts many constraints on axis names, abbreviations and directions allowed in WKT.
* Most of those constraints are inherited from ISO 19111 — see {@link CoordinateSystemAxis} javadoc for some of
* those. The current Apache SIS implementation does not verify whether this axis name and abbreviation are
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -41,7 +41,7 @@ import org.apache.sis.measure.Units;
* <td>unspecified</td>
* </tr></table>
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* and the {@link CoordinateSystemAxis} instances given to the constructor are also immutable. Unless otherwise
* noted in the javadoc, this condition holds if all components were created using only SIS factories and static
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -41,7 +41,7 @@ import org.apache.sis.measure.Units;
* <td>“Geodetic latitude”, “Geodetic longitude”, “Ellipsoidal height” (if 3D)</td>
* </tr></table>
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* and the {@link CoordinateSystemAxis} instances given to the constructor are also immutable. Unless otherwise
* noted in the javadoc, this condition holds if all components were created using only SIS factories and static
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -42,7 +42,7 @@ import org.apache.sis.measure.Units;
* <td>unspecified</td>
* </tr></table>
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* and the {@link CoordinateSystemAxis} instances given to the constructor are also immutable. Unless otherwise
* noted in the javadoc, this condition holds if all components were created using only SIS factories and static
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -41,7 +41,7 @@ import org.apache.sis.measure.Units;
* <td>unspecified</td>
* </tr></table>
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* and the {@link CoordinateSystemAxis} instances given to the constructor are also immutable. Unless otherwise
* noted in the javadoc, this condition holds if all components were created using only SIS factories and static
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -45,7 +45,7 @@ import org.apache.sis.measure.Units;
* <td>unspecified</td>
* </tr></table>
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* and the {@link CoordinateSystemAxis} instances given to the constructor are also immutable. Unless otherwise
* noted in the javadoc, this condition holds if all components were created using only SIS factories and static
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -41,7 +41,7 @@ import org.apache.sis.measure.Units;
* <td>unspecified</td>
* </tr></table>
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* and the {@link CoordinateSystemAxis} instances given to the constructor are also immutable. Unless otherwise
* noted in the javadoc, this condition holds if all components were created using only SIS factories and static
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -36,7 +36,7 @@ import org.opengis.referencing.cs.Coordi
* <td>unspecified</td>
* </tr></table>
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* and the {@link CoordinateSystemAxis} instances given to the constructor are also immutable. Unless otherwise
* noted in the javadoc, this condition holds if all components were created using only SIS factories and static
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -51,7 +51,7 @@ import org.apache.sis.internal.referenci
* <td>“Gravity-related height” or “Depth”</td>
* </tr></table>
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* and the {@link CoordinateSystemAxis} instances given to the constructor are also immutable. Unless otherwise
* noted in the javadoc, this condition holds if all components were created using only SIS factories and static
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -29,16 +29,16 @@ import org.apache.sis.io.wkt.Formatter;
/**
- * Parses {@linkplain AxisDirection axis direction} of the kind "<cite>South along 90 deg East</cite>".
+ * Parses {@linkplain AxisDirection axis direction} of the kind <cite>"South along 90 deg East"</cite>.
* Those directions are used in the EPSG database for polar stereographic projections.
*
- * {@section Reference meridian}
+ * <div class="section">Reference meridian</div>
* This class does not know whether the meridian is relative to Greenwich or any other reference meridian.
* The reference meridian shall be inferred from the geodetic datum of the {@code GeographicCRS} instance
* that contains (through its coordinate system) the axes having those directions. This is consistent with
* ISO 19162 §7.5.4(iv) - WKT 2 formatting.
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This final class is immutable and thus inherently thread-safe.
*
* @author Martin Desruisseaux (IRD)
@@ -51,8 +51,8 @@ final class DirectionAlongMeridian exten
* A parser for EPSG axis names. Examples:
*
* <ul>
- * <li>"<cite>South along 180 deg</cite>"</li>
- * <li>"<cite>South along 90 deg East</cite>"</li>
+ * <li><cite>"South along 180 deg"</cite></li>
+ * <li><cite>"South along 90 deg East"</cite></li>
* </ul>
*/
private static final Pattern EPSG = Pattern.compile(
@@ -178,7 +178,7 @@ final class DirectionAlongMeridian exten
* A positive angle denote a right-handed system.
*
* <div class="note"><b>Example:</b>
- * The angle from "<cite>North along 90 deg East</cite>" to "<cite>North along 0 deg</cite> is 90°.</div>
+ * The angle from <cite>"North along 90 deg East"</cite> to <cite>"North along 0 deg</cite> is 90°.</div>
*/
public double angle(final DirectionAlongMeridian other) {
if (!baseDirection.equals(other.baseDirection)) {
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -49,11 +49,11 @@ import org.apache.sis.internal.jdk7.Obje
* {@linkplain org.apache.sis.referencing.cs.AbstractCS coordinate systems}, thus creating specific types of
* {@linkplain org.apache.sis.referencing.crs.AbstractCRS coordinate reference system}.
*
- * {@section Instantiation}
+ * <div class="section">Instantiation</div>
* This class is conceptually <cite>abstract</cite>, even if it is technically possible to instantiate it.
* Typical applications should create instances of the most specific subclass prefixed by {@code Default} instead.
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This base class is immutable if the property <em>values</em> (not necessarily the map itself) given to the
* constructor are also immutable. Most SIS subclasses and related classes are immutable under similar conditions.
* This means that unless otherwise noted in the javadoc, {@code Datum} instances created using only SIS factories
@@ -348,7 +348,7 @@ public class AbstractDatum extends Abstr
* is ignored.</li>
* </ul>
*
- * {@section Future evolutions}
+ * <div class="section">Future evolutions</div>
* This method implements heuristic rules learned from experience while trying to provide inter-operability
* with different data producers. Those rules may be adjusted in any future SIS version according experience
* gained while working with more data producers.
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -94,7 +94,7 @@ import org.apache.sis.internal.jdk7.Obje
* The Position Vector convention is used by IAG and recommended by ISO 19111.</li>
* </ul>
*
- * {@section Source and target geodetic datum}
+ * <div class="section">Source and target geodetic datum</div>
* The <var>source datum</var> in above coordinates transformation is the {@link DefaultGeodeticDatum} instance
* that contain this {@code BursaWolfParameters}. It can be any datum, including datum that are valid only locally.
* The <var>{@linkplain #getTargetDatum() target datum}</var> is specified at construction time and is often,
@@ -104,7 +104,7 @@ import org.apache.sis.internal.jdk7.Obje
* prime meridian}, then it is user's responsibility to apply longitude rotation before to use the Bursa-Wolf
* parameters.</p>
*
- * {@section When Bursa-Wolf parameters are used}
+ * <div class="section">When Bursa-Wolf parameters are used</div>
* {@code BursaWolfParameters} are used in three contexts:
* <ol>
* <li>Created as a step while creating a {@linkplain org.apache.sis.referencing.operation.DefaultCoordinateOperation
@@ -364,14 +364,14 @@ public class BursaWolfParameters extends
* {@linkplain DefaultGeodeticDatum#getPrimeMeridian() prime meridian}, then it is caller's responsibility
* to apply longitude rotation before to use the matrix returned by this method.</p>
*
- * {@section Time-dependent transformation}
+ * <div class="section">Time-dependent transformation</div>
* Some transformations use parameters that vary with time (e.g. operation method EPSG:1053).
* Users can optionally specify a date for which the transformation is desired.
* For transformations that do not depends on time, this date is ignored and can be null.
* For time-dependent transformations, {@code null} values default to the transformation's
* {@linkplain TimeDependentBWP#getTimeReference() reference time}.
*
- * {@section Inverse transformation}
+ * <div class="section">Inverse transformation</div>
* The inverse transformation can be approximated by reversing the sign of the 7 parameters before to use them
* in the above matrix. This is often considered sufficient since <cite>position vector transformations</cite>
* are themselves approximations. However Apache SIS will rather use
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -71,11 +71,11 @@ import org.apache.sis.internal.jdk7.Obje
* <li>{@linkplain #getEccentricity() eccentricity}</li>
* </ul>
*
- * {@section Distance calculations}
+ * <div class="section">Distance calculations</div>
* This class contains an {@link #orthodromicDistance(double, double, double, double)} convenience method
* for calculating distances on great circles.
*
- * {@section Creating new ellipsoid instances}
+ * <div class="section">Creating new ellipsoid instances</div>
* New instances can be created either directly by specifying all information to a factory method (choices 3
* and 4 below), or indirectly by specifying the identifier of an entry in a database (choices 1 and 2 below).
* In particular, the <a href="http://www.epsg.org">EPSG</a> database provides definitions for many ellipsoids,
@@ -104,7 +104,7 @@ import org.apache.sis.internal.jdk7.Obje
* Ellipsoid e = CommonCRS.WGS84.ellipsoid();
* }
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* given to the constructors are also immutable. Unless otherwise noted in the javadoc, this condition holds if all
* components were created using only SIS factories and static constants.
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -32,7 +32,7 @@ import org.apache.sis.io.wkt.Formatter;
* This origin can be fixed with respect to the earth (such as a defined point at a construction site),
* or be a defined point on a moving vehicle (such as on a ship or satellite).
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* given to the constructor are also immutable. Unless otherwise noted in the javadoc, this condition holds if all
* components were created using only SIS factories and static constants.
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -30,7 +30,7 @@ import org.opengis.referencing.datum.Ell
import org.opengis.referencing.datum.PrimeMeridian;
import org.opengis.referencing.datum.GeodeticDatum;
import org.opengis.referencing.operation.Matrix;
-import org.apache.sis.referencing.operation.matrix.MatrixSIS;
+import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.matrix.NoninvertibleMatrixException;
import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.internal.referencing.ExtentSelector;
@@ -53,20 +53,20 @@ import org.apache.sis.internal.jdk7.Obje
* Geodetic datum are used together with ellipsoidal coordinate system, and also with Cartesian
* coordinate system centered in the ellipsoid (or sphere).
*
- * {@section Bursa-Wolf parameters}
+ * <div class="section">Bursa-Wolf parameters</div>
* One or many {@link BursaWolfParameters} can optionally be associated to each {@code DefaultGeodeticDatum} instance.
* This association is not part of the ISO 19111 model, but still a common practice (especially in older standards).
* Associating Bursa-Wolf parameters to geodetic datum is known as the <cite>early-binding</cite> approach.
* A recommended alternative, discussed below, is the <cite>late-binding</cite> approach.
*
* <p>The Bursa-Wolf parameters serve two purposes:</p>
- * <ol>
- * <li><p><b>Fallback for datum shifts</b><br>
+ * <ol class="verbose">
+ * <li><b>Fallback for datum shifts</b><br>
* There is different methods for transforming coordinates from one geodetic datum to an other datum,
* and Bursa-Wolf parameters are used with some of them. However different set of parameters may exist
* for the same pair of (<var>source</var>, <var>target</var>) datum, so it is often not sufficient to
* know those datum. The (<var>source</var>, <var>target</var>) pair of CRS are often necessary,
- * sometime together with the geographic extent of the coordinates to transform.</p>
+ * sometime together with the geographic extent of the coordinates to transform.
*
* <p>Apache SIS searches for datum shift methods (including Bursa-Wolf parameters) in the EPSG database when a
* {@link org.opengis.referencing.operation.CoordinateOperation} or a
@@ -77,17 +77,17 @@ import org.apache.sis.internal.jdk7.Obje
* then the {@code BursaWolfParameters} associated to the datum may be used as a fallback.</p>
* </li>
*
- * <li><p><b>WKT version 1 formatting</b><br>
+ * <li><b>WKT version 1 formatting</b><br>
* The Bursa-Wolf parameters association serves an other purpose: when a CRS is formatted in the older
* <cite>Well Known Text</cite> (WKT 1) format, the formatted string may contain a {@code TOWGS84[…]} element
* with the parameter values of the transformation to the WGS 84 datum. This element is provided as a help
* for other Geographic Information Systems that support only the <cite>early-binding</cite> approach.
* Apache SIS usually does not need the {@code TOWGS84} element, except as a fallback for datum that
- * do not exist in the EPSG database.</p>
+ * do not exist in the EPSG database.
* </li>
* </ol>
*
- * {@section Creating new geodetic datum instances}
+ * <div class="section">Creating new geodetic datum instances</div>
* New instances can be created either directly by specifying all information to a factory method (choices 3
* and 4 below), or indirectly by specifying the identifier of an entry in a database (choices 1 and 2 below).
* Choice 1 in the following list is the easiest but most restrictive way to get a geodetic datum.
@@ -110,7 +110,7 @@ import org.apache.sis.internal.jdk7.Obje
* GeodeticDatum datum = CommonCRS.WGS84.datum();
* }
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself),
* the {@link Ellipsoid} and the {@link PrimeMeridian} given to the constructor are also immutable. Unless otherwise
* noted in the javadoc, this condition holds if all components were created using only SIS factories and static
@@ -362,27 +362,27 @@ public class DefaultGeodeticDatum extend
* {@linkplain #getPrimeMeridian() prime meridian}, then it is caller's responsibility
* to apply longitude rotation before to use the matrix returned by this method.</p>
*
- * <p><b>Search order</b><br>
- * This method performs the search in the following order:</p>
+ * <div class="section">Search order</div>
+ * This method performs the search in the following order:
* <ol>
* <li>If this {@code GeodeticDatum} contains {@code BursaWolfParameters} having the given
* {@linkplain BursaWolfParameters#getTargetDatum() target datum} (ignoring metadata),
* then the matrix will be built from those parameters.</li>
* <li>Otherwise if the other datum contains {@code BursaWolfParameters} having this datum
* as their target (ignoring metadata), then the matrix will be built from those parameters
- * and {@linkplain MatrixSIS#inverse() inverted}.</li>
+ * and {@linkplain org.apache.sis.referencing.operation.matrix.MatrixSIS#inverse() inverted}.</li>
* </ol>
*
- * <p><b>Multi-occurrences resolution</b><br>
+ * <div class="section">Multi-occurrences resolution</div>
* If more than one {@code BursaWolfParameters} instance is found in any of the above steps, then the one having
* the largest intersection between its {@linkplain BursaWolfParameters#getDomainOfValidity() domain of validity}
* and the given extent will be selected. If more than one instance have the same intersection, then the first
- * occurrence is selected.</p>
+ * occurrence is selected.
*
- * <p><b>Time-dependent parameters</b><br>
+ * <div class="section">Time-dependent parameters</div>
* If the given extent contains a {@linkplain org.opengis.metadata.extent.TemporalExtent temporal extent},
* then the instant located midway between start and end time will be taken as the date where to evaluate the
- * Bursa-Wolf parameters. This is relevant only to {@linkplain TimeDependentBWP time-dependent parameters}.</p>
+ * Bursa-Wolf parameters. This is relevant only to {@linkplain TimeDependentBWP time-dependent parameters}.
*
* @param targetDatum The target datum.
* @param areaOfInterest The geographic and temporal extent where the transformation should be valid, or {@code null}.
@@ -404,7 +404,7 @@ public class DefaultGeodeticDatum extend
if (targetDatum instanceof DefaultGeodeticDatum) {
candidate = ((DefaultGeodeticDatum) targetDatum).select(this, selector);
if (candidate != null) try {
- return MatrixSIS.castOrCopy(createTransformation(candidate, areaOfInterest)).inverse();
+ return Matrices.inverse(createTransformation(candidate, areaOfInterest));
} catch (NoninvertibleMatrixException e) {
/*
* Should never happen because BursaWolfParameters.getPositionVectorTransformation(Date)
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -40,7 +40,7 @@ import org.apache.sis.internal.jdk7.Obje
* context only. For an image datum, the anchor point is usually either the centre of the image
* or the corner of the image.
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* given to the constructor are also immutable. Unless otherwise noted in the javadoc, this condition holds if
* all components were created using only SIS factories and static constants.
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -45,7 +45,7 @@ import org.apache.sis.internal.jdk7.Obje
/**
* Defines the origin from which longitude values are determined.
*
- * {@section Creating new prime meridian instances}
+ * <div class="section">Creating new prime meridian instances</div>
* New instances can be created either directly by specifying all information to a factory method (choices 3
* and 4 below), or indirectly by specifying the identifier of an entry in a database (choices 1 and 2 below).
* In particular, the <a href="http://www.epsg.org">EPSG</a> database provides definitions for many prime meridians,
@@ -72,7 +72,7 @@ import org.apache.sis.internal.jdk7.Obje
* PrimeMeridian pm = CommonCRS.WGS84.primeMeridian();
* }
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* given to the constructor are also immutable. Unless otherwise noted in the javadoc, this condition holds if
* all components were created using only SIS factories and static constants.
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -42,7 +42,7 @@ import org.apache.sis.internal.jdk7.Obje
/**
* Defines the origin of a temporal coordinate reference system.
*
- * {@section Creating new temporal datum instances}
+ * <div class="section">Creating new temporal datum instances</div>
* New instances can be created either directly by specifying all information to a factory method (choices 3
* and 4 below), or indirectly by specifying the identifier of an entry in a database (choices 1 and 2 below).
* Choice 1 in the following list is the easiest but most restrictive way to get a temporal datum.
@@ -65,7 +65,7 @@ import org.apache.sis.internal.jdk7.Obje
* TemporalDatum datum = CommonCRS.Temporal.JULIAN.datum();
* }
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* given to the constructor are also immutable. Unless otherwise noted in the javadoc, this condition holds if
* all components were created using only SIS factories and static constants.
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -44,7 +44,7 @@ import org.apache.sis.internal.jdk7.Obje
* {@linkplain org.opengis.referencing.cs.CoordinateSystemAxis coordinate system axis} with which
* it is combined to create a {@linkplain org.opengis.referencing.crs.VerticalCRS vertical CRS}.
*
- * {@section Creating new vertical datum instances}
+ * <div class="section">Creating new vertical datum instances</div>
* New instances can be created either directly by specifying all information to a factory method (choices 3
* and 4 below), or indirectly by specifying the identifier of an entry in a database (choices 1 and 2 below).
* Choice 1 in the following list is the easiest but most restrictive way to get a vertical datum.
@@ -67,7 +67,7 @@ import org.apache.sis.internal.jdk7.Obje
* VerticalDatum datum = CommonCRS.Vertical.GEOID.datum();
* }
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* given to the constructor are also immutable. Unless otherwise noted in the javadoc, this condition holds if
* all components were created using only SIS factories and static constants.
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -28,7 +28,7 @@ import static java.lang.Math.*;
* A ellipsoid which is spherical. This ellipsoid implements a faster
* {@link #orthodromicDistance(double, double, double, double)} method.
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thus thread-safe if the property <em>values</em> (not necessarily the map itself)
* given to the constructor are also immutable. Unless otherwise noted in the javadoc, this condition holds if
* all components were created using only SIS factories and static constants.
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -79,7 +79,7 @@ import org.apache.sis.internal.jdk7.Obje
* constructor can not infer them.</li>
* </ul></div>
*
- * {@section Relationship with other classes or interfaces}
+ * <div class="section">Relationship with other classes or interfaces</div>
* {@code OperationMethod} describes parameters without providing any value (except sometime default values).
* When values have been assigned to parameters, the result is a {@link SingleOperation}.
* Note that there is different kinds of {@code SingleOperation} depending on the nature and accuracy of the
@@ -92,7 +92,7 @@ import org.apache.sis.internal.jdk7.Obje
* {@code DefaultOperationMethod} subclasses should implement the
* {@link org.apache.sis.referencing.operation.transform.MathTransformProvider} interface.</p>
*
- * {@section Immutability and thread safety}
+ * <div class="section">Immutability and thread safety</div>
* This class is immutable and thread-safe if all properties given to the constructor are also immutable and thread-safe.
* It is strongly recommended for all subclasses to be thread-safe, especially the
* {@link org.apache.sis.referencing.operation.transform.MathTransformProvider} implementations to be used with
@@ -373,22 +373,22 @@ public class DefaultOperationMethod exte
* Returns an operation method with different dimensions, if we are allowed to change dimensionality.
* The need to change an {@code OperationMethod} dimensionality may occur in two contexts:
*
- * <ul>
- * <li><p>When the original method can work with any number of dimensions. Those methods do not know
+ * <ul class="verbose">
+ * <li>When the original method can work with any number of dimensions. Those methods do not know
* in advance the number of dimensions, which is fixed only after the actual {@link MathTransform}
* instance has been created.
- * Example: <cite>Affine</cite> conversion.</p></li>
- * <li><p>When a three-dimensional method can also be used in the two-dimensional case, typically by
+ * Example: <cite>Affine</cite> conversion.</li>
+ * <li>When a three-dimensional method can also be used in the two-dimensional case, typically by
* assuming that the ellipsoidal height is zero everywhere.
- * Example: <cite>Molodensky</cite> transform.</p></li>
+ * Example: <cite>Molodensky</cite> transform.</li>
* </ul>
*
* This {@code redimension(…)} implementation performs the following choice:
*
- * <ul>
- * <li><p>If the given method is an instance of {@code DefaultOperationMethod}, then delegate to
+ * <ul class="verbose">
+ * <li>If the given method is an instance of {@code DefaultOperationMethod}, then delegate to
* {@link #redimension(int, int)} in order to allow subclasses to defines their own policy.
- * For example the <cite>Molodensky</cite> method needs to override.</p></li>
+ * For example the <cite>Molodensky</cite> method needs to override.</li>
* <li>Otherwise for each dimension (<var>source</var> and <var>target</var>):
* <ul>
* <li>If the corresponding dimension of the given method is {@code null}, then
@@ -470,20 +470,20 @@ public class DefaultOperationMethod exte
* Returns the base interface of the {@code CoordinateOperation} instances that use this method.
* The base {@code CoordinateOperation} interface is usually one of the following subtypes:
*
- * <ul>
- * <li><p>{@link org.opengis.referencing.operation.Transformation}
+ * <ul class="verbose">
+ * <li>{@link org.opengis.referencing.operation.Transformation}
* if the coordinate operation has some errors (typically of a few metres) because of the empirical process by
* which the operation parameters were determined. Those errors do not depend on the floating point precision
- * or the accuracy of the implementation algorithm.</p></li>
- * <li><p>{@link org.opengis.referencing.operation.Conversion}
+ * or the accuracy of the implementation algorithm.</li>
+ * <li class="verbose">{@link org.opengis.referencing.operation.Conversion}
* if the coordinate operation is theoretically of infinite precision, ignoring the limitations of floating
- * point arithmetic (including rounding errors) and the approximations implied by finite series expansions.</p></li>
- * <li><p>{@link org.opengis.referencing.operation.Projection}
+ * point arithmetic (including rounding errors) and the approximations implied by finite series expansions.</li>
+ * <li>{@link org.opengis.referencing.operation.Projection}
* if the coordinate operation is a conversion (as defined above) converting geodetic latitudes and longitudes
* to plane (map) coordinates. This type can optionally be refined with one of the
* {@link org.opengis.referencing.operation.CylindricalProjection},
* {@link org.opengis.referencing.operation.ConicProjection} or
- * {@link org.opengis.referencing.operation.PlanarProjection} subtypes.</p></li>
+ * {@link org.opengis.referencing.operation.PlanarProjection} subtypes.</li>
* </ul>
*
* In case of doubt, {@code getOperationType()} can conservatively return the base type.
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -28,7 +28,7 @@ import org.apache.sis.internal.referenci
/**
* A two dimensional array of numbers. Row and column numbering begins with zero.
*
- * {@section Support for extended precision}
+ * <div class="section">Support for extended precision</div>
* This class can optionally support extended precision using the <cite>double-double arithmetic</cite>.
* In extended precision mode, the {@link #elements} array have twice its normal length. The first half
* of the array contains the same value than in normal precision mode, while the second half contains
@@ -157,16 +157,17 @@ class GeneralMatrix extends MatrixSIS im
/**
* Creates a new extended precision matrix of the given size.
- * Matrices elements are initialized to zero (not to the matrix identity).
*
* @param numRow Number of rows.
* @param numCol Number of columns.
+ * @param setToIdentity {@code true} for initializing the matrix to the identity matrix,
+ * or {@code false} for leaving it initialized to zero.
*/
- static GeneralMatrix createExtendedPrecision(final int numRow, final int numCol) {
+ static GeneralMatrix createExtendedPrecision(final int numRow, final int numCol, final boolean setToIdentity) {
if (numRow == numCol) {
- return new GeneralMatrix(numRow, numCol, false, 2);
+ return new GeneralMatrix(numRow, numCol, setToIdentity, 2);
} else {
- return new NonSquareMatrix(numRow, numCol, false, 2);
+ return new NonSquareMatrix(numRow, numCol, setToIdentity, 2);
}
}
@@ -239,6 +240,38 @@ class GeneralMatrix extends MatrixSIS im
}
/**
+ * Stores the value at the specified row and column in the given {@code dd} object.
+ * This method does not need to verify argument validity.
+ */
+ @Override
+ final void get(final int row, final int column, final DoubleDouble dd) {
+ int i = row * numCol + column;
+ dd.value = elements[i];
+ i += numRow * numCol;
+ if (i < elements.length) {
+ dd.error = elements[i];
+ assert dd.equals(getNumber(row, column));
+ } else {
+ dd.error = DoubleDouble.errorForWellKnownValue(dd.value);
+ }
+ }
+
+ /**
+ * Stores the value of the given {@code dd} object at the specified row and column.
+ * This method does not need to verify argument validity.
+ */
+ @Override
+ final void set(final int row, final int column, final DoubleDouble dd) {
+ int i = row * numCol + column;
+ elements[i] = dd.value;
+ i += numRow * numCol;
+ if (i < elements.length) {
+ elements[i] = dd.error;
+ assert dd.equals(getNumber(row, column));
+ }
+ }
+
+ /**
* Retrieves the value at the specified row and column of this matrix, wrapped in a {@code Number}
* or a {@link DoubleDouble} depending on available precision.
*
@@ -321,6 +354,13 @@ class GeneralMatrix extends MatrixSIS im
} else {
elements = Arrays.copyOf(elements, length);
}
+ } else if (matrix instanceof ExtendedPrecisionMatrix) {
+ elements = ((ExtendedPrecisionMatrix) matrix).getExtendedElements();
+ if (elements.length == length) {
+ return elements;
+ } else {
+ elements = Arrays.copyOf(elements, length);
+ }
} else {
elements = new double[length];
getElements(matrix, numRow, numCol, elements);
@@ -517,41 +557,10 @@ class GeneralMatrix extends MatrixSIS im
}
/**
- * {@inheritDoc}
- */
- @Override
- public final void normalizeColumns() {
- final int numRow = this.numRow; // Protection against accidental changes.
- final int numCol = this.numCol;
- final int errors = numRow * numCol; // Where error values start.
- final double[] elt = getExtendedElements(this, numRow, numCol, false);
- final DoubleDouble sum = new DoubleDouble();
- final DoubleDouble dot = new DoubleDouble();
- for (int i=0; i<numCol; i++) {
- sum.clear();
- for (int j=0; j<numRow; j++) {
- dot.setFrom(elt, j*numCol + i, errors);
- dot.multiply(dot);
- sum.add(dot);
- }
- sum.sqrt();
- for (int j=0; j<numRow; j++) {
- final int k = j*numCol + i;
- dot.setFrom(sum);
- dot.inverseDivide(elt, k, errors);
- dot.storeTo(elt, k, errors);
- }
- }
- if (elt != elements) {
- System.arraycopy(elt, 0, elements, 0, elements.length);
- }
- }
-
- /**
* Sets this matrix to the product of the given matrices: {@code this = A × B}.
* The matrix sizes much match - this is not verified unless assertions are enabled.
*/
- final void setToProduct(final MatrixSIS A, final Matrix B) {
+ final void setToProduct(final Matrix A, final Matrix B) {
final int numRow = this.numRow; // Protection against accidental changes.
final int numCol = this.numCol;
final int nc = A.getNumCol();
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -58,14 +58,18 @@ import org.apache.sis.internal.jdk7.Obje
* {@link #isAffine isAffine},
* {@link #isIdentity isIdentity},
* {@link #equals(Matrix, Matrix, double, boolean) equals},
- * {@link #equals(Matrix, Matrix, ComparisonMode) equals},
* {@link #toString(Matrix) toString}.
* </li>
+ * <li>Miscellaneous:
+ * {@link #multiply multiply},
+ * {@link #inverse inverse},
+ * {@link #unmodifiable unmodifiable},
+ * </li>
* </ul>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @since 0.4
- * @version 0.5
+ * @version 0.6
* @module
*
* @see org.apache.sis.parameter.TensorParameters
@@ -193,7 +197,10 @@ public final class Matrices extends Stat
*/
public static MatrixSIS create(final int numRow, final int numCol, final Number[] elements) {
ArgumentChecks.ensureNonNull("elements", elements);
- final GeneralMatrix matrix = GeneralMatrix.createExtendedPrecision(numRow, numCol);
+ if (elements == ExtendedPrecisionMatrix.IDENTITY) { // Intentionally undocumented features.
+ return GeneralMatrix.createExtendedPrecision(numRow, numCol, true);
+ }
+ final GeneralMatrix matrix = GeneralMatrix.createExtendedPrecision(numRow, numCol, false);
if (matrix.setElements(elements)) {
/*
* At least one org.apache.sis.internal.util.DoubleDouble instance has been found,
@@ -212,6 +219,7 @@ public final class Matrices extends Stat
* @param useEnvelopes {@code true} if source and destination envelopes shall be taken in account.
* If {@code false}, then source and destination envelopes will be ignored and may be null.
*/
+ @SuppressWarnings("null")
private static MatrixSIS createTransform(final Envelope srcEnvelope, final AxisDirection[] srcAxes,
final Envelope dstEnvelope, final AxisDirection[] dstAxes,
final boolean useEnvelopes)
@@ -289,13 +297,13 @@ public final class Matrices extends Stat
* Actually this method is used more often for {@linkplain org.opengis.coverage.grid.GridEnvelope grid envelopes}
* (which have no CRS) than geodetic envelopes.
*
- * {@section Spanning the anti-meridian of a Geographic CRS}
+ * <div class="section">Spanning the anti-meridian of a Geographic CRS</div>
* If the given envelopes cross the date line, then this method requires their {@code getSpan(int)} method
* to behave as documented in the {@link org.apache.sis.geometry.AbstractEnvelope#getSpan(int)} javadoc.
* Furthermore the matrix created by this method will produce expected results only for source or destination
* points before the date line, since the wrap around operation can not be represented by an affine transform.
*
- * {@section Example}
+ * <div class="section">Example</div>
* Given a source envelope of size 100 × 200 (the units do not matter for this method) and a destination
* envelope of size 300 × 500, and given {@linkplain Envelope#getLowerCorner() lower corner} translation
* from (-20, -40) to (-10, -25), then the following method call:
@@ -374,7 +382,7 @@ public final class Matrices extends Stat
* (<i>easting</i>, <i>northing</i>) - this is the first above case, but illegal
* to transform (<i>easting</i>, <i>northing</i>) to (<i>easting</i>, <i>up</i>).</div>
*
- * {@section Example}
+ * <div class="section">Example</div>
* The following method call:
*
* {@preformat java
@@ -423,15 +431,15 @@ public final class Matrices extends Stat
* Actually this method is used more often for {@linkplain org.opengis.coverage.grid.GridEnvelope grid envelopes}
* (which have no CRS) than geodetic envelopes.
*
- * {@section Spanning the anti-meridian of a Geographic CRS}
+ * <div class="section">Spanning the anti-meridian of a Geographic CRS</div>
* If the given envelopes cross the date line, then this method requires their {@code getSpan(int)} method
* to behave as documented in the {@link org.apache.sis.geometry.AbstractEnvelope#getSpan(int)} javadoc.
* Furthermore the matrix created by this method will produce expected results only for source or destination
* points on one side of the date line (depending on whether axis direction is reversed), since the wrap around
* operation can not be represented by an affine transform.
*
- * {@section Example}
- * Combining the examples documented in the above {@code createTransform(…)} methods, the following method call:
+ * <div class="note"><b>Example:</b>
+ * combining the examples documented in the above {@code createTransform(…)} methods, the following method call:
*
* {@preformat java
* matrix = Matrices.createTransform(
@@ -451,6 +459,7 @@ public final class Matrices extends Stat
* │ 1 │ │ 0 0 1 │ │ 1 │
* └ ┘ └ ┘ └ ┘
* }
+ * </div>
*
* @param srcEnvelope The source envelope.
* @param srcAxes The ordered sequence of axis directions for source coordinate system.
@@ -507,8 +516,8 @@ public final class Matrices extends Stat
* <li>For any row <var>j</var> other than the last row, the column {@code selectedDimensions[j]}.</li>
* </ul>
*
- * {@section Example}
- * Given (<var>x</var>,<var>y</var>,<var>z</var>,<var>t</var>) ordinate values, if one wants to keep
+ * <div class="note"><b>Example:</b>
+ * given (<var>x</var>,<var>y</var>,<var>z</var>,<var>t</var>) ordinate values, if one wants to keep
* (<var>y</var>,<var>x</var>,<var>t</var>) ordinates (note the <var>x</var> ↔ <var>y</var> swapping)
* and discard the <var>z</var> values, then the indices of source ordinates to select are 1 for <var>y</var>,
* 0 for <var>x</var> and 3 for <var>t</var>. One can use the following method call:
@@ -529,6 +538,7 @@ public final class Matrices extends Stat
* └ ┘ └ ┘ │ 1 │
* └ ┘
* }
+ * </div>
*
* @param sourceDimensions The number of dimensions in source coordinates.
* @param selectedDimensions The 0-based indices of source ordinate values to keep.
@@ -580,8 +590,8 @@ public final class Matrices extends Stat
* is copied in the last column of the sub-matrix.</li>
* </ul>
*
- * {@section Example}
- * Given the following sub-matrix which converts height values from feet to metres before to subtracts 25 metres:
+ * <div class="note"><b>Example:</b>
+ * given the following sub-matrix which converts height values from feet to metres before to subtracts 25 metres:
*
* {@preformat math
* ┌ ┐ ┌ ┐ ┌ ┐
@@ -603,6 +613,7 @@ public final class Matrices extends Stat
* │ 1 │ │ 0 0 0 0 1 │ │ 1 │
* └ ┘ └ ┘ └ ┘
* }
+ * </div>
*
* @param firstAffectedOrdinate The lowest index of the affected ordinates.
* @param subMatrix The matrix to use for affected ordinates.
@@ -693,6 +704,71 @@ public final class Matrices extends Stat
}
/**
+ * Returns an unmodifiable view of the given matrix. The returned matrix is immutable
+ * only if the given {@code matrix} is not modified anymore after this method call.
+ *
+ * @param matrix The matrix for which to get an unmodifiable view, or {@code null}.
+ * @return A unmodifiable view of the given matrix, or {@code null} if the given matrix was null.
+ *
+ * @since 0.6
+ */
+ public static MatrixSIS unmodifiable(final Matrix matrix) {
+ if (matrix == null || matrix instanceof UnmodifiableMatrix) {
+ return (UnmodifiableMatrix) matrix;
+ } else {
+ return new UnmodifiableMatrix(matrix);
+ }
+ }
+
+ /**
+ * Returns a new matrix which is the result of multiplying the first matrix with the second one.
+ * In other words, returns {@code m1} × {@code m2}.
+ *
+ * @param m1 The first matrix to multiply.
+ * @param m2 The second matrix to multiply.
+ * @return The result of {@code m1} × {@code m2}.
+ * @throws MismatchedMatrixSizeException if the number of columns in {@code m1} is not equals to the
+ * number of rows in {@code m2}.
+ *
+ * @see MatrixSIS#multiply(Matrix)
+ *
+ * @since 0.6
+ */
+ public static MatrixSIS multiply(final Matrix m1, final Matrix m2) throws MismatchedMatrixSizeException {
+ if (m1 instanceof MatrixSIS) {
+ return ((MatrixSIS) m1).multiply(m2); // Maybe the subclass override that method.
+ }
+ final int nc = m2.getNumCol();
+ MatrixSIS.ensureNumRowMatch(m1.getNumCol(), m2.getNumRow(), nc);
+ final GeneralMatrix result = GeneralMatrix.createExtendedPrecision(m1.getNumRow(), nc, false);
+ result.setToProduct(m1, m2);
+ return result;
+ }
+
+ /**
+ * Returns the inverse of the given matrix.
+ *
+ * @param matrix The matrix to inverse, or {@code null}.
+ * @return The inverse of this matrix, or {@code null} if the given matrix was null.
+ * @throws NoninvertibleMatrixException if the given matrix is not invertible.
+ *
+ * @see MatrixSIS#inverse()
+ *
+ * @since 0.6
+ */
+ public static MatrixSIS inverse(final Matrix matrix) throws NoninvertibleMatrixException {
+ if (matrix == null) {
+ return null;
+ } else if (matrix instanceof MatrixSIS) {
+ return ((MatrixSIS) matrix).inverse(); // Maybe the subclass override that method.
+ } else if (matrix.getNumRow() != matrix.getNumCol()) {
+ return new NonSquareMatrix(matrix).inverse();
+ } else {
+ return Solver.inverse(matrix, true);
+ }
+ }
+
+ /**
* Returns {@code true} if the given matrix represents an affine transform.
* A transform is affine if the matrix is square and its last row contains
* only zeros, except in the last column which contains 1.
@@ -706,21 +782,9 @@ public final class Matrices extends Stat
public static boolean isAffine(final Matrix matrix) {
if (matrix instanceof MatrixSIS) {
return ((MatrixSIS) matrix).isAffine();
+ } else {
+ return MatrixSIS.isAffine(matrix);
}
- // Following is executed only if the given matrix is not a SIS implementation.
- int j = matrix.getNumRow();
- int i = matrix.getNumCol();
- if (i != j--) {
- return false; // Matrix is not square.
- }
- double e = 1;
- while (--i >= 0) {
- if (matrix.getElement(j, i) != e) {
- return false;
- }
- e = 0;
- }
- return true;
}
/**
@@ -863,7 +927,7 @@ public final class Matrices extends Stat
*
* <p>The current implementation formats ±0 and ±1 without trailing {@code ".0"}, and all other values with
* a per-column uniform number of fraction digits. The ±0 and ±1 values are treated especially because they
- * usually imply a "<cite>no scale</cite>", "<cite>no translation</cite>" or "<cite>orthogonal axes</cite>"
+ * usually imply a <cite>"no scale"</cite>, <cite>"no translation"</cite> or <cite>"orthogonal axes"</cite>
* meaning. A matrix in SIS is often populated mostly by ±0 and ±1 values, with a few "interesting" values.
* The simpler ±0 and ±1 formatting makes easier to spot the "interesting" values.</p>
*
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix1.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix1.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix1.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix1.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -133,7 +133,7 @@ public final class Matrix1 extends Matri
/**
* Returns the number of rows in this matrix, which is always {@value #SIZE} in this implementation.
*
- * @return Always {@value SIZE}.
+ * @return Always {@value #SIZE}.
*/
@Override
public final int getNumRow() {
@@ -143,7 +143,7 @@ public final class Matrix1 extends Matri
/**
* Returns the number of columns in this matrix, which is always {@value #SIZE} in this implementation.
*
- * @return Always {@value SIZE}.
+ * @return Always {@value #SIZE}.
*/
@Override
public final int getNumCol() {
@@ -191,6 +191,8 @@ public final class Matrix1 extends Matri
/**
* Returns all matrix elements in a flat, row-major (column indices vary fastest) array.
* The array length is 1.
+ *
+ * @return {@inheritDoc}
*/
@Override
public final double[] getElements() {
@@ -220,6 +222,8 @@ public final class Matrix1 extends Matri
/**
* {@inheritDoc}
+ *
+ * @return {@inheritDoc}
*/
@Override
public final boolean isAffine() {
@@ -228,6 +232,8 @@ public final class Matrix1 extends Matri
/**
* {@inheritDoc}
+ *
+ * @return {@inheritDoc}
*/
@Override
public final boolean isIdentity() {
@@ -269,6 +275,8 @@ public final class Matrix1 extends Matri
/**
* Returns a hash code value based on the data values in this object.
+ *
+ * @return {@inheritDoc}
*/
@Override
public int hashCode() {
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -143,7 +143,7 @@ public final class Matrix2 extends Matri
/**
* Returns the number of rows in this matrix, which is always {@value #SIZE} in this implementation.
*
- * @return Always {@value SIZE}.
+ * @return Always {@value #SIZE}.
*/
@Override
public final int getNumRow() {
@@ -153,7 +153,7 @@ public final class Matrix2 extends Matri
/**
* Returns the number of columns in this matrix, which is always {@value #SIZE} in this implementation.
*
- * @return Always {@value SIZE}.
+ * @return Always {@value #SIZE}.
*/
@Override
public final int getNumCol() {
@@ -209,6 +209,8 @@ public final class Matrix2 extends Matri
/**
* Returns all matrix elements in a flat, row-major (column indices vary fastest) array.
* The array length is 4.
+ *
+ * @return {@inheritDoc}
*/
@Override
public final double[] getElements() {
@@ -240,6 +242,8 @@ public final class Matrix2 extends Matri
/**
* {@inheritDoc}
+ *
+ * @return {@inheritDoc}
*/
@Override
public final boolean isAffine() {
@@ -248,6 +252,8 @@ public final class Matrix2 extends Matri
/**
* {@inheritDoc}
+ *
+ * @return {@inheritDoc}
*/
@Override
public final boolean isIdentity() {
@@ -296,6 +302,8 @@ public final class Matrix2 extends Matri
/**
* Returns a hash code value based on the data values in this object.
+ *
+ * @return {@inheritDoc}
*/
@Override
public int hashCode() {
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix3.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix3.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix3.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix3.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -16,10 +16,7 @@
*/
package org.apache.sis.referencing.operation.matrix;
-import java.util.Arrays;
import org.opengis.referencing.operation.Matrix;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.math.MathFunctions;
/**
@@ -34,7 +31,7 @@ import org.apache.sis.math.MathFunctions
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @since 0.4
- * @version 0.4
+ * @version 0.6
* @module
*
* @see Matrix1
@@ -158,7 +155,7 @@ public final class Matrix3 extends Matri
/**
* Returns the number of rows in this matrix, which is always {@value #SIZE} in this implementation.
*
- * @return Always {@value SIZE}.
+ * @return Always {@value #SIZE}.
*/
@Override
public final int getNumRow() {
@@ -168,7 +165,7 @@ public final class Matrix3 extends Matri
/**
* Returns the number of columns in this matrix, which is always {@value #SIZE} in this implementation.
*
- * @return Always {@value SIZE}.
+ * @return Always {@value #SIZE}.
*/
@Override
public final int getNumCol() {
@@ -234,6 +231,8 @@ public final class Matrix3 extends Matri
/**
* Returns all matrix elements in a flat, row-major (column indices vary fastest) array.
* The array length is 9.
+ *
+ * @return {@inheritDoc}
*/
@Override
public final double[] getElements() {
@@ -267,6 +266,8 @@ public final class Matrix3 extends Matri
/**
* {@inheritDoc}
+ *
+ * @return {@inheritDoc}
*/
@Override
public final boolean isAffine() {
@@ -275,6 +276,8 @@ public final class Matrix3 extends Matri
/**
* {@inheritDoc}
+ *
+ * @return {@inheritDoc}
*/
@Override
public final boolean isIdentity() {
@@ -293,48 +296,4 @@ public final class Matrix3 extends Matri
swap = m02; m02 = m20; m20 = swap;
swap = m12; m12 = m21; m21 = swap;
}
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void normalizeColumns() {
- double m;
- final double[] v = new double[3];
- v[0]=m00; v[1]=m10; v[2]=m20; m = MathFunctions.magnitude(v); m00 /= m; m10 /= m; m20 /= m;
- v[0]=m01; v[1]=m11; v[2]=m21; m = MathFunctions.magnitude(v); m01 /= m; m11 /= m; m21 /= m;
- v[0]=m02; v[1]=m12; v[2]=m22; m = MathFunctions.magnitude(v); m02 /= m; m12 /= m; m22 /= m;
- }
-
- /**
- * Returns {@code true} if the specified object is of type {@code Matrix3} and
- * all of the data members are equal to the corresponding data members in this matrix.
- *
- * @param object The object to compare with this matrix for equality.
- * @return {@code true} if the given object is equal to this matrix.
- */
- @Override
- public boolean equals(final Object object) {
- if (object instanceof Matrix3) {
- final Matrix3 that = (Matrix3) object;
- return Numerics.equals(this.m00, that.m00) &&
- Numerics.equals(this.m01, that.m01) &&
- Numerics.equals(this.m02, that.m02) &&
- Numerics.equals(this.m10, that.m10) &&
- Numerics.equals(this.m11, that.m11) &&
- Numerics.equals(this.m12, that.m12) &&
- Numerics.equals(this.m20, that.m20) &&
- Numerics.equals(this.m21, that.m21) &&
- Numerics.equals(this.m22, that.m22);
- }
- return false;
- }
-
- /**
- * Returns a hash code value based on the data values in this object.
- */
- @Override
- public int hashCode() {
- return Arrays.hashCode(getElements()) ^ (int) serialVersionUID;
- }
}
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix4.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix4.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix4.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix4.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -16,10 +16,7 @@
*/
package org.apache.sis.referencing.operation.matrix;
-import java.util.Arrays;
import org.opengis.referencing.operation.Matrix;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.math.MathFunctions;
/**
@@ -35,7 +32,7 @@ import org.apache.sis.math.MathFunctions
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @since 0.4
- * @version 0.4
+ * @version 0.6
* @module
*
* @see Matrix1
@@ -176,7 +173,7 @@ public final class Matrix4 extends Matri
/**
* Returns the number of rows in this matrix, which is always {@value #SIZE} in this implementation.
*
- * @return Always {@value SIZE}.
+ * @return Always {@value #SIZE}.
*/
@Override
public final int getNumRow() {
@@ -186,7 +183,7 @@ public final class Matrix4 extends Matri
/**
* Returns the number of columns in this matrix, which is always {@value #SIZE} in this implementation.
*
- * @return Always {@value SIZE}.
+ * @return Always {@value #SIZE}.
*/
@Override
public final int getNumCol() {
@@ -266,6 +263,8 @@ public final class Matrix4 extends Matri
/**
* Returns all matrix elements in a flat, row-major (column indices vary fastest) array.
* The array length is 16.
+ *
+ * @return {@inheritDoc}
*/
@Override
public final double[] getElements() {
@@ -301,6 +300,8 @@ public final class Matrix4 extends Matri
/**
* {@inheritDoc}
+ *
+ * @return {@inheritDoc}
*/
@Override
public final boolean isAffine() {
@@ -309,6 +310,8 @@ public final class Matrix4 extends Matri
/**
* {@inheritDoc}
+ *
+ * @return {@inheritDoc}
*/
@Override
public final boolean isIdentity() {
@@ -331,56 +334,4 @@ public final class Matrix4 extends Matri
swap = m13; m13 = m31; m31 = swap;
swap = m23; m23 = m32; m32 = swap;
}
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void normalizeColumns() {
- double m;
- final double[] v = new double[4];
- v[0]=m00; v[1]=m10; v[2]=m20; v[3]=m30; m = MathFunctions.magnitude(v); m00 /= m; m10 /= m; m20 /= m; m30 /= m;
- v[0]=m01; v[1]=m11; v[2]=m21; v[3]=m31; m = MathFunctions.magnitude(v); m01 /= m; m11 /= m; m21 /= m; m31 /= m;
- v[0]=m02; v[1]=m12; v[2]=m22; v[3]=m32; m = MathFunctions.magnitude(v); m02 /= m; m12 /= m; m22 /= m; m32 /= m;
- v[0]=m03; v[1]=m13; v[2]=m23; v[3]=m33; m = MathFunctions.magnitude(v); m03 /= m; m13 /= m; m23 /= m; m33 /= m;
- }
-
- /**
- * Returns {@code true} if the specified object is of type {@code Matrix4} and
- * all of the data members are equal to the corresponding data members in this matrix.
- *
- * @param object The object to compare with this matrix for equality.
- * @return {@code true} if the given object is equal to this matrix.
- */
- @Override
- public boolean equals(final Object object) {
- if (object instanceof Matrix4) {
- final Matrix4 that = (Matrix4) object;
- return Numerics.equals(this.m00, that.m00) &&
- Numerics.equals(this.m01, that.m01) &&
- Numerics.equals(this.m02, that.m02) &&
- Numerics.equals(this.m03, that.m03) &&
- Numerics.equals(this.m10, that.m10) &&
- Numerics.equals(this.m11, that.m11) &&
- Numerics.equals(this.m12, that.m12) &&
- Numerics.equals(this.m13, that.m13) &&
- Numerics.equals(this.m20, that.m20) &&
- Numerics.equals(this.m21, that.m21) &&
- Numerics.equals(this.m22, that.m22) &&
- Numerics.equals(this.m23, that.m23) &&
- Numerics.equals(this.m30, that.m30) &&
- Numerics.equals(this.m31, that.m31) &&
- Numerics.equals(this.m32, that.m32) &&
- Numerics.equals(this.m33, that.m33);
- }
- return false;
- }
-
- /**
- * Returns a hash code value based on the data values in this object.
- */
- @Override
- public int hashCode() {
- return Arrays.hashCode(getElements()) ^ (int) serialVersionUID;
- }
}