eflips-depot 4.6.8__tar.gz → 4.6.9__tar.gz

{eflips_depot-4.6.8 → eflips_depot-4.6.9}/PKG-INFO

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

{eflips_depot-4.6.8 → eflips_depot-4.6.9}/eflips/depot/api/private/util.py

@@ -394,6 +394,7 @@ class VehicleSchedule:
             distance=None,
             start_soc=self.departure_soc,
             end_soc=self.arrival_soc,
+            minimal_soc=self.minimal_soc,
             charge_on_track=self.opportunity_charging,
             is_copy=self._is_copy,
         )

{eflips_depot-4.6.8 → eflips_depot-4.6.9}/eflips/depot/filters.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 import warnings
 
-import eflips
 from eflips.settings import globalConstants
-from eflips.helperFunctions import flexprint
+
+import eflips
 
 
 class VehicleFilter:
@@ -245,7 +245,7 @@ class VehicleFilter:
 
         elif globalConstants["depot"]["consumption_calc_mode"] == "soc_given":
             if self.trip.charge_on_track:
-                result = round(vehicle.battery.soc, 5) >= self.trip.start_soc
+                result = round(vehicle.battery.soc, 5) >= self.trip.minimal_soc
             else:
                 required_energy = (
                     self.trip.start_soc - self.trip.end_soc

{eflips_depot-4.6.8 → eflips_depot-4.6.9}/eflips/depot/processes.py

@@ -762,8 +762,6 @@ class ChargeAbstract(VehicleProcess, ABC):
             if called by Charge(sub-)-classes). Leave None for update requests
             from outside the process.
         """
-        self.last_update = self.env.now
-
         if amount is None and (
             self.last_update == self.env.now or self.starts[-1] == self.env.now
         ):
@@ -791,6 +789,7 @@ class ChargeAbstract(VehicleProcess, ABC):
         self.vehicle.battery_logs.append(
             BatteryLog(self.env.now, self.vehicle, event_name)
         )
+        self.last_update = self.env.now
 
 
 class Charge(ChargeAbstract):
@@ -906,9 +905,7 @@ class Charge(ChargeAbstract):
 
         except simpy.Interrupt:
             flexprint("charge interrupted", env=self.env, switch="processes")
-            actual_charging_duration = self.env.now - self.starts[0]
-            actual_charged_energy = (effective_power * actual_charging_duration) / 3600
-            self.update_battery("charge_interrupt", amount=actual_charged_energy)
+            self.update_battery("charge_interrupt")
 
         self.charging_interface.current_power = 0
         self.vehicle.power_logs[self.env.now] = 0

{eflips_depot-4.6.8 → eflips_depot-4.6.9}/eflips/depot/standalone.py

@@ -185,6 +185,7 @@ class SimpleTrip:
         distance,
         start_soc=None,
         end_soc=None,
+        minimal_soc: float | None = None,
         charge_on_track=False,
         is_copy=False,
     ):
@@ -199,6 +200,7 @@ class SimpleTrip:
         self.distance = distance
         self.start_soc = start_soc
         self.end_soc = end_soc
+        self.minimal_soc = minimal_soc
         self.charge_on_track = charge_on_track
         self.is_copy = is_copy
 

{eflips_depot-4.6.8 → eflips_depot-4.6.9}/pyproject.toml

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