Skip to content
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

Add merge option #76

Merged
merged 22 commits into from
Sep 6, 2024
Merged

Add merge option #76

merged 22 commits into from
Sep 6, 2024

Conversation

JackLiang1272
Copy link
Contributor

@JackLiang1272 JackLiang1272 commented Aug 12, 2024

Overview

Add merge option "first", "last", "nearest", and "count" on top of "forward".

Description of changes

Add merge option "first", "last", "nearest", and "count" on top of "forward".
"first" finds the first instance of the event with matching keys. This includes events happened before the predictions.
"last" finds the last instance of the event with matching keys.
"nearest" finds the nearest instance of the event with matching keys. This includes events happened before the predictions.
"count" creates a count column for each possible value of that event type.

Author Checklist

  • Linting passes; run early with pre-commit hook.
  • Tests added for new code and issue being fixed.
  • Added type annotations and full numpy-style docstrings for new methods.
  • Draft your news fragment in new changelog/ISSUE.TYPE.rst files; see changelog/README.md.

@CLAassistant
Copy link

CLAassistant commented Aug 12, 2024

CLA assistant check
All committers have signed the CLA.

src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
tests/data/test_merge_window.py Outdated Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
docs/reference/seismogram.rst Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
src/seismometer/configuration/model.py Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
src/seismometer/data/pandas_helpers.py Outdated Show resolved Hide resolved
@diehlbw diehlbw requested a review from gbowlin August 30, 2024 17:39
src/seismometer/configuration/model.py Outdated Show resolved Hide resolved
docs/reference/seismogram.rst Outdated Show resolved Hide resolved
src/seismometer/configuration/model.py Show resolved Hide resolved
@diehlbw diehlbw merged commit 0839799 into epic-open-source:main Sep 6, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants