eflips-depot 4.6.0__py3-none-any.whl → 4.6.1__py3-none-any.whl

eflips/depot/api/private/consumption.py

@@ -151,6 +151,7 @@ def find_charger_occupancy(
     charging_events = (
         session.query(Event)
         .filter(
+            Event.event_type == EventType.CHARGING_OPPORTUNITY,
             Event.station_id == station.id,
             Event.time_start < time_end,
             Event.time_end > time_start,
@@ -379,7 +380,43 @@ def attempt_opportunity_charging_event(
             timeseries=timeseries,
         )
         session.add(current_event)
-        session.flush()
+
+        # If there is time between the previous trip's end and the charging event's start, add a STANDBY event
+        if time_event_start > previous_trip.arrival_time:
+            standby_event = Event(
+                scenario_id=vehicle.scenario_id,
+                vehicle_type_id=vehicle.vehicle_type_id,
+                vehicle=vehicle,
+                station_id=previous_trip.route.arrival_station_id,
+                time_start=previous_trip.arrival_time,
+                time_end=time_event_start,
+                soc_start=charge_start_soc,  # SoC is unchanged while in STANDBY
+                soc_end=charge_start_soc,
+                event_type=EventType.STANDBY,
+                description=f"Standby event before charging after trip {previous_trip.id}.",
+                timeseries=None,
+            )
+            session.add(standby_event)
+
+        # If there is time between the charging event's end and the next trip's start, add a STANDBY_DEPARTURE event
+        if time_event_end < next_trip.departure_time:
+            standby_departure_event = Event(
+                scenario_id=vehicle.scenario_id,
+                vehicle_type_id=vehicle.vehicle_type_id,
+                vehicle=vehicle,
+                station_id=previous_trip.route.arrival_station_id,
+                time_start=time_event_end,
+                time_end=next_trip.departure_time,
+                soc_start=soc_event_end,  # SoC is unchanged while in STANDBY
+                soc_end=soc_event_end,
+                event_type=EventType.STANDBY_DEPARTURE,
+                description=(
+                    f"Standby departure event after charging, before trip {next_trip.id}."
+                ),
+                timeseries=None,
+            )
+            session.add(standby_departure_event)
+
         return soc_event_end
 
     else:

{eflips_depot-4.6.0.dist-info → eflips_depot-4.6.1.dist-info}/METADATA

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

{eflips_depot-4.6.0.dist-info → eflips_depot-4.6.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ eflips/depot/__init__.py,sha256=RQ_UKNrGWA6q17TZFu86ai8pC7qCpcbmAgVKh7aImwo,1613
 eflips/depot/api/__init__.py,sha256=Sxsqj5qIcSK-dqtE2UqaHVWEWnycU65N-pDnLuTJfeU,48244
 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=EbWuQnCXVXU3jAPbcig4OunZBJ6-pUCtVwPwWssjf8E,14769
+eflips/depot/api/private/consumption.py,sha256=WIsXTPSC-GEnzzAeojHv80ylosdKghYjZp0-HAKIsto,16593
 eflips/depot/api/private/depot.py,sha256=v5Edb0sQP2QNIyBLvccVzAK9_kxCszar0cOu5ciFyrw,40780
 eflips/depot/api/private/results_to_database.py,sha256=Sh2VJ3k60QJ5RGkc8sw-7XbljiMe65EHeoagKIpYlHM,24585
 eflips/depot/api/private/smart_charging.py,sha256=MQ9fXdKByHAz6RSKXYcpJXDBccdJKZ2qGReCHagVCyo,13033
@@ -37,7 +37,7 @@ eflips/depot/simulation.py,sha256=ee0qTzOzG-8ybN36ie_NJallXfC7jUaS9JZvaYFziLs,10
 eflips/depot/smart_charging.py,sha256=C3BYqzn2-OYY4ipXm0ETtavbAM9QXZMYULBpVoChf0E,54311
 eflips/depot/standalone.py,sha256=VxcTzBaB67fNJUMmjPRwKXjhqTy6oQ41Coote2LvAmk,22338
 eflips/depot/validation.py,sha256=TIuY7cQtEJI4H2VVMSuY5IIVkacEEZ67weeMuY3NSAM,7097
-eflips_depot-4.6.0.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.6.0.dist-info/METADATA,sha256=yWVUD74eqK640IbC6LoH_Ko0INybTuxU3KEuBqP3LjY,5940
-eflips_depot-4.6.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-eflips_depot-4.6.0.dist-info/RECORD,,
+eflips_depot-4.6.1.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.6.1.dist-info/METADATA,sha256=NE2AQv4V2D92MnSOVSNP4doVRPO1aCSYVmqezpQnggM,5940
+eflips_depot-4.6.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+eflips_depot-4.6.1.dist-info/RECORD,,