Merge remote-tracking branch 'origin/master'

polca · Aug 21, 2024 · 21613be · 21613be
2 parents 0565384 + 619265f
commit 21613be
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/premise/transport.py b/premise/transport.py
@@ -631,13 +631,25 @@ def adjust_battery_size(self, ds):
         size = [s for s in self.battery_size["truck"] if s in ds["name"]][0]
 
         if self.year < min(self.battery_size["truck"][size].keys()):
-            mean_battery_size = self.battery_size["truck"][size][min(self.battery_size["truck"][size]["mean"].keys())]
-            min_battery_size = self.battery_size["truck"][size][min(self.battery_size["truck"][size]["min"].keys())]
-            max_battery_size = self.battery_size["truck"][size][min(self.battery_size["truck"][size]["max"].keys())]
+            mean_battery_size = self.battery_size["truck"][size][
+                min(self.battery_size["truck"][size]["mean"].keys())
+            ]
+            min_battery_size = self.battery_size["truck"][size][
+                min(self.battery_size["truck"][size]["min"].keys())
+            ]
+            max_battery_size = self.battery_size["truck"][size][
+                min(self.battery_size["truck"][size]["max"].keys())
+            ]
         elif self.year > max(self.battery_size["truck"][size].keys()):
-            mean_battery_size = self.battery_size["truck"][size][max(self.battery_size["truck"][size]["mean"].keys())]
-            min_battery_size = self.battery_size["truck"][size][max(self.battery_size["truck"][size]["min"].keys())]
-            max_battery_size = self.battery_size["truck"][size][max(self.battery_size["truck"][size]["max"].keys())]
+            mean_battery_size = self.battery_size["truck"][size][
+                max(self.battery_size["truck"][size]["mean"].keys())
+            ]
+            min_battery_size = self.battery_size["truck"][size][
+                max(self.battery_size["truck"][size]["min"].keys())
+            ]
+            max_battery_size = self.battery_size["truck"][size][
+                max(self.battery_size["truck"][size]["max"].keys())
+            ]
         else:
             mean_battery_size = np.interp(
                 self.year,