From d45bee628e767b1f28f73f9f16b6bdabda2ad40d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 7 Mar 2023 17:25:43 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/build_load_data.py | 5 ++++- scripts/prepare_sector_network.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/build_load_data.py b/scripts/build_load_data.py index 51392f2e..01e3fb1e 100755 --- a/scripts/build_load_data.py +++ b/scripts/build_load_data.py @@ -77,10 +77,13 @@ def load_timeseries(fn, years, countries, powerstatistics=True): pattern = "power_statistics" if powerstatistics else "transparency" pattern = f"_load_actual_entsoe_{pattern}" + def rename(s): - return s[:-len(pattern)] + return s[: -len(pattern)] + def date_parser(x): return dateutil.parser.parse(x, ignoretz=True) + return ( pd.read_csv(fn, index_col=0, parse_dates=[0], date_parser=date_parser) .filter(like=pattern) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 87f148ec..00042d80 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -743,6 +743,7 @@ def prepare_costs(cost_file, config, Nyears): def annuity_factor(v): return annuity(v["lifetime"], v["discount rate"]) + v["FOM"] / 100 + costs["fixed"] = [ annuity_factor(v) * v["investment"] * Nyears for i, v in costs.iterrows() ]