Skip to content

Commit

Permalink
Black reformating
Browse files Browse the repository at this point in the history
  • Loading branch information
@romainsacchi
romainsacchi committed Aug 29, 2024
1 parent 8baf9e4 commit b6a3712
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 31 deletions.
55 changes: 28 additions & 27 deletions carculator_truck/inventory.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def fill_in_A_matrix(self):
self.A[
:,
self.find_input_indices(("assembly operation, for lorry",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="curb mass") * -1
)
Expand All @@ -42,7 +42,7 @@ def fill_in_A_matrix(self):
self.A[
:,
self.find_input_indices(("frame, blanks and saddle, for lorry",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="glider base mass") * -1
)
Expand All @@ -51,7 +51,7 @@ def fill_in_A_matrix(self):
self.A[
:,
self.find_input_indices(("suspension, for lorry",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(
parameter=[
Expand All @@ -66,7 +66,7 @@ def fill_in_A_matrix(self):
self.A[
:,
self.find_input_indices(("tires and wheels, for lorry",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="wheels and tires mass") * -1
)
Expand All @@ -75,7 +75,7 @@ def fill_in_A_matrix(self):
self.A[
:,
self.find_input_indices(("exhaust system, for lorry",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="exhaust system mass") * -1
)
Expand All @@ -84,7 +84,7 @@ def fill_in_A_matrix(self):
self.A[
:,
self.find_input_indices(("power electronics, for lorry",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="electrical system mass") * -1
)
Expand All @@ -93,23 +93,23 @@ def fill_in_A_matrix(self):
self.A[
:,
self.find_input_indices(("transmission, for lorry",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="transmission mass") * 0.52 * -1
)

self.A[
:,
self.find_input_indices(("gearbox, for lorry",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="transmission mass") * 0.36 * -1
)

self.A[
:,
self.find_input_indices(("retarder, for lorry",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="transmission mass") * 0.12 * -1
)
Expand All @@ -119,7 +119,7 @@ def fill_in_A_matrix(self):
self.A[
:,
self.find_input_indices(("other components, for hybrid electric lorry",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="other components mass")
* (self.array.sel(parameter="combustion power") > 0)
Expand All @@ -130,7 +130,7 @@ def fill_in_A_matrix(self):
self.A[
:,
self.find_input_indices(("other components, for electric lorry",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="other components mass")
* (self.array.sel(parameter="combustion power") == 0)
Expand All @@ -140,7 +140,7 @@ def fill_in_A_matrix(self):
self.A[
:,
self.find_input_indices(("glider lightweighting",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="lightweighting")
* self.array.sel(parameter="glider base mass")
Expand All @@ -154,7 +154,7 @@ def fill_in_A_matrix(self):
excludes=("CH",),
excludes_in=1,
),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = -1 * (
self.array.sel(parameter="gross mass")
* (self.array.sel(parameter="gross mass") < 26000)
Expand All @@ -165,7 +165,7 @@ def fill_in_A_matrix(self):
self.A[
:,
self.find_input_indices(contains=("maintenance, lorry 28 metric ton",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = -1 * (
self.array.sel(parameter="gross mass")
* np.where(self.array.sel(parameter="gross mass") < 26000, 0, 1)
Expand All @@ -177,7 +177,7 @@ def fill_in_A_matrix(self):
self.A[
:,
self.find_input_indices(contains=("maintenance, lorry 40 metric ton",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = -1 * (
self.array.sel(parameter="gross mass")
* (self.array.sel(parameter="gross mass") >= 40000)
Expand All @@ -191,7 +191,7 @@ def fill_in_A_matrix(self):
self.find_input_indices(
("market for converter, for electric passenger car",)
),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="converter mass") * -1
)
Expand All @@ -201,7 +201,7 @@ def fill_in_A_matrix(self):
self.find_input_indices(
("market for electric motor, electric passenger car",)
),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="electric engine mass") * -1
)
Expand All @@ -211,7 +211,7 @@ def fill_in_A_matrix(self):
self.find_input_indices(
("market for inverter, for electric passenger car",)
),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="inverter mass") * -1
)
Expand All @@ -221,15 +221,15 @@ def fill_in_A_matrix(self):
self.find_input_indices(
("market for power distribution unit, for electric passenger car",)
),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="power distribution unit mass") * -1
)

self.A[
:,
self.find_input_indices(("internal combustion engine, for lorry",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
self.array.sel(parameter="combustion engine mass") * -1
)
Expand All @@ -245,7 +245,7 @@ def fill_in_A_matrix(self):
self.A[
:,
self.find_input_indices(("lead acid battery, for lorry",)),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = (
16.0 # kg/battery
* (
Expand All @@ -261,11 +261,12 @@ def fill_in_A_matrix(self):
:,
self.find_input_indices(("fuel tank, for diesel vehicle",)),
[
j for i, j in self.inputs.items()
j
for i, j in self.inputs.items()
if i[0].startswith("truck, ")
and "EV-d" in i[0]
and "battery" not in i[0]
]
],
] = (
self.array.sel(
parameter="fuel tank mass",
Expand All @@ -287,7 +288,7 @@ def fill_in_A_matrix(self):
self.find_input_indices(
contains=("treatment of used lorry, 16 metric ton",)
),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = 1 * (
self.array.sel(parameter="gross mass")
* (self.array.sel(parameter="gross mass") < 26000)
Expand All @@ -300,7 +301,7 @@ def fill_in_A_matrix(self):
self.find_input_indices(
contains=("treatment of used lorry, 28 metric ton",)
),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = -1 * (
self.array.sel(parameter="gross mass")
* np.where(self.array.sel(parameter="gross mass") < 26000, 0, 1)
Expand All @@ -314,7 +315,7 @@ def fill_in_A_matrix(self):
self.find_input_indices(
contains=("treatment of used lorry, 40 metric ton",)
),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
] = -1 * (
self.array.sel(parameter="gross mass")
* (self.array.sel(parameter="gross mass") >= 40000)
Expand Down Expand Up @@ -375,7 +376,7 @@ def fill_in_A_matrix(self):
self.find_input_indices(
"charger, for electric vehicles, level 3, plugin, 200 kW",
),
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")]
[j for i, j in self.inputs.items() if i[0].startswith("truck, ")],
)
] = (
-1
Expand Down
6 changes: 3 additions & 3 deletions carculator_truck/model.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@ def set_battery_chemistry(self):
}

for x in product(
self.array.coords["powertrain"].values,
self.array.coords["size"].values,
self.array.year.values,
self.array.coords["powertrain"].values,
self.array.coords["size"].values,
self.array.year.values,
):
if x not in self.energy_storage["electric"]:
if x[-1] in default_chemistries:
Expand Down
4 changes: 3 additions & 1 deletion tests/test_inventory.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,9 @@ def test_endpoint():
"""Test if the correct impact categories are considered"""
ic = InventoryTruck(tm, method="recipe", indicator="endpoint")
results = ic.calculate_impacts()
assert "climate change: human health" in [i.lower() for i in results.impact_category.values]
assert "climate change: human health" in [
i.lower() for i in results.impact_category.values
]
assert len(results.impact_category.values) == 26

"""Test if it errors properly if an incorrect method type is give"""
Expand Down

0 comments on commit b6a3712

Please sign in to comment.