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 additive radar-CML merging with IDW and with Krignig, plus example data #3

Merged
merged 37 commits into from
Sep 12, 2024

Conversation

eoydvin
Copy link
Contributor

@eoydvin eoydvin commented Jul 25, 2024

This PR implements parts of what is discussed in #2

  • creates 5min aggregated CML, rain gauge and radar data for the openmerge dataset

src/mergeplg/merge.py:

  • first implementation of merging

src/mergeplg/interpolator.py and src/mergeplg/idw.py:

  • IDW interpolator functions from python

eoydvin added 29 commits July 25, 2024 14:01
 - creates 5min aggregated CML, rain gauge and radar data for the openmerge dataset

src/mergeplg/merge.py:
 - first implementation of merging

src/mergeplg/interpolator.py and src/mergeplg/idw.py:
 - IDW interpolator functions from python
 - changed 'import mergeplg' to 'import mergeplg.merge'

src/mergeplg/idw.py:
 - replaced np.NaN with np.nan

src/mergeplg/interpolator.py and src/mergeplg/merge.py
 - changed idw import to relative import
 - Move estimate_kriging_parameters to notebook.
 - Write docstrings to functions W.I.P.
… from nox without doing gid add for every step
Copy link

codecov bot commented Jul 31, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (main@c39e20c). Learn more about missing BASE report.

Additional details and impacted files
@@           Coverage Diff            @@
##             main        #3   +/-   ##
========================================
  Coverage        ?   100.00%           
========================================
  Files           ?         2           
  Lines           ?        89           
  Branches        ?         0           
========================================
  Hits            ?        89           
  Misses          ?         0           
  Partials        ?         0           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@cchwala
Copy link
Member

cchwala commented Aug 2, 2024

A lot of green check marks now! 🎉

Thanks @eoydvin. I will look into the details next week.

@cchwala
Copy link
Member

cchwala commented Aug 2, 2024

You can remove the pypy-3.10 test runs (I guess somewhere in the CI config). We do not test pypy in poligrain.

@eoydvin eoydvin closed this Aug 2, 2024
@eoydvin eoydvin reopened this Aug 2, 2024
@eoydvin
Copy link
Contributor Author

eoydvin commented Aug 2, 2024

I also have some KED prototype files now, but then the tests will not run anymore. Should we just keep it like this for now then?

@cchwala
Copy link
Member

cchwala commented Aug 5, 2024

Yes. Let's keep this PR focused on what you already have and add KED in another PR.

I will have a look this week.

@cchwala cchwala changed the title Prototype files for merging Add additive radar-CML merging with IDW and with Krignig, plus example data Aug 7, 2024
@cchwala
Copy link
Member

cchwala commented Sep 12, 2024

Sorry for the long delay 🙈. I now finally had a quick look at the code and notebook. Looks really good 👏 👏 👏 . Of course, we will have to see/discuss how we define a common higher-level interface for the different functions. But this is a very good starting point. I am merging this now. Once I have my PR #6 ready or merged we should start the discussion about aligning the code, i.e. finding the mentioned common "interface".

@cchwala cchwala merged commit 573cd97 into OpenSenseAction:main Sep 12, 2024
24 of 27 checks passed
cchwala added a commit to cchwala/opensense_example_data that referenced this pull request Oct 18, 2024
This data was produced and added in mergeplg via OpenSenseAction/mergeplg#3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

2 participants