Skip to content

Add usage of z value in ternary dataset #2227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seisman merged 6 commits into from
Dec 10, 2022
Merged

Add usage of z value in ternary dataset #2227

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ecd476
Add usage of z value in ternary dataset
michaelgrund Dec 5, 2022
6315316
Merge branch 'main' into update-sample-ternary
michaelgrund Dec 8, 2022
6b5838f
Update test_datasets_samples.py
michaelgrund Dec 8, 2022
9b24b78
Apply suggestions from code review
michaelgrund Dec 9, 2022
33fbd50
Merge branch 'main' into update-sample-ternary
michaelgrund Dec 9, 2022
23979b9
Merge branch 'main' into update-sample-ternary
michaelgrund Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions pygmt/datasets/samples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,16 +369,15 @@ def _load_rock_sample_compositions():
Returns
-------
data : pandas.DataFrame
The data table with columns "water", "air", and "limestone".
The data table with columns "limestone", "water", "air" and "permittivity".
Comment thread
michaelgrund marked this conversation as resolved.
Outdated
"""

fname = which("@ternary.txt", download="c")
return pd.read_csv(
fname,
delim_whitespace=True,
header=None,
names=["water", "air", "limestone"],
usecols=(0, 1, 2),
names=["limestone", "water", "air", "permittivity"],
Comment thread
michaelgrund marked this conversation as resolved.
)


Expand Down
10 changes: 6 additions & 4 deletions pygmt/tests/test_datasets_samples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,11 @@ def test_rock_sample_compositions():
"""
data = load_sample_data(name="rock_compositions")
assert data.shape == (1000, 3)
assert data["limestone"].min() == 0
assert data["limestone"].max() == 1
Comment thread
michaelgrund marked this conversation as resolved.
assert data["water"].min() == 0
assert data["water"].max() == 1
assert data["water"].max() == 0.921
assert data["air"].min() == 0
assert data["air"].max() == 0.921
assert data["limestone"].min() == 0
assert data["limestone"].max() == 0.981
assert data["air"].max() == 0.981
assert data["permittivity"].min() == 1.041
assert data["permittivity"].max() == 70.844