eflips-depot 4.14.0__tar.gz → 4.14.2__tar.gz

{eflips_depot-4.14.0 → eflips_depot-4.14.2}/PKG-INFO

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

{eflips_depot-4.14.0 → eflips_depot-4.14.2}/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.0 → eflips_depot-4.14.2}/eflips/depot/depot.py

@@ -556,6 +556,11 @@ class BaseDispatchStrategy(ABC):
             for proc in vehicle.dwd.active_processes:
                 # Cancel active processes for early departure
                 proc.cancel()
+                # Update the soc of assigned trip if the charging is interrupted
+                current_soc = vehicle.battery.soc
+                trip_delta_soc = trip.start_soc - trip.end_soc
+                trip.start_soc = current_soc
+                trip.end_soc = current_soc - trip_delta_soc
 
             trip.got_early_vehicle = True
             trip.t_got_early_vehicle = env.now
@@ -830,6 +835,7 @@ class DSFirst(BaseDispatchStrategy):
 
 
 class DSSmart(BaseDispatchStrategy):
+    # TODO see what happens if charging process is cancelled for dispatch. Do we need to modify the vehicle schedule soc start as well?
     name = "SMART"
     short_description = "smart"
     tooltip = "Match trips and vehicles using DispatchRating."

{eflips_depot-4.14.0 → eflips_depot-4.14.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "eflips-depot"
-version = "4.14.0"
+version = "4.14.2"
 description = "Depot Simulation for eFLIPS"
 authors = ["Enrico Lauth <enrico.lauth@tu-berlin.de>",
     "Ludger Heide <ludger.heide@tu-berlin.de",