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

Fixing FutureWarning due to groupby(... axis=1 ...) #158

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixing FutureWarning due to groupby(... axis=1 ...) #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 20 additions & 20 deletions pymrio/core/mriosystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,10 +897,10 @@ def calc_system(self, x, Y, Y_agg=None, L=None, G=None, population=None):

if Y_agg is None:
try:
Y_agg = Y.groupby(level="region", axis=1, sort=False).sum()
Y_agg = Y.T.groupby(level="region", sort=False).sum().T

except (AssertionError, KeyError):
Y_agg = Y.groupby(level=0, axis=1, sort=False).sum()
Y_agg = Y.T.groupby(level=0, sort=False).sum().T

y_vec = Y.sum(axis=0)

Expand Down Expand Up @@ -953,9 +953,9 @@ def calc_system(self, x, Y, Y_agg=None, L=None, G=None, population=None):
# F_Y_agg = ioutil.agg_columns(
# ext['F_Y'], self.get_Y_categories().size)
try:
F_Y_agg = self.F_Y.groupby(level="region", axis=1, sort=False).sum()
F_Y_agg = self.F_Y.T.groupby(level="region", sort=False).sum().T
except (AssertionError, KeyError):
F_Y_agg = self.F_Y.groupby(level=0, axis=1, sort=False).sum()
F_Y_agg = self.F_Y.T.groupby(level=0, sort=False).sum().T

if (
(self.D_cba is None)
Expand All @@ -981,34 +981,34 @@ def calc_system(self, x, Y, Y_agg=None, L=None, G=None, population=None):
):
try:
self.D_cba_reg = (
self.D_cba.groupby(level="region", axis=1, sort=False).sum()
self.D_cba.T.groupby(level="region", sort=False).sum().T
+ F_Y_agg
)
except (AssertionError, KeyError):
self.D_cba_reg = (
self.D_cba.groupby(level=0, axis=1, sort=False).sum() + F_Y_agg
self.D_cba.T.groupby(level=0, sort=False).sum().T + F_Y_agg
)
try:
self.D_pba_reg = (
self.D_pba.groupby(level="region", axis=1, sort=False).sum()
self.D_pba.T.groupby(level="region", sort=False).sum().T
+ F_Y_agg
)
except (AssertionError, KeyError):
self.D_pba_reg = (
self.D_pba.groupby(level=0, axis=1, sort=False).sum() + F_Y_agg
self.D_pba.T.groupby(level=0, sort=False).sum().T + F_Y_agg
)
try:
self.D_imp_reg = self.D_imp.groupby(
level="region", axis=1, sort=False
).sum()
self.D_imp_reg = self.D_imp.T.groupby(
level="region", sort=False
).sum().T
except (AssertionError, KeyError):
self.D_imp_reg = self.D_imp.groupby(level=0, axis=1, sort=False).sum()
self.D_imp_reg = self.D_imp.T.groupby(level=0, sort=False).sum().T
try:
self.D_exp_reg = self.D_exp.groupby(
level="region", axis=1, sort=False
).sum()
self.D_exp_reg = self.D_exp.T.groupby(
level="region", sort=False
).sum().T
except (AssertionError, KeyError):
self.D_exp_reg = self.D_exp.groupby(level=0, axis=1, sort=False).sum()
self.D_exp_reg = self.D_exp.T.groupby(level=0, sort=False).sum().T

logging.debug("{} - Accounts D for regions calculated".format(self.name))

Expand Down Expand Up @@ -2171,13 +2171,13 @@ def agg_routine(df):
_index_names = df.index.names
_columns_names = df.columns.names
if (type(df.columns[0]) is not tuple) and df.columns[0].lower() == "unit":
df = df.groupby(df.index, axis=0, sort=False).first()
df = df.groupby(df.index, sort=False).first()
else:
df = (
df.groupby(df.index, axis=0, sort=False)
.sum()
.groupby(df.columns, axis=1, sort=False)
df.groupby(df.index, sort=False)
.sum()
.T.groupby(df.columns, sort=False)
.sum().T
)

if type(df.index[0]) is tuple:
Expand Down
10 changes: 5 additions & 5 deletions pymrio/tools/iomath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,18 +607,18 @@ def calc_gross_trade(

level_spec_Z = "region" if "region" in Z.columns.names else 0
level_spec_Y = "region" if "region" in Y.columns.names else 0
Z_trade_agg = Z_trade_blocks.groupby(axis=1, level=level_spec_Z, sort=False).agg(
Z_trade_agg = Z_trade_blocks.T.groupby(level=level_spec_Z, sort=False).agg(
sum
)
Y_trade_agg = Y_trade_blocks.groupby(axis=1, level=level_spec_Y, sort=False).agg(
).T
Y_trade_agg = Y_trade_blocks.T.groupby(level=level_spec_Y, sort=False).agg(
sum
)
).T

x_bilat = Z_trade_agg + Y_trade_agg

level_spec_x = "sector" if "sector" in x_bilat.index.names else 1
gross_imports = pd.DataFrame(
x_bilat.groupby(axis=0, level=level_spec_x, sort=False)
x_bilat.groupby(level=level_spec_x, sort=False)
.agg(sum)
.stack()
.swaplevel(),
Expand Down
8 changes: 4 additions & 4 deletions pymrio/tools/ioparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1672,23 +1672,23 @@ def parse_oecd(path, year=None):

# aggregate rows
Z.loc[co_name, :] = (
Z.loc[co_name, :] + Z.loc[agg_list, :].groupby(level="sector", axis=0).sum()
Z.loc[co_name, :] + Z.loc[agg_list, :].groupby(level="sector").sum()
).values
Z = Z.drop(agg_list, axis=0)
Y.loc[co_name, :] = (
Y.loc[co_name, :] + Y.loc[agg_list, :].groupby(level="sector", axis=0).sum()
Y.loc[co_name, :] + Y.loc[agg_list, :].groupby(level="sector").sum()
).values
Y = Y.drop(agg_list, axis=0)

# aggregate columns
Z.loc[:, co_name] = (
Z.loc[:, co_name] + Z.loc[:, agg_list].groupby(level="sector", axis=1).sum()
Z.loc[:, co_name] + Z.loc[:, agg_list].T.groupby(level="sector").sum().T
).values
Z = Z.drop(agg_list, axis=1)

F_factor_input.loc[:, co_name] = (
F_factor_input.loc[:, co_name]
+ F_factor_input.loc[:, agg_list].groupby(level="sector", axis=1).sum()
+ F_factor_input.loc[:, agg_list].T.groupby(level="sector").sum().T
).values
F_factor_input = F_factor_input.drop(agg_list, axis=1)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ def test_direct_account_calc(fix_testmrio):

new = orig.copy().rename_regions({"reg3": "ll", "reg4": "aa"})

Y_agg = new.Y.groupby(axis=1, level="region", sort=False).agg(sum)
Y_agg = new.Y.T.groupby(level="region", sort=False).agg(sum).T

(D_cba, D_pba, D_imp, D_exp) = pymrio.calc_accounts(new.emissions.S, new.L, Y_agg)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_math.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ def test_calc_accounts_MRIO(td_small_MRIO):
nD_cba, nD_pba, nD_imp, nD_exp = calc_accounts(
td_small_MRIO.S,
td_small_MRIO.L,
td_small_MRIO.Y.groupby(level="region", axis=1, sort=False).sum(),
td_small_MRIO.Y.T.groupby(level="region", sort=False).sum().T,
)
# test all

Expand Down
Loading