eflips-depot 4.3.9__py3-none-any.whl → 4.3.11__py3-none-any.whl

eflips/depot/api/__init__.py

@@ -809,7 +809,7 @@ def generate_realistic_depot_layout(
         for (
             first_last_stop_tup,
             vehicle_type_rotation_dict,
-        ) in group_rotations_by_start_end_stop(scenario.id, session).items():
+        ) in depot_stations_and_vehicle_types.items():
             first_stop, last_stop = first_last_stop_tup
             if first_stop != last_stop:
                 raise ValueError("First and last stop of a rotation are not the same.")
@@ -1005,7 +1005,6 @@ def vehicle_counts_for_direct_layout(
     ret_val: Dict[Station, Dict[VehicleType, int]] = dict()
 
     for depot_id_as_str, ev in depot_evaluations.items():
-        ev = next(iter(depot_evaluations.values()))
         assert isinstance(ev, DepotEvaluation)
         counts: Dict[str, int] = real_peak_vehicle_count(ev)
         # The key of the dictionary is the vehicle type ID as a string. We need to convert it to a vehicle type object
@@ -1500,12 +1499,15 @@ def _add_evaluation_to_database(
     )
 
 
-def insert_dummy_standby_departure_events(depot_id: int, session: Session) -> None:
+def insert_dummy_standby_departure_events(
+    depot_id: int, session: Session, sim_time_end: Optional[datetime.datetime] = None
+) -> None:
     """
     Workaround for the missing STANDBY_DEPARTURE events in the database.
 
     :param session: The database session
     :param scenario: A scenario object
+    :param sim_time_end: The end time of the simulation. If None, final events might not be properly handled.
     :return:
     """
     logger = logging.getLogger(__name__)
@@ -1549,6 +1551,25 @@ def insert_dummy_standby_departure_events(depot_id: int, session: Session) -> No
                 description="Dummy STANDBY_DEPARTURE event",
             )
             session.add(dummy_event)
+        elif next_event is None and sim_time_end is not None:
+            # If the event's end is before the simulation end, insert a dummy STANDBY_DEPARTURE event
+            # From the end of the charging event to the end of the simulation
+            logger.warning("Inserting dummy STANDBY_DEPARTURE event")
+            if charging_event.time_end < sim_time_end:
+                dummy_event = Event(
+                    vehicle_id=charging_event.vehicle_id,
+                    vehicle_type_id=charging_event.vehicle.vehicle_type_id,
+                    time_start=charging_event.time_end,
+                    time_end=sim_time_end,
+                    event_type=EventType.STANDBY_DEPARTURE,
+                    area_id=charging_event.area_id,
+                    subloc_no=charging_event.subloc_no,
+                    scenario_id=charging_event.scenario_id,
+                    soc_start=charging_event.soc_end,
+                    soc_end=charging_event.soc_end,
+                    description="Dummy STANDBY_DEPARTURE event",
+                )
+                session.add(dummy_event)
 
 
 def add_evaluation_to_database(

{eflips_depot-4.3.9.dist-info → eflips_depot-4.3.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eflips-depot
-Version: 4.3.9
+Version: 4.3.11
 Summary: Depot Simulation for eFLIPS
 Home-page: https://github.com/mpm-tu-berlin/eflips-depot
 License: AGPL-3.0-or-later

{eflips_depot-4.3.9.dist-info → eflips_depot-4.3.11.dist-info}/RECORD

@@ -1,5 +1,5 @@
 eflips/depot/__init__.py,sha256=n7jte8R6j_Ad4Mp4hkklKwil5r8u8Q_SbXrCC-nf5jM,1556
-eflips/depot/api/__init__.py,sha256=6voBU0iXtWsIRecVNwI6qF6VVu1w6X-sGrNYZJqWEoA,94478
+eflips/depot/api/__init__.py,sha256=iNr2Qbqce8Qepbls8QVvFg50iDc6VInUQasKO_HBXSw,95664
 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/depot.py,sha256=IpXQR2GuEUuilP02njKpvExgSkktkyHPmcn2j_Q3YPk,21276
@@ -35,7 +35,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.3.9.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.3.9.dist-info/METADATA,sha256=ZuIWECNRnAYrvF4ouXe07NI5CV1Xf_BCzy1xM2NSCIc,5839
-eflips_depot-4.3.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-eflips_depot-4.3.9.dist-info/RECORD,,
+eflips_depot-4.3.11.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.3.11.dist-info/METADATA,sha256=N0Bti0D_U33jdfuwuqNo0NLZcZP15bqdw19joIM65Ho,5840
+eflips_depot-4.3.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+eflips_depot-4.3.11.dist-info/RECORD,,