Skip to content

Commit 6c73d7e

Browse files
Change "triple"/"quadruple" to "triplet"/"quadruplet" in the documentation (#2186)
1 parent fdbdf8b commit 6c73d7e

File tree

9 files changed

+44
-43
lines changed

9 files changed

+44
-43
lines changed

examples/gallery/embellishments/colorbar.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
``position="jTR"`` for top right.
1515
- **g**: using map coordinates, e.g. ``position="g170/-45"`` for longitude
1616
170E, latitude 45S.
17-
- **x**: using paper coordinates, e.g. ``position="x5c/7c"`` for 5 cm,7 cm from
18-
anchor point.
17+
- **x**: using paper coordinates, e.g. ``position="x5c/7c"`` for 5 cm, 7 cm
18+
from anchor point.
1919
- **n**: using normalized (0-1) coordinates, e.g. ``position="n0.4/0.8"``.
2020
2121
Note that the anchor point defaults to the bottom left (**BL**). Append ``+h``

pygmt/helpers/decorators.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@
144144
nodata : str
145145
**i**\|\ **o**\ *nodata*.
146146
Substitute specific values with NaN (for tabular data). For
147-
example, ``d="-9999"`` will replace all values equal to -9999 with
148-
NaN during input and all NaN values with -9999 during output.
147+
example, ``nodata="-9999"`` will replace all values equal to -9999
148+
with NaN during input and all NaN values with -9999 during output.
149149
Prepend **i** to the *nodata* value for input columns only. Prepend
150150
**o** to the *nodata* value for output columns only.""",
151151
"panel": r"""

pygmt/src/blockm.py

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""
2-
blockm - Block average (x,y,z) data tables by mean, median, or mode estimation.
2+
blockm - Block average (x, y, z) data tables by mean, median, or mode
3+
estimation.
34
"""
45
import pandas as pd
56
from pygmt.clib import Session
@@ -16,10 +17,10 @@
1617

1718
def _blockm(block_method, data, x, y, z, outfile, **kwargs):
1819
r"""
19-
Block average (x,y,z) data tables by mean, median, or mode estimation.
20+
Block average (x, y, z) data tables by mean, median, or mode estimation.
2021
21-
Reads arbitrarily located (x,y,z) triples [or optionally weighted
22-
quadruples (x,y,z,w)] from a table and writes to the output a mean,
22+
Reads arbitrarily located (x, y, z) triplets [or optionally weighted
23+
quadruplets (x, y, z, w)] from a table and writes to the output a mean,
2324
median, or mode (depending on ``block_method``) position and value for
2425
every non-empty block in a grid region defined by the ``region`` and
2526
``spacing`` parameters.
@@ -88,14 +89,14 @@ def _blockm(block_method, data, x, y, z, outfile, **kwargs):
8889
@kwargs_to_strings(I="sequence", R="sequence", i="sequence_comma", o="sequence_comma")
8990
def blockmean(data=None, x=None, y=None, z=None, outfile=None, **kwargs):
9091
r"""
91-
Block average (x,y,z) data tables by mean estimation.
92+
Block average (x, y, z) data tables by mean estimation.
9293
93-
Reads arbitrarily located (x,y,z) triples [or optionally weighted
94-
quadruples (x,y,z,w)] and writes to the output a mean position and value
95-
for every non-empty block in a grid region defined by the ``region`` and
96-
``spacing`` parameters.
94+
Reads arbitrarily located (x, y, z) triplets [or optionally weighted
95+
quadruplets (x, y, z, w)] and writes to the output a mean position and
96+
value for every non-empty block in a grid region defined by the ``region``
97+
and ``spacing`` parameters.
9798
98-
Takes a matrix, xyz triplets, or a file name as input.
99+
Takes a matrix, (x, y, z) triplets, or a file name as input.
99100
100101
Must provide either ``data`` or ``x``, ``y``, and ``z``.
101102
@@ -184,14 +185,14 @@ def blockmean(data=None, x=None, y=None, z=None, outfile=None, **kwargs):
184185
@kwargs_to_strings(I="sequence", R="sequence", i="sequence_comma", o="sequence_comma")
185186
def blockmedian(data=None, x=None, y=None, z=None, outfile=None, **kwargs):
186187
r"""
187-
Block average (x,y,z) data tables by median estimation.
188+
Block average (x, y, z) data tables by median estimation.
188189
189-
Reads arbitrarily located (x,y,z) triples [or optionally weighted
190-
quadruples (x,y,z,w)] and writes to the output a median position and value
191-
for every non-empty block in a grid region defined by the ``region`` and
192-
``spacing`` parameters.
190+
Reads arbitrarily located (x, y, z) triplets [or optionally weighted
191+
quadruplets (x, y, z, w)] and writes to the output a median position and
192+
value for every non-empty block in a grid region defined by the ``region``
193+
and ``spacing`` parameters.
193194
194-
Takes a matrix, xyz triplets, or a file name as input.
195+
Takes a matrix, (x, y, z) triplets, or a file name as input.
195196
196197
Must provide either ``data`` or ``x``, ``y``, and ``z``.
197198
@@ -271,14 +272,14 @@ def blockmedian(data=None, x=None, y=None, z=None, outfile=None, **kwargs):
271272
@kwargs_to_strings(I="sequence", R="sequence", i="sequence_comma", o="sequence_comma")
272273
def blockmode(data=None, x=None, y=None, z=None, outfile=None, **kwargs):
273274
r"""
274-
Block average (x,y,z) data tables by mode estimation.
275+
Block average (x, y, z) data tables by mode estimation.
275276
276-
Reads arbitrarily located (x,y,z) triples [or optionally weighted
277-
quadruples (x,y,z,w)] and writes to the output a mode position and value
278-
for every non-empty block in a grid region defined by the ``region`` and
279-
``spacing`` parameters.
277+
Reads arbitrarily located (x, y, z) triplets [or optionally weighted
278+
quadruplets (x, y, z, w)] and writes to the output a mode position and
279+
value for every non-empty block in a grid region defined by the ``region``
280+
and ``spacing`` parameters.
280281
281-
Takes a matrix, xyz triplets, or a file name as input.
282+
Takes a matrix, (x, y, z) triplets, or a file name as input.
282283
283284
Must provide either ``data`` or ``x``, ``y``, and ``z``.
284285

pygmt/src/contour.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ def contour(self, data=None, x=None, y=None, z=None, **kwargs):
3838
r"""
3939
Contour table data by direct triangulation.
4040
41-
Takes a matrix, (x,y,z) triplets, or a file name as input and plots lines,
42-
polygons, or symbols at those locations on a map.
41+
Takes a matrix, (x, y, z) triplets, or a file name as input and plots,
42+
lines, polygons, or symbols at those locations on a map.
4343
44-
Must provide either ``data`` or ``x``/``y``/``z``.
44+
Must provide either ``data`` or ``x``, ``y``, and ``z``.
4545
4646
Full option list at :gmt-docs:`contour.html`
4747

pygmt/src/nearneighbor.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
nearneighbor - Grid table data using a "Nearest neighbor" algorithm
2+
nearneighbor - Grid table data using a "Nearest neighbor" algorithm.
33
"""
44

55
from pygmt.clib import Session
@@ -40,7 +40,7 @@ def nearneighbor(data=None, x=None, y=None, z=None, **kwargs):
4040
r"""
4141
Grid table data using a "Nearest neighbor" algorithm.
4242
43-
**nearneighbor** reads arbitrarily located (*x,y,z*\ [,\ *w*]) triples
43+
**nearneighbor** reads arbitrarily located (*x*, *y*, *z*\ [, *w*]) triplets
4444
[quadruplets] and uses a nearest neighbor algorithm to assign a weighted
4545
average value to each node that has one or more data points within a search
4646
radius centered on the node with adequate coverage across a subset of the
@@ -67,7 +67,7 @@ def nearneighbor(data=None, x=None, y=None, z=None, **kwargs):
6767
Only the closest point in each sector (red circles) contribute to the
6868
weighted estimate.
6969
70-
Takes a matrix, xyz triples, or a file name as input.
70+
Takes a matrix, (x, y, z) triplets, or a file name as input.
7171
7272
Must provide either ``data`` or ``x``, ``y``, and ``z``.
7373

pygmt/src/plot3d.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ def plot3d(
5858
r"""
5959
Plot lines, polygons, and symbols in 3-D.
6060
61-
Takes a matrix, (x,y,z) triplets, or a file name as input and plots
61+
Takes a matrix, (x, y, z) triplets, or a file name as input and plots
6262
lines, polygons, or symbols at those locations in 3-D.
6363
64-
Must provide either ``data`` or ``x``/``y``/``z``.
64+
Must provide either ``data`` or ``x``, ``y``, and ``z``.
6565
66-
If providing data through ``x/y/z``, ``fill`` can be a 1d array
67-
that will be mapped to a colormap.
66+
If providing data through ``x``, ``y``, and ``z``, ``fill`` can be a
67+
1d array that will be mapped to a colormap.
6868
6969
If a symbol is selected and no symbol size given, then plot3d will
7070
interpret the fourth column of the input data as symbol size. Symbols

pygmt/src/project.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def project(data=None, x=None, y=None, z=None, outfile=None, **kwargs):
4343
the input (beyond the required :math:`x` and :math:`y` columns).
4444
4545
Alternatively, ``project`` may be used to generate
46-
:math:`(r, s, p)` triples at equal increments along a profile using the
46+
:math:`(r, s, p)` triplets at equal increments along a profile using the
4747
``generate`` parameter. In this case, the value of ``data`` is ignored
4848
(you can use, e.g., ``data=None``).
4949

pygmt/src/surface.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ def surface(data=None, x=None, y=None, z=None, **kwargs):
3636
r"""
3737
Grids table data using adjustable tension continuous curvature splines.
3838
39-
Surface reads randomly-spaced (x,y,z) triples and produces gridded values
40-
z(x,y) by solving:
39+
Surface reads randomly-spaced (x, y, z) triplets and produces gridded
40+
values z(x,y) by solving:
4141
4242
.. math:: (1 - t)\nabla^2(z)+t\nabla(z) = 0
4343
4444
where :math:`t` is a tension factor between 0 and 1, and :math:`\nabla`
4545
indicates the Laplacian operator.
4646
47-
Takes a matrix, xyz triples, or a file name as input.
47+
Takes a matrix, (x, y, z) triplets, or a file name as input.
4848
4949
Must provide either ``data`` or ``x``, ``y``, and ``z``.
5050

pygmt/src/wiggle.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ def wiggle(self, data=None, x=None, y=None, z=None, **kwargs):
3636
r"""
3737
Plot z=f(x,y) anomalies along tracks.
3838
39-
Takes a matrix, (x,y,z) triplets, or a file name as input and plots z as a
40-
function of distance along track.
39+
Takes a matrix, (x, y, z) triplets, or a file name as input and plots z
40+
as a function of distance along track.
4141
42-
Must provide either ``data`` or ``x``/``y``/``z``.
42+
Must provide either ``data`` or ``x``, ``y``, and ``z``.
4343
4444
Full option list at :gmt-docs:`wiggle.html`
4545

0 commit comments

Comments
 (0)