Skip to content

Commit a1855a2

Browse files
Add usage of z value in ternary dataset (#2227)
Co-authored-by: Yvonne Fröhlich <[email protected]>
1 parent 09ce111 commit a1855a2

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

pygmt/datasets/samples.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,16 +369,16 @@ def _load_rock_sample_compositions():
369369
Returns
370370
-------
371371
data : pandas.DataFrame
372-
The data table with columns "water", "air", and "limestone".
372+
The data table with columns "limestone", "water", "air",
373+
and "permittivity".
373374
"""
374375

375376
fname = which("@ternary.txt", download="c")
376377
return pd.read_csv(
377378
fname,
378379
delim_whitespace=True,
379380
header=None,
380-
names=["water", "air", "limestone"],
381-
usecols=(0, 1, 2),
381+
names=["limestone", "water", "air", "permittivity"],
382382
)
383383

384384

pygmt/tests/test_datasets_samples.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,12 @@ def test_rock_sample_compositions():
185185
Check that the @ternary.txt dataset loads without errors.
186186
"""
187187
data = load_sample_data(name="rock_compositions")
188-
assert data.shape == (1000, 3)
188+
assert data.shape == (1000, 4)
189+
assert data["limestone"].min() == 0
190+
assert data["limestone"].max() == 1
189191
assert data["water"].min() == 0
190-
assert data["water"].max() == 1
192+
assert data["water"].max() == 0.921
191193
assert data["air"].min() == 0
192-
assert data["air"].max() == 0.921
193-
assert data["limestone"].min() == 0
194-
assert data["limestone"].max() == 0.981
194+
assert data["air"].max() == 0.981
195+
assert data["permittivity"].min() == 1.041
196+
assert data["permittivity"].max() == 70.844

0 commit comments

Comments
 (0)