From f16430d30c2adf08aa2cdf64e8c05cadb8ebf2f0 Mon Sep 17 00:00:00 2001 From: romainsacchi Date: Wed, 8 Sep 2021 16:38:31 +0000 Subject: [PATCH] Black reformating --- carculator_truck/inventory.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/carculator_truck/inventory.py b/carculator_truck/inventory.py index 4dd44b6..068bef1 100644 --- a/carculator_truck/inventory.py +++ b/carculator_truck/inventory.py @@ -5242,14 +5242,10 @@ def set_inputs_in_A_matrix(self, array): ], -self.number_of_cars :, ] = ( - ( - array[self.array_inputs["energy battery mass"], :] - * ( - 1 - + array[ - self.array_inputs["battery lifetime replacements"]] - ) - ) + ( + array[self.array_inputs["energy battery mass"], :] + * (1 + array[self.array_inputs["battery lifetime replacements"]]) + ) / array[self.array_inputs["lifetime kilometers"]] / (array[self.array_inputs["total cargo mass"]] / 1000) ) @@ -6756,13 +6752,8 @@ def set_inputs_in_A_matrix_for_export(self, array): ) ], -self.number_of_cars :, - ] = ( - array[self.array_inputs["energy battery mass"], :] - * ( - 1 - + array[ - self.array_inputs["battery lifetime replacements"]] - ) + ] = array[self.array_inputs["energy battery mass"], :] * ( + 1 + array[self.array_inputs["battery lifetime replacements"]] ) # Noise emissions