Skip to content

Further improvements to SkillTable and SkillArray #324

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
ecomodeller merged 9 commits into from
Dec 13, 2023
Merged

Further improvements to SkillTable and SkillArray #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fd7bab9
use to_dataframe() outside module
jsmariegaard Dec 11, 2023
9991bb8
replace data container with xarray Dataset and DataArray
jsmariegaard Dec 11, 2023
b26dfb4
extract sel(query=) to new method query, deprecate support of metrics…
jsmariegaard Dec 11, 2023
42bec0d
deprecation warning on tests
jsmariegaard Dec 11, 2023
ea18807
re-introduce deprecated plot_ methods and better docstrings
jsmariegaard Dec 11, 2023
ba83646
dropna(how="all") also on SkillArray
jsmariegaard Dec 12, 2023
4636d99
some renames and other minor adjustments
jsmariegaard Dec 12, 2023
5071718
back to pandas
jsmariegaard Dec 13, 2023
294684a
better docstrings and re-ordering
jsmariegaard Dec 13, 2023
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
4 changes: 2 additions & 2 deletions modelskill/comparison/_collection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ def score(
if skill is None:
return None

df = skill.df
df = skill.to_dataframe()

if n_models == 1:
score = df[metric.__name__].values.mean()
Expand Down Expand Up @@ -1053,7 +1053,7 @@ def taylor(
skill_func = cmp.mean_skill if aggregate_observations else cmp.skill
s = skill_func(metrics=metrics)

df = s.df
df = s.to_dataframe()
ref_std = 1.0 if normalize_std else df.iloc[0]["_std_obs"]

if isinstance(df.index, pd.MultiIndex):
Expand Down
Loading