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

CA updates + CA bugfixes + First-Tier contribution analysis tab #1046

Merged
merged 49 commits into from
Dec 17, 2024

Conversation

marc-vdm
Copy link
Member

@marc-vdm marc-vdm commented Sep 22, 2023

3 main items:

  • First tier contribution analysis
  • Update of longstanding feature updates in Contribution Analysis code
  • Bugfixes in Contribution Analysis code

First Tier CA

What this does:
Show contributions of all intermediate flows (products) into the FU and the contributions of the FU itself, read more on the updated wiki page (in this PR)

Example project:
positive_negative_CA.tar.gz
thumbnail_image
Example:
image

Smaller changes

Bugfixes

Known issues

Checklist

  • Keep pull requests small so they can be easily reviewed.
  • Update the documentation, please follow the numpy style guide
  • Update tests.
  • Categorize the PR by setting a good title and adding one of the labels:
    bug, feature, ui, change, documentation, breaking, ci
    as they show up in the changelog
  • Link this PR to related issues.

@marc-vdm marc-vdm added the feature Issues/PRs related to a new feature label Sep 22, 2023
@marc-vdm marc-vdm added this to the 2.10 milestone Sep 22, 2023
@coveralls
Copy link

coveralls commented Sep 22, 2023

Coverage Status

coverage: 53.311% (-0.9%) from 54.185%
when pulling 26b1f14 on marc-vdm:first_level_cont
into 023eb5a on LCA-ActivityBrowser:main.

@marc-vdm marc-vdm mentioned this pull request Nov 8, 2023
@marc-vdm marc-vdm changed the base branch from master to v2.10.0 February 9, 2024 14:08
@marc-vdm marc-vdm changed the base branch from v2.10.0 to minor February 20, 2024 12:32
# Conflicts:
#	activity_browser/controllers/database.py
#	activity_browser/layouts/tabs/LCA_results_tabs.py
@marc-vdm marc-vdm changed the title New Product (first-level) contribution analysis tab First-Tier contribution analysis tab Apr 20, 2024
@marc-vdm marc-vdm removed this from the 2.10 milestone Jun 4, 2024
@marc-vdm marc-vdm changed the base branch from minor to main June 28, 2024 10:20
marc-vdm added 9 commits June 28, 2024 12:40
# Conflicts:
#	activity_browser/controllers/database.py
#	activity_browser/layouts/tabs/LCA_results_tabs.py
# Conflicts:
#	activity_browser/layouts/tabs/LCA_results_tabs.py
Add:
- CA data: use actual total instead of sum(abs)
- CA data: make distinction between positive and negative rest values (LCA-ActivityBrowser#886)
- CA data: sort based on average of row instead of first column (LCA-ActivityBrowser#887)
- CA table: consistent dropping of empty (rest) rows (LCA-ActivityBrowser#1044)
- CA figure: add marker to show total score when both positive and negative results present (LCA-ActivityBrowser#647)
@marc-vdm marc-vdm added this to the 2.11.0 milestone Sep 30, 2024
@marc-vdm marc-vdm mentioned this pull request Oct 2, 2024
7 tasks
@marc-vdm marc-vdm added the bug Issues/PRs related to bugs label Oct 2, 2024
@marc-vdm marc-vdm requested a review from mrvisscher October 2, 2024 15:39
@marc-vdm marc-vdm marked this pull request as ready for review November 26, 2024 08:55
@marc-vdm marc-vdm changed the title First-Tier contribution analysis tab CA updates + CA bugfixes + First-Tier contribution analysis tab Dec 9, 2024
@mrvisscher mrvisscher merged commit a094a50 into LCA-ActivityBrowser:main Dec 17, 2024
9 checks passed
@marc-vdm marc-vdm deleted the first_level_cont branch December 17, 2024 17:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment