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.

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

Jump to bottom

Attribute_weights #252

Merged
merged 33 commits into from
Oct 11, 2023
Merged

Attribute_weights #252

merged 33 commits into from
Oct 11, 2023

Conversation

sarahclaude
Copy link
Collaborator

Pull Request Checklist:

  • This PR addresses an already opened issue (for bug fixes / features)
    • This PR fixes #xyz
  • (If applicable) Documentation has been added / updated (for bug fixes / features).
  • (If applicable) Tests have been added.
  • This PR does not seem to break the templates.
  • HISTORY.rst has been updated (with summary of main changes).
    • Link to issue (:issue:number) and pull request (:pull:number) has been added.

What kind of change does this PR introduce?

New argument attribute_weights to generate_weights:

  • Keys are xscen catalogue attributes
  • Values are either dict (stationary) or xr.DataArray (non-stationary)
  • key word 'others' is recognized to give all not named datasets same value

Does this PR introduce a breaking change?

No

Other information:

@github-actions
Copy link

github-actions bot commented Aug 31, 2023 •
edited by sarahclaude
Loading

Welcome, new contributor!

It appears that this is your first Pull Request. To give credit where it's due, we ask that you add your information to the AUTHORS.rst and .zenodo.json.:

  • The relevant author information has been added to AUTHORS.rst and .zenodo.json.

Please make sure you've read our contributing guide. We look forward to reviewing your Pull Request shortly ✨

@github-actions github-actions bot added the docs label Aug 31, 2023
@github-actions github-actions bot added the CI Modifications to autiomation utilities label Aug 31, 2023
@github-actions github-actions bot removed CI Modifications to autiomation utilities docs labels Sep 8, 2023
RondeauG
RondeauG requested changes Sep 15, 2023
View reviewed changes
HISTORY.rst Outdated Show resolved Hide resolved
HISTORY.rst Outdated Show resolved Hide resolved
xscen/ensembles.py Outdated Show resolved Hide resolved
xscen/ensembles.py Outdated Show resolved Hide resolved
xscen/ensembles.py Show resolved Hide resolved
RondeauG
RondeauG requested changes Sep 26, 2023
View reviewed changes
tests/test_ensembles.py Outdated Show resolved Hide resolved
xscen/ensembles.py Outdated Show resolved Hide resolved
xscen/ensembles.py Outdated Show resolved Hide resolved
xscen/ensembles.py Outdated Show resolved Hide resolved
xscen/ensembles.py Outdated Show resolved Hide resolved
xscen/ensembles.py Outdated Show resolved Hide resolved
xscen/ensembles.py Outdated Show resolved Hide resolved
xscen/ensembles.py Outdated Show resolved Hide resolved
xscen/ensembles.py Show resolved Hide resolved
xscen/ensembles.py Outdated Show resolved Hide resolved
RondeauG
RondeauG reviewed Sep 26, 2023
View reviewed changes
HISTORY.rst Show resolved Hide resolved
sarahclaude and others added 5 commits September 27, 2023 15:22
@sarahclaude @RondeauG
Update tests/test_ensembles.py
1d266c9 
Co-authored-by: RondeauG <38501935+RondeauG@users.noreply.github.com>
@sarahclaude @RondeauG
Update xscen/ensembles.py
e3d68ce 
Co-authored-by: RondeauG <38501935+RondeauG@users.noreply.github.com>
@sarahclaude @RondeauG
Update xscen/ensembles.py
7a3b07e 
Co-authored-by: RondeauG <38501935+RondeauG@users.noreply.github.com>
@sarahclaude @RondeauG
Update xscen/ensembles.py
476ee69 
Co-authored-by: RondeauG <38501935+RondeauG@users.noreply.github.com>
@sarahclaude @RondeauG
Update xscen/ensembles.py
e0b7e54 
Co-authored-by: RondeauG <38501935+RondeauG@users.noreply.github.com>
sarahclaude and others added 8 commits September 27, 2023 15:26
@sarahclaude @RondeauG
Update xscen/ensembles.py
489ca99 
Co-authored-by: RondeauG <38501935+RondeauG@users.noreply.github.com>
@sarahclaude @RondeauG
Update xscen/ensembles.py
066150b 
Co-authored-by: RondeauG <38501935+RondeauG@users.noreply.github.com>
@sarahclaude @RondeauG
Update xscen/ensembles.py
9ddec48 
Co-authored-by: RondeauG <38501935+RondeauG@users.noreply.github.com>
@sarahclaude @RondeauG
Update xscen/ensembles.py
d33bde6 
Co-authored-by: RondeauG <38501935+RondeauG@users.noreply.github.com>
@sarahclaude @RondeauG
Update xscen/ensembles.py
4da37e8 
Co-authored-by: RondeauG <38501935+RondeauG@users.noreply.github.com>
@sarahclaude
add description, remove standardize on horizon/time
eb4bef9
@sarahclaude
Merge branch 'main' into experiement_weights
21d7e0c 
# Conflicts:
#	HISTORY.rst
@sarahclaude
add breaking changes
dd7a3ee
RondeauG
RondeauG approved these changes Oct 10, 2023
View reviewed changes
Copy link
Contributor

@RondeauG RondeauG left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

HISTORY.rst Outdated Show resolved Hide resolved
xscen/ensembles.py Outdated Show resolved Hide resolved
sarahclaude and others added 2 commits October 11, 2023 10:48
@sarahclaude @RondeauG
Update HISTORY.rst
4e9892f 
Co-authored-by: RondeauG <38501935+RondeauG@users.noreply.github.com>
@sarahclaude @RondeauG
Update xscen/ensembles.py
cdd90e6 
Co-authored-by: RondeauG <38501935+RondeauG@users.noreply.github.com>
RondeauG
RondeauG reviewed Oct 11, 2023
View reviewed changes
xscen/ensembles.py Outdated Show resolved Hide resolved
@sarahclaude sarahclaude merged commit 73320db into main Oct 11, 2023
12 checks passed
@sarahclaude sarahclaude deleted the experiement_weights branch October 11, 2023 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RondeauG RondeauG RondeauG approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sarahclaude @RondeauG @Zeitsperre