Skip to content

Commit

Permalink
Merge branch 'conc_fix'
Browse files Browse the repository at this point in the history
  • Loading branch information
konstantinstadler committed Mar 2, 2021
2 parents 8b865dc + 57ab095 commit eba2f13
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 3 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
Changelog
#########

***************************
v0.4.5 (March 03, 2021)
***************************

Bugfixes
========

* Index sorting consistent for all characterized impacts


***************************
v0.4.4 (February 26, 2021)
***************************
Expand Down
4 changes: 3 additions & 1 deletion doc/source/notebooks/stressor_characterization.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# extension: .py
# format_name: light
# format_version: '1.5'
# jupytext_version: 1.10.0
# jupytext_version: 1.10.2
# kernelspec:
# display_name: Python 3
# language: python
Expand Down Expand Up @@ -36,6 +36,7 @@

import pandas as pd


import pymrio
from pymrio.core.constants import PYMRIO_PATH # noqa

Expand Down Expand Up @@ -172,3 +173,4 @@
# For further information see the characterization docstring:

print(io.emissions.characterize.__doc__)

3 changes: 2 additions & 1 deletion pymrio/core/mriosystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -1628,13 +1628,14 @@ def characterize(
name=name,
unit=units,
**{
acc: calc_matrix @ self.__dict__[acc]
acc: (calc_matrix @ self.__dict__[acc]).reindex(units.index)
for acc in set(
self.get_DataFrame(data=False, with_unit=False)
).difference(set(self.__coefficients__))
},
)


if _meta:
_meta._add_modify(
f"Calculated characterized accounts {name} from {self.name}"
Expand Down
2 changes: 1 addition & 1 deletion pymrio/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.4.4"
__version__ = "0.4.4d"

0 comments on commit eba2f13

Please sign in to comment.