eflips-depot 4.13.4__py3-none-any.whl → 4.13.5__py3-none-any.whl

eflips/depot/api/private/consumption.py

@@ -106,26 +106,54 @@ class ConsumptionInformation:
         :return: The energy consumption in kWh. This is already the consumption for the whole trip.
         """
 
-        # Make sure the consumption lut has 4 dimensions and the columns are in the correct order
-        if self.consumption_lut.columns != [
-            "incline",
-            "t_amb",
-            "level_of_loading",
-            "mean_speed_kmh",
-        ]:
+        # Make sure the consumption lut has 4 dimensions with the correct columns
+        if not all(
+            col in self.consumption_lut.columns
+            for col in [
+                "incline",
+                "t_amb",
+                "level_of_loading",
+                "mean_speed_kmh",
+            ]
+        ):
             raise ValueError(
                 "The consumption LUT must have the columns 'incline', 't_amb', 'level_of_loading', 'mean_speed_kmh'"
             )
 
         # Recover the scales along each of the four axes from the datapoints
-        incline_scale = sorted(set([x[0] for x in self.consumption_lut.data_points]))
+
+        incline_scale = sorted(
+            set(
+                [
+                    x[self.consumption_lut.columns.index("incline")]
+                    for x in self.consumption_lut.data_points
+                ]
+            )
+        )
         temperature_scale = sorted(
-            set([x[1] for x in self.consumption_lut.data_points])
+            set(
+                [
+                    x[self.consumption_lut.columns.index("t_amb")]
+                    for x in self.consumption_lut.data_points
+                ]
+            )
         )
         level_of_loading_scale = sorted(
-            set([x[2] for x in self.consumption_lut.data_points])
+            set(
+                [
+                    x[self.consumption_lut.columns.index("level_of_loading")]
+                    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
+                ]
+            )
         )
-        speed_scale = sorted(set([x[3] for x in self.consumption_lut.data_points]))
 
         # Create the 4d array
         consumption_lut = np.zeros(
@@ -286,6 +314,14 @@ def extract_trip_information(
         temperature = temperature_for_trip(trip_id, session)
 
         payload_mass = passenger_mass * passenger_count
+        assert (
+            trip.rotation.vehicle_type.allowed_mass is not None
+        ), f"allowed_mass of vehicle {trip.rotation.vehicle_type} must be set"
+
+        assert (
+            trip.rotation.vehicle_type.empty_mass is not None
+        ), f"empty_mass of vehicle {trip.rotation.vehicle_type} must be set"
+
         full_payload = (
             trip.rotation.vehicle_type.allowed_mass
             - trip.rotation.vehicle_type.empty_mass

{eflips_depot-4.13.4.dist-info → eflips_depot-4.13.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eflips-depot
-Version: 4.13.4
+Version: 4.13.5
 Summary: Depot Simulation for eFLIPS
 License: AGPL-3.0-or-later
 Author: Enrico Lauth

{eflips_depot-4.13.4.dist-info → eflips_depot-4.13.5.dist-info}/RECORD

@@ -2,7 +2,7 @@ eflips/depot/__init__.py,sha256=I42xmkE7GDZfoZeSn_ey85sYGI7xyGqAt6Xd4UZpHLw,2872
 eflips/depot/api/__init__.py,sha256=I0KQ_lDAWWPaH4HJfNLPxkv2eFKai9by2WqX0AKNsP4,58571
 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=ICgToPQtUBvVhTwz5_oVrNKRUnM_0HGxWrH4Tby9IQ0,27776
+eflips/depot/api/private/consumption.py,sha256=wlC3uKD0H9XjES2Jfow4PTzQ0Jd7fxryIj57H1mY50g,28743
 eflips/depot/api/private/depot.py,sha256=NLrRBjb-wq7E3hnVAiX08IzUSVjfMV_NgRqzIx53CE0,44120
 eflips/depot/api/private/results_to_database.py,sha256=FBlZRKqAIG80tFyuf5vCGHRycWKYkm53jFxJEk9t1NA,25984
 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.13.4.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.13.4.dist-info/METADATA,sha256=d6pp3rq0_9aYTEzRfdcLgaevh6GiC4BRdHrsYBHU0Po,5936
-eflips_depot-4.13.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-eflips_depot-4.13.4.dist-info/RECORD,,
+eflips_depot-4.13.5.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.13.5.dist-info/METADATA,sha256=Kqpu7ovbq_bx3MkZbE2_SDAqfp9mWkFp2G_hYUWmwBI,5936
+eflips_depot-4.13.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+eflips_depot-4.13.5.dist-info/RECORD,,