From 1176f80a51ab710d1044f1b5090d4aed0f846ffd Mon Sep 17 00:00:00 2001 From: romainsacchi Date: Mon, 25 Oct 2021 13:38:18 +0000 Subject: [PATCH] Black reformating --- carculator_truck/inventory.py | 2 +- carculator_truck/model.py | 16 ++++++++++++---- setup.py | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/carculator_truck/inventory.py b/carculator_truck/inventory.py index fcbcab5..195a3fa 100644 --- a/carculator_truck/inventory.py +++ b/carculator_truck/inventory.py @@ -6,8 +6,8 @@ import numpy as np import xarray as xr -from scipy import sparse from pypardiso import spsolve +from scipy import sparse from . import DATA_DIR from .background_systems import BackgroundSystemModel diff --git a/carculator_truck/model.py b/carculator_truck/model.py index 4618afa..cea0467 100644 --- a/carculator_truck/model.py +++ b/carculator_truck/model.py @@ -134,7 +134,9 @@ def __init__( if s in self.array.coords["size"].values ], ) - ] *= (1 - 0.67) + ] *= ( + 1 - 0.67 + ) if any( s in self.array.coords["size"].values for s in ["32t", "40t", "60t"] @@ -148,7 +150,9 @@ def __init__( if s in self.array.coords["size"].values ], ) - ] *= (1 - 0.33) + ] *= ( + 1 - 0.33 + ) if self.cycle == "Urban delivery": self.array.loc[dict(parameter="kilometers per year")] *= 1 - 0.39 @@ -166,7 +170,9 @@ def __init__( if s in self.array.coords["size"].values ], ) - ] *= (1 - 0.67) + ] *= ( + 1 - 0.67 + ) if any( s in self.array.coords["size"].values for s in ["32t", "40t", "60t"] @@ -180,7 +186,9 @@ def __init__( if s in self.array.coords["size"].values ], ) - ] *= (1 - 0.33) + ] *= ( + 1 - 0.33 + ) def __call__(self, key): """ diff --git a/setup.py b/setup.py index 953c071..78e5864 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ def package_files(directory): "prettytable", "wurst", "pycountry", - "pypardiso" + "pypardiso", ], url="https://github.com/romainsacchi/carculator_truck", description="Prospective environmental and economic life cycle assessment"