This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 46b114b14dfc84975aa2c56122c4c7d9af71a983 Author: Martin Desruisseaux <[email protected]> AuthorDate: Sat Jan 5 18:10:32 2019 +0100 Spell "sub-sampling" as "subsampling". A quick search on Google suggests that the later is the most common usage. --- .../java/org/apache/sis/coverage/grid/GridChange.java | 16 ++++++++-------- .../java/org/apache/sis/coverage/grid/GridExtent.java | 10 +++++----- .../java/org/apache/sis/coverage/grid/GridGeometry.java | 12 ++++++------ .../org/apache/sis/coverage/grid/SubgridCalculator.java | 16 ++++++++-------- .../org/apache/sis/coverage/grid/GridChangeTest.java | 6 +++--- ide-project/NetBeans/nbproject/genfiles.properties | 2 +- ide-project/NetBeans/nbproject/project.xml | 3 +++ .../java/org/apache/sis/internal/netcdf/Variable.java | 4 ++-- .../apache/sis/internal/netcdf/impl/VariableInfo.java | 6 +++--- .../apache/sis/internal/netcdf/ucar/VariableWrapper.java | 4 ++-- .../sis/internal/storage/io/HyperRectangleReader.java | 4 ++-- .../java/org/apache/sis/internal/storage/io/Region.java | 8 ++++---- .../internal/storage/io/HyperRectangleReaderTest.java | 12 ++++++------ 13 files changed, 53 insertions(+), 50 deletions(-) diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridChange.java b/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridChange.java index ab2bd73..6f73a1e 100644 --- a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridChange.java +++ b/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridChange.java @@ -272,7 +272,7 @@ public class GridChange implements Serializable { /** * Returns the intersection of the two grid geometry extents, in units of the target grid cells. * This is the expected ranges of grid coordinates after conversions from source to target grid, - * clipped to target grid extent and ignoring {@linkplain #getTargetSubsamplings() sub-samplings}. + * clipped to target grid extent and ignoring {@linkplain #getTargetSubsamplings() subsamplings}. * * @return intersection of grid geometry extents in units of target cells. */ @@ -301,7 +301,7 @@ public class GridChange implements Serializable { * is the order of axes in the {@linkplain #getTargetExtent() target range}. * * <p>In a <em>inverse</em> conversion from target to source grid, the value returned by this - * method would be the sub-sampling to apply while reading the target grid.</p> + * method would be the subsampling to apply while reading the target grid.</p> * * @return an <em>estimation</em> of the steps for accessing cells along each axis of target range. */ @@ -320,7 +320,7 @@ public class GridChange implements Serializable { } /** - * Returns the grid geometry resulting from sub-sampling the target grid with the given periods. + * Returns the grid geometry resulting from subsampling the target grid with the given periods. * The {@code periods} argument is usually the array returned by {@link #getTargetSubsamplings()}, but * not necessarily. The {@linkplain GridGeometry#getExtent() extent} of the returned grid geometry will * be derived from {@link #getTargetExtent()} as below for each dimension <var>i</var>: @@ -334,9 +334,9 @@ public class GridChange implements Serializable { * The {@linkplain GridGeometry#getGridToCRS(PixelInCell) grid to CRS} transform is scaled accordingly * in order to map approximately to the same {@linkplain GridGeometry#getEnvelope() envelope}. * - * @param periods the sub-sampling to apply on each grid dimension. All values shall be greater than zero. + * @param periods the subsampling to apply on each grid dimension. All values shall be greater than zero. * If the array length is shorter than the number of dimensions, missing values are assumed to be 1. - * @return a grid geometry derived from the target geometry with the given sub-sampling. + * @return a grid geometry derived from the target geometry with the given subsampling. * @throws TransformException if an error occurred during computation of target grid geometry. */ public GridGeometry getTargetGeometry(final int... periods) throws TransformException { @@ -380,10 +380,10 @@ public class GridChange implements Serializable { * Assuming: * * • All low coordinates = 0 - * • h₁ the high coordinate before sub-sampling - * • h₂ the high coordinates after sub-sampling + * • h₁ the high coordinate before subsampling + * • h₂ the high coordinates after subsampling * • c a conversion factor from grid indices to "real world" coordinates - * • s a sub-sampling ≧ 1 + * • s a subsampling ≧ 1 * * Then the envelope upper bounds x is: * diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridExtent.java b/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridExtent.java index 3b8f41e..ae35569 100644 --- a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridExtent.java +++ b/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridExtent.java @@ -897,23 +897,23 @@ public class GridExtent implements Serializable { } /** - * Creates a new grid extent sub-sampled by the given amount of cells along each grid dimensions. + * Creates a new grid extent subsampled by the given amount of cells along each grid dimensions. * This method divides {@linkplain #getLow(int) low coordinates} and {@linkplain #getSize(int) grid sizes} * by the given periods, rounding toward zero. The {@linkplain #getHigh(int) high coordinates} are adjusted * accordingly (this is often equivalent to dividing high coordinates by the periods too, but a difference * of one cell may exist). * * <div class="note"><b>Note:</b> - * The envelope computed from a grid extent may become <em>larger</em> after sub-sampling, not smaller. - * This effect can be understood intuitively if we consider that cells become larger after sub-sampling, + * The envelope computed from a grid extent may become <em>larger</em> after subsampling, not smaller. + * This effect can be understood intuitively if we consider that cells become larger after subsampling, * which implies that accurate representation of the same envelope may require fractional cells on some * grid borders.</div> * * This method does not reduce the number of dimensions of the grid extent. * For dimensionality reduction, see {@link #reduce(int...)}. * - * @param periods the sub-samplings. Length shall be equal to the number of dimension and all values shall be greater than zero. - * @return the sub-sampled extent, or {@code this} is sub-sampling results in the same extent. + * @param periods the subsamplings. Length shall be equal to the number of dimension and all values shall be greater than zero. + * @return the subsampled extent, or {@code this} is subsampling results in the same extent. * @throws IllegalArgumentException if a period is not greater than zero. * * @see GridGeometry#subgrid(Envelope, double...) diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java b/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java index cddfa57..fa361cc 100644 --- a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java +++ b/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java @@ -239,7 +239,7 @@ public class GridGeometry implements Serializable { /** * Creates a new grid geometry derived from the given grid geometry with a new extent and a modified transform. * This constructor is used for creating a grid geometry over a subregion (for example with the grid extent - * computed by {@link #subExtent(Envelope)}) or grid geometry for a sub-sampled raster. + * computed by {@link #subExtent(Envelope)}) or grid geometry for a subsampled raster. * * <p>If {@code toOther} is non-null, it should be a transform from the given {@code extent} coordinates to the * {@code other} grid coordinates. That transform should be merely a {@linkplain MathTransforms#scale(double...) @@ -250,7 +250,7 @@ public class GridGeometry implements Serializable { * * The new {@linkplain #getEnvelope() grid geometry envelope} will be {@linkplain GeneralEnvelope#intersect(Envelope) * clipped} to the envelope of the other grid geometry. This is for preventing the envelope to become larger under the - * effect of sub-sampling (because {@link GridExtent#subsample(int[]) each cell become larger}). + * effect of subsampling (because {@link GridExtent#subsample(int[]) each cell become larger}). * * @param other the other grid geometry to copy. * @param extent the new extent for the grid geometry to construct, or {@code null} if none. @@ -629,7 +629,7 @@ public class GridGeometry implements Serializable { * The initial envelope encompasses all cell surfaces, from the left border of leftmost cell * to the right border of the rightmost cell and similarly along other axes. * If this grid geometry is a {@linkplain #subgrid(Envelope, double...) subgrid}, then the envelope is also - * {@linkplain GeneralEnvelope#intersect(Envelope) clipped} to the envelope of the original (non sub-sampled) grid geometry. + * {@linkplain GeneralEnvelope#intersect(Envelope) clipped} to the envelope of the original (non subsampled) grid geometry. * * @return the bounding box in "real world" coordinates (never {@code null}). * @throws IncompleteGridGeometryException if this grid geometry has no envelope — @@ -1036,7 +1036,7 @@ public class GridGeometry implements Serializable { } /** - * Returns a grid geometry over a sub-region of this grid geometry and optionally with sub-sampling. + * Returns a grid geometry over a sub-region of this grid geometry and optionally with subsampling. * The given envelope does not need to be expressed in the same coordinate reference system (CRS) * than {@linkplain #getCoordinateReferenceSystem() the CRS of this grid geometry}; * coordinate conversions or transformations will be applied as needed. @@ -1044,7 +1044,7 @@ public class GridGeometry implements Serializable { * in which case grid dimensions not mapped to envelope dimensions will be returned unchanged. * The target resolution, if provided, shall be in same units and same order than the given envelope axes. * If the length of {@code targetResolution} array is less than the number of dimensions of {@code areaOfInterest}, - * then no sub-sampling will be applied on the missing dimensions. + * then no subsampling will be applied on the missing dimensions. * * <p>This method does not reduce the number of dimensions of this grid geometry. * For dimensionality reduction, see {@link #reduce(int...)}.</p> @@ -1052,7 +1052,7 @@ public class GridGeometry implements Serializable { * @param areaOfInterest the desired spatiotemporal region in any CRS (transformations will be applied as needed), * or {@code null} for not restricting the sub-grid to a sub-area. * @param targetResolution the desired resolution in the same units and order than the axes of the given envelope, - * or {@code null} or an empty array if no sub-sampling is desired. + * or {@code null} or an empty array if no subsampling is desired. * @return a grid geometry over the specified sub-region of this grid geometry with the specified resolution. * @throws IncompleteGridGeometryException if this grid geometry has no extent or no "grid to CRS" transform. * @throws IllegalGridGeometryException if an error occurred while converting the envelope coordinates to grid coordinates. diff --git a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/SubgridCalculator.java b/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/SubgridCalculator.java index e4966a1..234c73c 100644 --- a/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/SubgridCalculator.java +++ b/core/sis-raster/src/main/java/org/apache/sis/coverage/grid/SubgridCalculator.java @@ -42,7 +42,7 @@ import org.opengis.coverage.PointOutsideCoverageException; /** * Helper class for computing the grid extent of a sub-area of a given grid geometry. * This class provides the {@link MathTransform} converting source grid coordinates to target grid coordinates, - * where the source is the given {@link GridGeometry} instance and the target is the sub-sampled grid. + * where the source is the given {@link GridGeometry} instance and the target is the subsampled grid. * * @author Martin Desruisseaux (Geomatys) * @version 1.0 @@ -56,7 +56,7 @@ final class SubgridCalculator { GridExtent extent; /** - * The conversion from the original grid to the sub-sampled grid, or {@code null} if no sub-sampling is applied. + * The conversion from the original grid to the subsampled grid, or {@code null} if no subsampling is applied. * This is computed by the constructor. */ MathTransform toSubsampled; @@ -112,7 +112,7 @@ final class SubgridCalculator { * @param cornerToCRS the transform from cell corners to grid CRS (mandatory). * @param areaOfInterest the desired spatiotemporal region in any CRS, or {@code null} for the whole area. * @param resolution the desired resolution in the same units and order than the axes of the AOI envelope, - * or {@code null} or an empty array if no sub-sampling is desired. + * or {@code null} or an empty array if no subsampling is desired. * @throws TransformException if an error occurred while converting the envelope coordinates to grid coordinates. */ SubgridCalculator(final GridGeometry grid, MathTransform cornerToCRS, final Envelope areaOfInterest, double[] resolution) @@ -135,7 +135,7 @@ final class SubgridCalculator { ArgumentChecks.ensureDimensionMatches("areaOfInterest", dimension, areaOfInterest); cornerToCRS = dropUnusedDimensions(cornerToCRS, dimension); /* - * Compute the sub-extent for the given Area Of Interest (AOI), ignoring for now the sub-sampling. + * Compute the sub-extent for the given Area Of Interest (AOI), ignoring for now the subsampling. * If no area of interest has been specified, or if the result is identical to the original extent, * then we will keep the reference to the original GridExtent (i.e. we share existing instances). */ @@ -153,12 +153,12 @@ final class SubgridCalculator { indices.setRange(i, extent.getLow(i), extent.getHigh(i) + 1.0); } /* - * Convert the target resolutions to grid cell sub-samplings and adjust the extent consequently. + * Convert the target resolutions to grid cell subsamplings and adjust the extent consequently. * We perform this conversion by handling the resolution has a small translation vector located * at the point of interest, and converting it to a translation vector in grid coordinates. The * conversion is done by a multiplication with the "CRS to grid" derivative at that point. * - * The sub-sampling will be rounded in such a way that the difference in grid size is less than + * The subsampling will be rounded in such a way that the difference in grid size is less than * one half of cell. Demonstration: * * e = Math.getExponent(span) → 2^e ≦ span @@ -185,7 +185,7 @@ final class SubgridCalculator { resolution[k] = s; } /* - * If at least one sub-sampling is effective, build a scale from the old grid coordinates to the new + * If at least one subsampling is effective, build a scale from the old grid coordinates to the new * grid coordinates. If we had no rounding, the conversion would be only a scale. But because of rounding, * we need a small translation for the difference between the "real" coordinate and the integer coordinate. */ @@ -233,7 +233,7 @@ final class SubgridCalculator { * Sets {@link #extent} to the given envelope, rounded to nearest integers. * * @param indices the envelope to use for setting the grid extent. - * @param enclosing the enclosing grid extent if a sub-sampling is not yet applied, {@code null} otherwise. + * @param enclosing the enclosing grid extent if a subsampling is not yet applied, {@code null} otherwise. */ private void setExtent(final GeneralEnvelope indices, final GridExtent enclosing) { final GridExtent sub = new GridExtent(indices, GridRoundingMode.NEAREST, null, enclosing, modifiedDimensions); diff --git a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridChangeTest.java b/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridChangeTest.java index 555016a..4a609f4 100644 --- a/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridChangeTest.java +++ b/core/sis-raster/src/test/java/org/apache/sis/coverage/grid/GridChangeTest.java @@ -68,7 +68,7 @@ public final strictfp class GridChangeTest extends TestCase { assertExtentEquals(extent, 1, -1000, 8000); assertArrayEquals("subsamplings", new int[] {50, 300}, change.getTargetSubsamplings()); // s = scaleSource / scaleTarget /* - * Scale factors in following matrix shall be the same than above sub-samplings. + * Scale factors in following matrix shall be the same than above subsamplings. * Translation appears only with PixelInCell different than the one used at construction. */ Matrix3 c = new Matrix3(); @@ -79,7 +79,7 @@ public final strictfp class GridChangeTest extends TestCase { c.m12 = 149.5; assertMatrixEquals("CELL_CENTER", c, MathTransforms.getMatrix(change.getConversion(PixelInCell.CELL_CENTER)), STRICT); /* - * If we do not ask for sub-samplings, the 'gridToCRS' transforms shall be the same than the 'target' geometry. + * If we do not ask for subsamplings, the 'gridToCRS' transforms shall be the same than the 'target' geometry. * The envelope is the intersection of the envelopes of 'source' and 'target' geometries, documented above. */ GridGeometry tg = change.getTargetGeometry(); @@ -91,7 +91,7 @@ public final strictfp class GridChangeTest extends TestCase { expected.setRange(1, -7501, 1500); assertEnvelopeEquals(expected, tg.getEnvelope(), STRICT); /* - * If we ask for sub-samplings, then the envelope should be approximately the same or smaller. Note that without + * If we ask for subsamplings, then the envelope should be approximately the same or smaller. Note that without * the clipping documented in GridExtent(GridExtent, int...) constructor, the envelope could be larger. */ tg = change.getTargetGeometry(50, 300); diff --git a/ide-project/NetBeans/nbproject/genfiles.properties b/ide-project/NetBeans/nbproject/genfiles.properties index d678a5e..cb85add 100644 --- a/ide-project/NetBeans/nbproject/genfiles.properties +++ b/ide-project/NetBeans/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.data.CRC32=58e6b21c build.xml.script.CRC32=462eaba0 [email protected] -nbproject/build-impl.xml.data.CRC32=d09c7daf +nbproject/build-impl.xml.data.CRC32=1a7e4f72 nbproject/build-impl.xml.script.CRC32=a7689f96 nbproject/[email protected] diff --git a/ide-project/NetBeans/nbproject/project.xml b/ide-project/NetBeans/nbproject/project.xml index d8dacc1..2e7964c 100644 --- a/ide-project/NetBeans/nbproject/project.xml +++ b/ide-project/NetBeans/nbproject/project.xml @@ -117,6 +117,9 @@ <word>polylines</word> <word>recursivity</word> <word>spliterator</word> + <word>subsampled</word> + <word>subsampling</word> + <word>subsamplings</word> <word>timezone</word> <word>transitioning</word> <word>Unicode</word> diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java index 0e469e6..4d825cf 100644 --- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java +++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java @@ -618,7 +618,7 @@ public abstract class Variable extends NamedElement { public abstract Vector read() throws IOException, DataStoreException; /** - * Reads a sub-sampled sub-area of the variable. + * Reads a subsampled sub-area of the variable. * Constraints on the argument values are: * * <ul> @@ -633,7 +633,7 @@ public abstract class Variable extends NamedElement { * method shall {@linkplain #replaceNaN(Object) replace fill/missing values by NaN values}. * * @param area indices of cell values to read along each dimension, in "natural" order. - * @param subsampling sub-sampling along each dimension. 1 means no sub-sampling. + * @param subsampling subsampling along each dimension. 1 means no subsampling. * @return the data as an array of a Java primitive type. * @throws IOException if an error occurred while reading the data. * @throws DataStoreException if a logical error occurred. diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java index 6f8c96d..9250446 100644 --- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java +++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java @@ -79,7 +79,7 @@ final class VariableInfo extends Variable implements Comparable<VariableInfo> { }; /** - * Helper class for reading a sub-area with a sub-sampling, + * Helper class for reading a sub-area with a subsampling, * or {@code null} if {@code dataType} is not a supported type. */ private final HyperRectangleReader reader; @@ -758,12 +758,12 @@ final class VariableInfo extends Variable implements Comparable<VariableInfo> { } /** - * Reads a sub-sampled sub-area of the variable. + * Reads a subsampled sub-area of the variable. * Multi-dimensional variables are flattened as a one-dimensional array (wrapped in a vector). * Array elements are in "natural" order (inverse of netCDF order). * * @param area indices of cell values to read along each dimension, in "natural" order. - * @param subsampling sub-sampling along each dimension. 1 means no sub-sampling. + * @param subsampling subsampling along each dimension. 1 means no subsampling. * @return the data as an array of a Java primitive type. * @throws ArithmeticException if the size of the region to read exceeds {@link Integer#MAX_VALUE}, or other overflow occurs. */ diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/VariableWrapper.java b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/VariableWrapper.java index 0d2d818..abefde8 100644 --- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/VariableWrapper.java +++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/VariableWrapper.java @@ -380,11 +380,11 @@ final class VariableWrapper extends Variable { } /** - * Reads a sub-sampled sub-area of the variable. + * Reads a subsampled sub-area of the variable. * Array elements are in inverse of netCDF order. * * @param area indices of cell values to read along each dimension, in "natural" order. - * @param subsampling sub-sampling along each dimension. 1 means no sub-sampling. + * @param subsampling subsampling along each dimension. 1 means no subsampling. * @return the data as an array of a Java primitive type. */ @Override diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java index 4bcebd2..84245e1 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java @@ -42,7 +42,7 @@ public final class HyperRectangleReader { private final DataTransfer reader; /** - * The {@code input} position of the first sample (ignoring sub-area and sub-sampling). + * The {@code input} position of the first sample (ignoring sub-area and subsampling). * This is the {@code origin} argument given to the constructor, copied verbatim. * This field is public for callers wanting to order {@code HyperRectangleReader} instances * in increasing file offset order, for more sequential reading (less seek operations). @@ -117,7 +117,7 @@ public final class HyperRectangleReader { * Reads data in the given region. It is caller's responsibility to ensure that the {@code Region} * object has been created with a {@code size} argument equals to this hyper-rectangle size. * - * @param region the sub-area to read and the sub-sampling to use. + * @param region the sub-area to read and the subsampling to use. * @return the data in an array of primitive type. * @throws IOException if an error occurred while transferring data from the channel. */ diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/Region.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/Region.java index a6e5bd5..0d51113 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/Region.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/Region.java @@ -21,7 +21,7 @@ import org.apache.sis.internal.util.Numerics; /** - * A sub-area in a <var>n</var>-dimensional hyper-rectangle, optionally with sub-sampling. + * A sub-area in a <var>n</var>-dimensional hyper-rectangle, optionally with subsampling. * The size of the hyper-rectangle is given by the {@code size} argument at construction time, * where {@code size.length} is the number of dimensions and {@code size[i]} is the number of * values along dimension <var>i</var>. For each dimension, the index ranges from 0 inclusive @@ -38,7 +38,7 @@ import org.apache.sis.internal.util.Numerics; */ public final class Region { /** - * The size after reading only the sub-region at the given sub-sampling. + * The size after reading only the sub-region at the given subsampling. * The length of this array is the hyper-rectangle dimension. * * @see #targetLength(int) @@ -80,7 +80,7 @@ public final class Region { * @param size the number of elements along each dimension. * @param regionLower index of the first value to read or write along each dimension. * @param regionUpper index after the last value to read or write along each dimension. - * @param subsamplings sub-sampling along each dimension. Shall be greater than zero. + * @param subsamplings subsampling along each dimension. Shall be greater than zero. * @throws ArithmeticException if the size of the region to read exceeds {@link Integer#MAX_VALUE}, * or the total hyper-cube size exceeds {@link Long#MAX_VALUE}. */ @@ -149,7 +149,7 @@ public final class Region { } /** - * Returns the total number of values to be read from the sub-region while applying the sub-sampling. + * Returns the total number of values to be read from the sub-region while applying the subsampling. * This method takes in account only the given number of dimensions. */ final int targetLength(final int dimension) { diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java index 893f375..7ca16ae 100644 --- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java +++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java @@ -60,7 +60,7 @@ public final strictfp class HyperRectangleReaderTest extends TestCase { private final long[] upper = new long[size.length]; /** - * Sub-sampling values to use for the test. + * Subsampling values to use for the test. */ private final int[] subsampling = new int[size.length]; @@ -79,7 +79,7 @@ public final strictfp class HyperRectangleReaderTest extends TestCase { } /** - * Creates an hyper-rectangle of random size and initializes the sub-region and sub-sampling to random values. + * Creates an hyper-rectangle of random size and initializes the sub-region and subsampling to random values. * Sample values are index values encoded in base 10. For example the value at index (4,1,2,3) will be 4123. * * @param random the random number generator to use for initializing the test. @@ -88,7 +88,7 @@ public final strictfp class HyperRectangleReaderTest extends TestCase { */ private void initialize(final Random random, final boolean useChannel) throws IOException, DataStoreException { /* - * Compute a random hyper-rectangle size, sub-region and sub-sampling. Each dimension will have a + * Compute a random hyper-rectangle size, sub-region and subsampling. Each dimension will have a * size between 1 to 10, so we will be able to use decimal digits from 0 to 9 in the sample values. */ int length = 1; @@ -166,7 +166,7 @@ public final strictfp class HyperRectangleReaderTest extends TestCase { } /** - * Tests reading a random part of the hyper-cube without sub-sampling. + * Tests reading a random part of the hyper-cube without subsampling. * * @throws IOException should never happen. * @throws DataStoreException should never happen. @@ -179,7 +179,7 @@ public final strictfp class HyperRectangleReaderTest extends TestCase { } /** - * Tests reading the full hyper-cube with a random sub-sampling. + * Tests reading the full hyper-cube with a random subsampling. * * @throws IOException should never happen. * @throws DataStoreException should never happen. @@ -193,7 +193,7 @@ public final strictfp class HyperRectangleReaderTest extends TestCase { } /** - * Tests reading a random part of the hyper-cube with a random sub-sampling. + * Tests reading a random part of the hyper-cube with a random subsampling. * * @throws IOException should never happen. * @throws DataStoreException should never happen.
