-
Notifications
You must be signed in to change notification settings - Fork 235
Wrap blockmean #1092
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.
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
Wrap blockmean #1092
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
7568f8e
Refactor blockmedian to support mean and mode
fa4a049
Rename blockmedian.py to blockm.py
b80af1f
Wrap method blockmean
43b8a40
Add tests for blockmean method
ebcec0a
Merge branch 'master' into blockm
6cce446
Remove blockmode mentions
344f9cd
Merge branch 'master' into blockm
b161292
Merge branch 'master' into blockm
ea573a5
Add aspatial alias
62a763b
Add parameters to blockm docstring
55a97be
Only describe block_method in params
f34e778
Move internal function to top of module
ff5c49e
Merge branch 'master' into blockm
4b66eb6
Merge branch 'master' into blockm
seisman 47e7210
Merge branch 'master' into blockm
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,6 +67,7 @@ Operations on tabular data: | |
| .. autosummary:: | ||
| :toctree: generated | ||
|
|
||
| blockmean | ||
| blockmedian | ||
| surface | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,215 @@ | ||
| """ | ||
| blockm - Block average (x,y,z) data tables by mean or median estimation. | ||
| """ | ||
| import pandas as pd | ||
| from pygmt.clib import Session | ||
| from pygmt.exceptions import GMTInvalidInput | ||
| from pygmt.helpers import ( | ||
| GMTTempFile, | ||
| build_arg_string, | ||
| data_kind, | ||
| dummy_context, | ||
| fmt_docstring, | ||
| kwargs_to_strings, | ||
| use_alias, | ||
| ) | ||
|
|
||
|
|
||
| @fmt_docstring | ||
| @use_alias( | ||
| I="spacing", | ||
| R="region", | ||
| V="verbose", | ||
| a="aspatial", | ||
| f="coltypes", | ||
| r="registration", | ||
| ) | ||
| @kwargs_to_strings(R="sequence") | ||
| def blockmean(table, outfile=None, **kwargs): | ||
| r""" | ||
| Block average (x,y,z) data tables by mean estimation. | ||
| Reads arbitrarily located (x,y,z) triples [or optionally weighted | ||
| quadruples (x,y,z,w)] from a table and writes to the output a mean | ||
| position and value for every non-empty block in a grid region defined by | ||
| the ``region`` and ``spacing`` parameters. | ||
| Full option list at :gmt-docs:`blockmean.html` | ||
| {aliases} | ||
| Parameters | ||
| ---------- | ||
| table : pandas.DataFrame or str | ||
| Either a pandas dataframe with (x, y, z) or (longitude, latitude, | ||
| elevation) values in the first three columns, or a file name to an | ||
| ASCII data table. | ||
| spacing : str | ||
| *xinc*\[\ *unit*\][**+e**\|\ **n**] | ||
| [/*yinc*\ [*unit*][**+e**\|\ **n**]]. | ||
| *xinc* [and optionally *yinc*] is the grid spacing. | ||
| region : str or list | ||
| *xmin/xmax/ymin/ymax*\[\ **+r**\][**+u**\ *unit*]. | ||
| Specify the region of interest. | ||
| outfile : str | ||
| Required if ``table`` is a file. The file name for the output ASCII | ||
| file. | ||
| {V} | ||
| {a} | ||
| {f} | ||
| {r} | ||
| Returns | ||
| ------- | ||
| output : pandas.DataFrame or None | ||
| Return type depends on whether the ``outfile`` parameter is set: | ||
| - :class:`pandas.DataFrame` table with (x, y, z) columns if ``outfile`` | ||
| is not set | ||
| - None if ``outfile`` is set (filtered output will be stored in file | ||
| set by ``outfile``) | ||
| """ | ||
| return _blockm(block_method="blockmean", table=table, outfile=outfile, **kwargs) | ||
|
|
||
|
|
||
| @fmt_docstring | ||
| @use_alias( | ||
| I="spacing", | ||
| R="region", | ||
| V="verbose", | ||
| a="aspatial", | ||
| f="coltypes", | ||
| r="registration", | ||
| ) | ||
| @kwargs_to_strings(R="sequence") | ||
| def blockmedian(table, outfile=None, **kwargs): | ||
| r""" | ||
| Block average (x,y,z) data tables by median estimation. | ||
| Reads arbitrarily located (x,y,z) triples [or optionally weighted | ||
| quadruples (x,y,z,w)] from a table and writes to the output a median | ||
| position and value for every non-empty block in a grid region defined by | ||
| the ``region`` and ``spacing`` parameters. | ||
| Full option list at :gmt-docs:`blockmedian.html` | ||
| {aliases} | ||
| Parameters | ||
| ---------- | ||
| table : pandas.DataFrame or str | ||
| Either a pandas dataframe with (x, y, z) or (longitude, latitude, | ||
| elevation) values in the first three columns, or a file name to an | ||
| ASCII data table. | ||
| spacing : str | ||
| *xinc*\[\ *unit*\][**+e**\|\ **n**] | ||
| [/*yinc*\ [*unit*][**+e**\|\ **n**]]. | ||
| *xinc* [and optionally *yinc*] is the grid spacing. | ||
| region : str or list | ||
| *xmin/xmax/ymin/ymax*\[\ **+r**\][**+u**\ *unit*]. | ||
| Specify the region of interest. | ||
| outfile : str | ||
| Required if ``table`` is a file. The file name for the output ASCII | ||
| file. | ||
| {V} | ||
| {a} | ||
| {f} | ||
| {r} | ||
| Returns | ||
| ------- | ||
| output : pandas.DataFrame or None | ||
| Return type depends on whether the ``outfile`` parameter is set: | ||
| - :class:`pandas.DataFrame` table with (x, y, z) columns if ``outfile`` | ||
| is not set | ||
| - None if ``outfile`` is set (filtered output will be stored in file | ||
| set by ``outfile``) | ||
| """ | ||
| return _blockm(block_method="blockmedian", table=table, outfile=outfile, **kwargs) | ||
|
|
||
|
|
||
| def _blockm(block_method, table, outfile, **kwargs): | ||
| r""" | ||
| Block average (x,y,z) data tables by mean or median estimation. | ||
| Reads arbitrarily located (x,y,z) triples [or optionally weighted | ||
| quadruples (x,y,z,w)] from a table and writes to the output a mean or | ||
| median (depending on ``block_method``) position and value for every | ||
| non-empty block in a grid region defined by the ``region`` and ``spacing`` | ||
| parameters. | ||
seisman marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| Parameters | ||
| ---------- | ||
| block_method : str | ||
| Name of the GMT module to call. Must be "blockmean" or "blockmedian". | ||
| table : pandas.DataFrame or str | ||
| Either a pandas dataframe with (x, y, z) or (longitude, latitude, | ||
| elevation) values in the first three columns, or a file name to an | ||
| ASCII data table. | ||
| outfile : str | ||
| Required if ``table`` is a file. The file name for the output ASCII | ||
| file. | ||
| spacing : str | ||
| *xinc*\[\ *unit*\][**+e**\|\ **n**] | ||
| [/*yinc*\ [*unit*][**+e**\|\ **n**]]. | ||
| *xinc* [and optionally *yinc*] is the grid spacing. | ||
| region : str or list | ||
| *xmin/xmax/ymin/ymax*\[\ **+r**\][**+u**\ *unit*]. | ||
| Specify the region of interest. | ||
| {V} | ||
| {a} | ||
| {f} | ||
| {r} | ||
seisman marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| Returns | ||
| ------- | ||
| output : pandas.DataFrame or None | ||
| Return type depends on whether the ``outfile`` parameter is set: | ||
| - :class:`pandas.DataFrame` table with (x, y, z) columns if ``outfile`` | ||
| is not set | ||
| - None if ``outfile`` is set (filtered output will be stored in file | ||
| set by ``outfile``) | ||
| """ | ||
|
|
||
| kind = data_kind(table) | ||
| with GMTTempFile(suffix=".csv") as tmpfile: | ||
| with Session() as lib: | ||
| if kind == "matrix": | ||
| if not hasattr(table, "values"): | ||
| raise GMTInvalidInput(f"Unrecognized data type: {type(table)}") | ||
| file_context = lib.virtualfile_from_matrix(table.values) | ||
| elif kind == "file": | ||
| if outfile is None: | ||
| raise GMTInvalidInput("Please pass in a str to 'outfile'") | ||
| file_context = dummy_context(table) | ||
| else: | ||
| raise GMTInvalidInput(f"Unrecognized data type: {type(table)}") | ||
|
|
||
| with file_context as infile: | ||
| if outfile is None: | ||
| outfile = tmpfile.name | ||
| arg_str = " ".join([infile, build_arg_string(kwargs), "->" + outfile]) | ||
| lib.call_module(module=block_method, args=arg_str) | ||
|
|
||
| # Read temporary csv output to a pandas table | ||
| if outfile == tmpfile.name: # if user did not set outfile, return pd.DataFrame | ||
| result = pd.read_csv(tmpfile.name, sep="\t", names=table.columns) | ||
| elif outfile != tmpfile.name: # return None if outfile set, output in outfile | ||
| result = None | ||
|
|
||
| return result | ||
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.