eflips-depot 4.14.1__py3-none-any.whl → 4.14.2__py3-none-any.whl

eflips/depot/api/private/consumption.py

@@ -121,38 +121,29 @@ class ConsumptionInformation:
             )
 
         # Recover the scales along each of the four axes from the datapoints
+        incline_col_index = self.consumption_lut.columns.index("incline")
+        temperature_col_index = self.consumption_lut.columns.index("t_amb")
+        level_of_loading_col_index = self.consumption_lut.columns.index(
+            "level_of_loading"
+        )
+        speed_col_index = self.consumption_lut.columns.index("mean_speed_kmh")
 
         incline_scale = sorted(
-            set(
-                [
-                    x[self.consumption_lut.columns.index("incline")]
-                    for x in self.consumption_lut.data_points
-                ]
-            )
+            set([x[incline_col_index] for x in self.consumption_lut.data_points])
         )
         temperature_scale = sorted(
-            set(
-                [
-                    x[self.consumption_lut.columns.index("t_amb")]
-                    for x in self.consumption_lut.data_points
-                ]
-            )
+            set([x[temperature_col_index] for x in self.consumption_lut.data_points])
         )
         level_of_loading_scale = sorted(
             set(
                 [
-                    x[self.consumption_lut.columns.index("level_of_loading")]
+                    x[level_of_loading_col_index]
                     for x in self.consumption_lut.data_points
                 ]
             )
         )
         speed_scale = sorted(
-            set(
-                [
-                    x[self.consumption_lut.columns.index("mean_speed_kmh")]
-                    for x in self.consumption_lut.data_points
-                ]
-            )
+            set([x[speed_col_index] for x in self.consumption_lut.data_points])
         )
 
         # Create the 4d array
@@ -168,9 +159,14 @@ class ConsumptionInformation:
         # Fill it with NaNs
         consumption_lut.fill(np.nan)
 
-        for i, (incline, temperature, level_of_loading, speed) in enumerate(
-            self.consumption_lut.data_points
-        ):
+        for (
+            i,
+            data_point,
+        ) in enumerate(self.consumption_lut.data_points):
+            incline = data_point[incline_col_index]
+            temperature = data_point[temperature_col_index]
+            level_of_loading = data_point[level_of_loading_col_index]
+            speed = data_point[speed_col_index]
             consumption_lut[
                 incline_scale.index(incline),
                 temperature_scale.index(temperature),

{eflips_depot-4.14.1.dist-info → eflips_depot-4.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eflips-depot
-Version: 4.14.1
+Version: 4.14.2
 Summary: Depot Simulation for eFLIPS
 License: AGPL-3.0-or-later
 License-File: LICENSE.md

{eflips_depot-4.14.1.dist-info → eflips_depot-4.14.2.dist-info}/RECORD

@@ -2,7 +2,7 @@ eflips/depot/__init__.py,sha256=FCVnYU7aSfR4BNCo722I1V3uU5336qr1tTt-zT6X4UI,1555
 eflips/depot/api/__init__.py,sha256=TDjYjf2h_oBwm3Wmcw1J1RQrV2xct7ETOMsgVZ6c30A,65406
 eflips/depot/api/defaults/default_settings.json,sha256=0eUDTw_rtLQFvthP8oJL93iRXlmAOravAg-4qqGMQAY,5375
 eflips/depot/api/private/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eflips/depot/api/private/consumption.py,sha256=wlC3uKD0H9XjES2Jfow4PTzQ0Jd7fxryIj57H1mY50g,28743
+eflips/depot/api/private/consumption.py,sha256=0wfI3ryfZS9qUqPbJP0okvwY2s6ogylw1PZFyAnCRf4,28915
 eflips/depot/api/private/depot.py,sha256=c4XsRN06PScy4Z4yocqrdvMntmgOZdbIxNT9uuN2lxA,56857
 eflips/depot/api/private/results_to_database.py,sha256=nvWb4jEM5JwPAhvAdiQ-qzxUSawfRNsYfv3twNUFcGs,27348
 eflips/depot/api/private/util.py,sha256=DasTkuGUhlBpY_BtTFWoxSNZU_CRyM3RqEDgO07Eks8,17990
@@ -36,7 +36,7 @@ eflips/depot/simulation.py,sha256=ee0qTzOzG-8ybN36ie_NJallXfC7jUaS9JZvaYFziLs,10
 eflips/depot/smart_charging.py,sha256=C3BYqzn2-OYY4ipXm0ETtavbAM9QXZMYULBpVoChf0E,54311
 eflips/depot/standalone.py,sha256=8O01zEXghFG9zZBu0fUD0sXvbHQ-AXw6RB5M750a_sM,22419
 eflips/depot/validation.py,sha256=TIuY7cQtEJI4H2VVMSuY5IIVkacEEZ67weeMuY3NSAM,7097
-eflips_depot-4.14.1.dist-info/METADATA,sha256=zYruc7Cfvr6eiI0zhuBHRTGp4frAYNW5f7p1zsh8dUo,5961
-eflips_depot-4.14.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-eflips_depot-4.14.1.dist-info/licenses/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.14.1.dist-info/RECORD,,
+eflips_depot-4.14.2.dist-info/METADATA,sha256=UvewbAnnEpknimQuan3FpVOmSmBXAvXmFPtfSxZbUdI,5961
+eflips_depot-4.14.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+eflips_depot-4.14.2.dist-info/licenses/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.14.2.dist-info/RECORD,,