-
Notifications
You must be signed in to change notification settings - Fork 18
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
✨ Use xarray internally and move relations/constraints/penaltys to glotaran.model #734
✨ Use xarray internally and move relations/constraints/penaltys to glotaran.model #734
Conversation
Adapt tests a todo Fixed
Fixed DeprecationWarning: Using a DataArray object to construct a variable is ambiguous, please extract the data using the .data property. This will raise a TypeError in 0.19.0.
Sourcery Code Quality Report✅ Merging this PR will increase code quality in the affected files by 0.97%.
Here are some functions in these files that still need a tune-up:
Legend and ExplanationThe emojis denote the absolute quality of the code:
The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request. Please see our documentation here for details on how these metrics are calculated. We are actively working on this report - lots more documentation and extra metrics to come! Help us improve this quality report! |
Kudos, SonarCloud Quality Gate passed! |
Codecov Report
@@ Coverage Diff @@
## staging #734 +/- ##
=========================================
- Coverage 81.7% 79.3% -2.5%
=========================================
Files 79 83 +4
Lines 4024 4127 +103
Branches 706 720 +14
=========================================
- Hits 3291 3274 -17
- Misses 606 728 +122
+ Partials 127 125 -2
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Extensively reviewed in PR #715 but agreed to re-create against a staging branch instead of main to address performance regressions before merging the feature(s) into main.
Benchmark is done. Checkout the benchmark result page. Benchmark diff
|
…otaran.model (#734) * Changed calculate_matrix function to return xarrays * Added relation and constraint to basemodel * Added functions to apply relations and constraints * Removed LabelAndMatrix class * Added relations and constraints tests to base model * Added penalties to base model * Adapted models to changes * Address xarray deprecation warnings Fixed DeprecationWarning: Using a DataArray object to construct a variable is ambiguous, please extract the data using the .data property. This will raise a TypeError in 0.19.0. Co-authored-by: Jörn Weißenborn <[email protected]> Co-authored-by: Joris Snellenburg <[email protected]>
…otaran.model (#734) * Changed calculate_matrix function to return xarrays * Added relation and constraint to basemodel * Added functions to apply relations and constraints * Removed LabelAndMatrix class * Added relations and constraints tests to base model * Added penalties to base model * Adapted models to changes * Address xarray deprecation warnings Fixed DeprecationWarning: Using a DataArray object to construct a variable is ambiguous, please extract the data using the .data property. This will raise a TypeError in 0.19.0. Co-authored-by: Jörn Weißenborn <[email protected]> Co-authored-by: Joris Snellenburg <[email protected]>
…otaran.model (#734) * Changed calculate_matrix function to return xarrays * Added relation and constraint to basemodel * Added functions to apply relations and constraints * Removed LabelAndMatrix class * Added relations and constraints tests to base model * Added penalties to base model * Adapted models to changes * Address xarray deprecation warnings Fixed DeprecationWarning: Using a DataArray object to construct a variable is ambiguous, please extract the data using the .data property. This will raise a TypeError in 0.19.0. Co-authored-by: Jörn Weißenborn <[email protected]> Co-authored-by: Joris Snellenburg <[email protected]>
…otaran.model (glotaran#734) * Changed calculate_matrix function to return xarrays * Added relation and constraint to basemodel * Added functions to apply relations and constraints * Removed LabelAndMatrix class * Added relations and constraints tests to base model * Added penalties to base model * Adapted models to changes * Address xarray deprecation warnings Fixed DeprecationWarning: Using a DataArray object to construct a variable is ambiguous, please extract the data using the .data property. This will raise a TypeError in 0.19.0. Co-authored-by: Jörn Weißenborn <[email protected]> Co-authored-by: Joris Snellenburg <[email protected]>
…otaran.model (#734) * Changed calculate_matrix function to return xarrays * Added relation and constraint to basemodel * Added functions to apply relations and constraints * Removed LabelAndMatrix class * Added relations and constraints tests to base model * Added penalties to base model * Adapted models to changes * Address xarray deprecation warnings Fixed DeprecationWarning: Using a DataArray object to construct a variable is ambiguous, please extract the data using the .data property. This will raise a TypeError in 0.19.0. Co-authored-by: Jörn Weißenborn <[email protected]> Co-authored-by: Joris Snellenburg <[email protected]>
Same as #715 but with the targe branch being
staging
.Author @joernweissenborn
Change summary
DEPRECATION FOR MODELDICTS STILL NEEDED
Checklist
closes #715