Author: desruisseaux
Date: Fri Nov 13 09:51:52 2015
New Revision: 1714171
URL: http://svn.apache.org/viewvc?rev=1714171&view=rev
Log:
Replace some HTML formatting by Unicode characters.
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ScaleTransform.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Line.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java?rev=1714171&r1=1714170&r2=1714171&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java
[UTF-8] Fri Nov 13 09:51:52 2015
@@ -23,12 +23,12 @@ import static java.lang.Math.*;
* Finds the extremum of the unique cubic curve which fit the two given points
and derivatives.
* First, this method finds the A, B, C and D coefficients for the following
equation:
*
- * <blockquote><var>y</var> = A + B<var>x</var> + C<var>x</var><sup>2</sup> +
D<var>x</var><sup>3</sup></blockquote>
+ * <blockquote><var>y</var> = A + B<var>x</var> + C<var>x</var>² +
D<var>x</var>³</blockquote>
*
* Next, this method finds the extremum by finding the
(<var>x</var>,<var>y</var>) values
* that satisfy the following equation (which is the derivative of the above
equation):
*
- * <blockquote>B + 2C<var>x</var> + 3D<var>x</var><sup>2</sup> = 0</blockquote>
+ * <blockquote>B + 2C<var>x</var> + 3D<var>x</var>² = 0</blockquote>
*
* A cubic curve can have two extremum, which are stored in this object in no
particular order.
* The distance separating the two extremum is sometime a useful information
for determining if
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java?rev=1714171&r1=1714170&r2=1714171&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
[UTF-8] Fri Nov 13 09:51:52 2015
@@ -72,7 +72,7 @@ import java.util.Objects;
*
* <li>On output, the {@link #transform(double[],int,double[],int,boolean)
transform(…)} method returns
* (<var>x</var>, <var>y</var>) values on a sphere or ellipse having a
semi-major axis length (<var>a</var>) of 1.
- * The multiplication by the scale factor (<var>k</var>₀) and the
translation by false easting (FE) and false
+ * The multiplication by the scale factor (<var>k₀</var>) and the
translation by false easting (FE) and false
* northing (FN) are applied by the {@linkplain
ContextualParameters#getMatrix denormalization} affine transform.</li>
* </ul>
*
@@ -281,7 +281,7 @@ public abstract class NormalizedProjecti
CENTRAL_MERIDIAN,
/**
- * Maps the <cite>scale factor</cite> parameter (symbol:
<var>k</var>₀).
+ * Maps the <cite>scale factor</cite> parameter (symbol:
<var>k₀</var>).
* This is a multiplication factor for the (<var>x</var>,<var>y</var>)
values obtained after map projections.
*
* <p>Some common names for this parameter are:</p>
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java?rev=1714171&r1=1714170&r2=1714171&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
[UTF-8] Fri Nov 13 09:51:52 2015
@@ -358,8 +358,8 @@ public abstract class AbstractMathTransf
* transforming many points. The supplied array of ordinal values will
contain packed ordinal values.
*
* <div class="note"><b>Example:</b> if the source dimension is 3, then
the ordinates will be packed in this order:
- *
(<var>x<sub>0</sub></var>,<var>y<sub>0</sub></var>,<var>z<sub>0</sub></var>,
- *
<var>x<sub>1</sub></var>,<var>y<sub>1</sub></var>,<var>z<sub>1</sub></var> …).
+ * (<var>x₀</var>,<var>y₀</var>,<var>z₀</var>,
+ * <var>x₁</var>,<var>y₁</var>,<var>z₁</var> …).
* </div>
*
* The default implementation invokes {@link #transform(double[], int,
double[], int, boolean)} in a loop,
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java?rev=1714171&r1=1714170&r2=1714171&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java
[UTF-8] Fri Nov 13 09:51:52 2015
@@ -205,8 +205,8 @@ class ProjectiveTransform extends Abstra
* equal to <code>{@link Matrix#getNumCol}-1</code>. For example, for
square matrix of size 4×4, coordinate
* points are three-dimensional and stored in the arrays starting at the
specified offset ({@code srcOff}) in
* the order
- * <code>[x<sub>0</sub>, y<sub>0</sub>, z<sub>0</sub>,
- * x<sub>1</sub>, y<sub>1</sub>, z<sub>1</sub>...,
+ * <code>[x₀, y₀, z₀,
+ * x₁, y₁, z₁...,
* x<sub>n</sub>, y<sub>n</sub>, z<sub>n</sub>]</code>.
*
* @param srcPts The array containing the source point coordinates.
@@ -276,8 +276,8 @@ class ProjectiveTransform extends Abstra
* equal to <code>{@link Matrix#getNumCol()} - 1</code>. For example, for
square matrix of size 4×4, coordinate
* points are three-dimensional and stored in the arrays starting at the
specified offset ({@code srcOff})
* in the order
- * <code>[x<sub>0</sub>, y<sub>0</sub>, z<sub>0</sub>,
- * x<sub>1</sub>, y<sub>1</sub>, z<sub>1</sub>...,
+ * <code>[x₀, y₀, z₀,
+ * x₁, y₁, z₁...,
* x<sub>n</sub>, y<sub>n</sub>, z<sub>n</sub>]</code>.
*
* @param srcPts The array containing the source point coordinates.
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ScaleTransform.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ScaleTransform.java?rev=1714171&r1=1714170&r2=1714171&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ScaleTransform.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ScaleTransform.java
[UTF-8] Fri Nov 13 09:51:52 2015
@@ -184,8 +184,8 @@ final class ScaleTransform extends Abstr
* equal to <code>{@link Matrix#getNumCol}-1</code>. For example, for
square matrix of size 4×4, coordinate
* points are three-dimensional and stored in the arrays starting at the
specified offset ({@code srcOff}) in
* the order
- * <code>[x<sub>0</sub>, y<sub>0</sub>, z<sub>0</sub>,
- * x<sub>1</sub>, y<sub>1</sub>, z<sub>1</sub>...,
+ * <code>[x₀, y₀, z₀,
+ * x₁, y₁, z₁...,
* x<sub>n</sub>, y<sub>n</sub>, z<sub>n</sub>]</code>.
*
* @param srcPts The array containing the source point coordinates.
@@ -218,8 +218,8 @@ final class ScaleTransform extends Abstr
* equal to <code>{@link Matrix#getNumCol()} - 1</code>. For example, for
square matrix of size 4×4, coordinate
* points are three-dimensional and stored in the arrays starting at the
specified offset ({@code srcOff})
* in the order
- * <code>[x<sub>0</sub>, y<sub>0</sub>, z<sub>0</sub>,
- * x<sub>1</sub>, y<sub>1</sub>, z<sub>1</sub>...,
+ * <code>[x₀, y₀, z₀,
+ * x₁, y₁, z₁...,
* x<sub>n</sub>, y<sub>n</sub>, z<sub>n</sub>]</code>.
*
* @param srcPts The array containing the source point coordinates.
Modified:
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Line.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Line.java?rev=1714171&r1=1714170&r2=1714171&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Line.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Line.java
[UTF-8] Fri Nov 13 09:51:52 2015
@@ -28,8 +28,8 @@ import static java.lang.Double.*;
/**
* Equation of a line in a two dimensional space (<var>x</var>,<var>y</var>).
- * A line can be expressed by the <var>y</var> = <var>slope</var>⋅<var>x</var>
+ <var>y</var>₀ equation
- * where <var>y</var>₀ is the value of <var>y</var> at <var>x</var> = 0.
+ * A line can be expressed by the <var>y</var> = <var>slope</var>⋅<var>x</var>
+ <var>y₀</var> equation
+ * where <var>y₀</var> is the value of <var>y</var> at <var>x</var> = 0.
*
* <p>The equation parameters for a {@code Line} object can be set at
construction time or using one
* of the {@code setLine(…)} methods. The <var>y</var> value can be computed
for a given <var>x</var>
@@ -37,8 +37,8 @@ import static java.lang.Double.*;
* work even if the line is vertical.</p>
*
* <div class="note"><b>Comparison with Java2D geometries:</b>
- * At the difference of {@link java.awt.geom.Line2D} which is bounded by
(<var>x</var>₁,<var>y</var>₁)
- * and (<var>x</var>₂,<var>y</var>₂) points, {@code Line} objects extend
toward infinity.</div>
+ * At the difference of {@link java.awt.geom.Line2D} which is bounded by
(<var>x₁</var>,<var>y₁</var>)
+ * and (<var>x₂</var>,<var>y₂</var>) points, {@code Line} objects extend
toward infinity.</div>
*
* @author Martin Desruisseaux (MPO, IRD)
* @since 0.5
@@ -84,7 +84,7 @@ public class Line implements Cloneable,
/**
* Constructs a line with the specified slope and offset.
- * The linear equation will be <var>y</var> =
<var>slope</var>⋅<var>x</var> + <var>y</var>₀.
+ * The linear equation will be <var>y</var> =
<var>slope</var>⋅<var>x</var> + <var>y₀</var>.
*
* @param slope The slope.
* @param y0 The <var>y</var> value at <var>x</var> = 0.
@@ -111,7 +111,7 @@ public class Line implements Cloneable,
/**
* Returns the <var>x</var> value for <var>y</var> = 0.
- * Coordinate (<var>x</var>₀, 0) is the intersection point with the
<var>x</var> axis.
+ * Coordinate (<var>x₀</var>, 0) is the intersection point with the
<var>x</var> axis.
*
* @return The <var>x</var> value for <var>y</var> = 0.
*
@@ -137,7 +137,7 @@ public class Line implements Cloneable,
/**
* Returns the <var>y</var> value for <var>x</var> = 0.
- * Coordinate (0, <var>y</var>₀) is the intersection point with the
<var>y</var> axis.
+ * Coordinate (0, <var>y₀</var>) is the intersection point with the
<var>y</var> axis.
*
* @return The <var>y</var> value for <var>x</var> = 0.
*
@@ -179,7 +179,7 @@ public class Line implements Cloneable,
/**
* Sets this line to the specified slope and offset.
- * The linear equation will be <var>y</var> =
<var>slope</var>⋅<var>x</var> + <var>y</var>₀.
+ * The linear equation will be <var>y</var> =
<var>slope</var>⋅<var>x</var> + <var>y₀</var>.
*
* @param slope The slope.
* @param y0 The <var>y</var> value at <var>x</var> = 0.
@@ -218,7 +218,7 @@ public class Line implements Cloneable,
/**
* Given a set of data points <var>x</var>[0 … <var>n</var>-1],
<var>y</var>[0 … <var>n</var>-1],
- * fits them to a straight line <var>y</var> =
<var>slope</var>⋅<var>x</var> + <var>y</var>₀ in a
+ * fits them to a straight line <var>y</var> =
<var>slope</var>⋅<var>x</var> + <var>y₀</var> in a
* least-squares senses. This method assume that the <var>x</var> values
are precise and all uncertainty
* is in <var>y</var>.
*
@@ -235,7 +235,7 @@ public class Line implements Cloneable,
/**
* Given a sequence of points, fits them to a straight line <var>y</var> =
<var>slope</var>⋅<var>x</var> +
- * <var>y</var>₀ in a least-squares senses. This method assume that the
<var>x</var> values are precise and
+ * <var>y₀</var> in a least-squares senses. This method assume that the
<var>x</var> values are precise and
* all uncertainty is in <var>y</var>.
*
* <p>Points shall be two dimensional with ordinate values in the
(<var>x</var>,<var>y</var>) order.
@@ -382,7 +382,7 @@ public class Line implements Cloneable,
/**
* Returns a string representation of this line. This method returns the
linear equation
- * in the form <var>y</var> = <var>slope</var>⋅<var>x</var> +
<var>y</var>₀.
+ * in the form <var>y</var> = <var>slope</var>⋅<var>x</var> +
<var>y₀</var>.
*
* @return A string representation of this line.
*/
Modified:
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java?rev=1714171&r1=1714170&r2=1714171&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java
[UTF-8] Fri Nov 13 09:51:52 2015
@@ -35,7 +35,7 @@ import static java.lang.Math.ulp;
*
* <blockquote>
* <var>{@linkplain #z(double, double) z}</var>(<var>x</var>,<var>y</var>) =
- * <var>sx</var>⋅<var>x</var> + <var>sy</var>⋅<var>y</var> + <var>z</var>₀
+ * <var>sx</var>⋅<var>x</var> + <var>sy</var>⋅<var>y</var> + <var>z₀</var>
* </blockquote>
*
* Those coefficients can be set directly, or computed by a linear regression
of this plane
@@ -83,19 +83,19 @@ public class Plane implements Cloneable,
/**
* The slope along the <var>x</var> values. This coefficient appears in
the plane equation
- * <var><b><u>sx</u></b></var>⋅<var>x</var> + <var>sy</var>⋅<var>y</var> +
<var>z</var>₀.
+ * <var><b><u>sx</u></b></var>⋅<var>x</var> + <var>sy</var>⋅<var>y</var> +
<var>z₀</var>.
*/
private double sx;
/**
* The slope along the <var>y</var> values. This coefficient appears in
the plane equation
- * <var>sx</var>⋅<var>x</var> + <var><b><u>sy</u></b></var>⋅<var>y</var> +
<var>z</var>₀.
+ * <var>sx</var>⋅<var>x</var> + <var><b><u>sy</u></b></var>⋅<var>y</var> +
<var>z₀</var>.
*/
private double sy;
/**
* The <var>z</var> value at (<var>x</var>,<var>y</var>) = (0,0). This
coefficient appears in the plane equation
- * <var>sx</var>⋅<var>x</var> + <var>sy</var>⋅<var>y</var> +
<b><u><var>z</var>₀</u></b>.
+ * <var>sx</var>⋅<var>x</var> + <var>sy</var>⋅<var>y</var> +
<b><u><var>z₀</var></u></b>.
*/
private double z0;
@@ -123,7 +123,7 @@ public class Plane implements Cloneable,
/**
* Returns the slope along the <var>x</var> values. This coefficient
appears in the plane equation
- * <var><b><u>sx</u></b></var>⋅<var>x</var> + <var>sy</var>⋅<var>y</var> +
<var>z</var>₀.
+ * <var><b><u>sx</u></b></var>⋅<var>x</var> + <var>sy</var>⋅<var>y</var> +
<var>z₀</var>.
*
* @return The <var>sx</var> term.
*/
@@ -133,7 +133,7 @@ public class Plane implements Cloneable,
/**
* Returns the slope along the <var>y</var> values. This coefficient
appears in the plane equation
- * <var>sx</var>⋅<var>x</var> + <var><b><u>sy</u></b></var>⋅<var>y</var> +
<var>z</var>₀.
+ * <var>sx</var>⋅<var>x</var> + <var><b><u>sy</u></b></var>⋅<var>y</var> +
<var>z₀</var>.
*
* @return The <var>sy</var> term.
*/
@@ -143,9 +143,9 @@ public class Plane implements Cloneable,
/**
* Returns the <var>z</var> value at (<var>x</var>,<var>y</var>) = (0,0).
This coefficient appears in the
- * plane equation <var>sx</var>⋅<var>x</var> + <var>sy</var>⋅<var>y</var>
+ <b><var>z</var>₀</b>.
+ * plane equation <var>sx</var>⋅<var>x</var> + <var>sy</var>⋅<var>y</var>
+ <b><var>z₀</var></b>.
*
- * @return The <var>z</var>₀ term.
+ * @return The <var>z₀</var> term.
*
* @see #z(double, double)
*/
Modified:
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java?rev=1714171&r1=1714170&r2=1714171&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
[UTF-8] Fri Nov 13 09:51:52 2015
@@ -429,7 +429,7 @@ public class Statistics implements Doubl
/**
* Returns the standard deviation. If the sample values given to the
{@code accept(…)}
* methods have a uniform distribution, then the returned value should be
close to
- * <code>sqrt({@linkplain #span() span}<sup>2</sup> / 12)</code>. If they
have a
+ * <code>sqrt({@linkplain #span() span}² / 12)</code>. If they have a
* Gaussian distribution (which is the most common case), then the
returned value
* is related to the <a
href="http://en.wikipedia.org/wiki/Error_function";>error
* function</a>.
