eflips-depot 4.1.3__tar.gz → 4.1.5__tar.gz

{eflips_depot-4.1.3 → eflips_depot-4.1.5}/PKG-INFO

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

{eflips_depot-4.1.3 → eflips_depot-4.1.5}/eflips/depot/api/__init__.py

@@ -1017,21 +1017,24 @@ def _get_finished_schedules_per_vehicle(
                 "type": "Trip",
                 "id": int(current_trip.ID),
             }
-
             if i == 0:
-                earliest_time = current_trip.atd
-
-            if i == len(list_of_finished_trips) - 1:
-                latest_time = current_trip.atd
+                raise ValueError(
+                    f"New Vehicle required for the trip {current_trip.ID}, which suggests the fleet or the "
+                    f"infrastructure might not be enough for the full electrification. Please add charging "
+                    f"interfaces or increase charging power ."
+                )
 
-            if i != 0 and list_of_finished_trips[i - 1].is_copy is True:
-                earliest_time = list_of_finished_trips[i - 1].atd
+            elif i != 0 and i == len(list_of_finished_trips) - 1:
+                # Vehicle's last trip is a non-copy trip
+                if earliest_time is None:
+                    earliest_time = list_of_finished_trips[i - 1].atd
+                latest_time = list_of_finished_trips[i].ata
 
-            if (
-                i != len(list_of_finished_trips) - 1
-                or list_of_finished_trips[i + 1].is_copy is True
-            ):
-                latest_time = list_of_finished_trips[i + 1].atd
+            else:
+                if list_of_finished_trips[i - 1].is_copy is True:
+                    earliest_time = list_of_finished_trips[i - 1].ata
+                if list_of_finished_trips[i + 1].is_copy is True:
+                    latest_time = list_of_finished_trips[i + 1].atd
 
     return finished_schedules, earliest_time, latest_time
 
@@ -1352,58 +1355,6 @@ def _add_events_into_database(
 
         session.add(current_event)
 
-        # For non-copy schedules with no predecessor events, adding a dummy standby-departure
-
-    time_keys = sorted(dict_of_events.keys())
-    if (
-        dict_of_events[time_keys[0]]["type"]
-        == "Trip"
-        # and dict_of_events[time_keys[0]]["is_copy"] is False
-    ):
-        standby_start = time_keys[0] - 1
-        standby_end = time_keys[0]
-        rotation_id = int(dict_of_events[time_keys[0]]["id"])
-        area = (
-            session.query(Area)
-            .filter(Area.vehicle_type_id == db_vehicle.vehicle_type_id)
-            .first()
-        )
-
-        first_trip = (
-            session.query(Trip)
-            .filter(Trip.rotation_id == rotation_id)
-            .order_by(Trip.departure_time)
-            .first()
-        )
-
-        soc = (
-            session.query(Event.soc_end)
-            .filter(Event.scenario == scenario)
-            .filter(Event.trip_id == first_trip.id)
-            .first()[0]
-        )
-
-        standby_event = Event(
-            scenario=scenario,
-            vehicle_type_id=db_vehicle.vehicle_type_id,
-            vehicle=db_vehicle,
-            station_id=None,
-            area_id=area.id,
-            subloc_no=area.capacity,
-            trip_id=None,
-            time_start=timedelta(seconds=standby_start) + simulation_start_time,
-            time_end=timedelta(seconds=standby_end) + simulation_start_time,
-            soc_start=soc,
-            soc_end=soc,
-            event_type=EventType.STANDBY_DEPARTURE,
-            description=f"DUMMY Standby event for {rotation_id}.",
-            timeseries=None,
-        )
-
-        session.add(standby_event)
-
-    session.flush()
-
 
 def _update_vehicle_in_rotation(session, scenario, list_of_assigned_schedules) -> None:
     """

{eflips_depot-4.1.3 → eflips_depot-4.1.5}/eflips/depot/api/private/depot.py

@@ -353,7 +353,7 @@ def create_simple_depot(
     charging = Process(
         name="Charging",
         scenario=scenario,
-        dispatchable=False,
+        dispatchable=True,
         electric_power=charging_power,
     )
     standby_departure = Process(

{eflips_depot-4.1.3 → eflips_depot-4.1.5}/eflips/depot/api/private/util.py

@@ -130,6 +130,12 @@ def repeat_vehicle_schedules(
 
     for vehicle_schedule in vehicle_schedules:
         schedule_list_backward.append(vehicle_schedule.repeat(-repetition_period))
+        if repetition_period == timedelta(days=1):
+            # For daily schedules, repeat the schedule backward twice for the stability of the results
+            schedule_list_backward.append(
+                vehicle_schedule.repeat(-2 * repetition_period)
+            )
+
         schedule_list_forward.append(vehicle_schedule.repeat(repetition_period))
 
     vehicle_schedules = (

{eflips_depot-4.1.3 → eflips_depot-4.1.5}/eflips/depot/processes.py

@@ -575,11 +575,11 @@ class VehicleProcess(BaseDepotProcess, ABC):
                 ]
             )
         ):
-            flexprint(
-                "NOTIFYING ASSIGNMENT AFTER %s END for vehicle %s"
-                % (self.ID, self.vehicle.ID),
-                env=self.env,
-            )
+            # flexprint(
+            #     "NOTIFYING ASSIGNMENT AFTER %s END for vehicle %s"
+            #     % (self.ID, self.vehicle.ID),
+            #     env=self.env,
+            # )
 
             self.vehicle.dwd.current_depot.depot_control.trigger_dispatch()
 

{eflips_depot-4.1.3 → eflips_depot-4.1.5}/pyproject.toml

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