eflips-depot 4.6.5__py3-none-any.whl → 4.6.7__py3-none-any.whl

eflips/depot/__init__.py

@@ -1,7 +1,6 @@
 # 1st: Namespaced Package Compat., see https://packaging.python.org/en/latest/guides/packaging-namespace-packages/
 __path__ = __import__("pkgutil").extend_path(__path__, __name__)
 
-
 # 2nd: Importing of the eflips modules -> TODO Cleanups here to avoid all those imports
 
 
@@ -57,3 +56,7 @@ from eflips.depot.validation import Validator
 
 class UnstableSimulationException(Exception):
     pass
+
+
+class DelayedTripException(Exception):
+    pass

eflips/depot/api/__init__.py

@@ -266,8 +266,18 @@ def simple_consumption_simulation(
         vehicles = (
             session.query(Vehicle).filter(Vehicle.scenario_id == scenario.id).all()
         )
+
+        # Get the event count for each vbehicle in a single query using a groub_py clause
+        vehicle_event_count_q = (
+            session.query(Event.vehicle_id, sqlalchemy.func.count(Event.id))
+            .join(Vehicle)
+            .filter(Vehicle.scenario_id == scenario.id)
+            .group_by(Event.vehicle_id)
+        )
+        vehicle_event_count = dict(vehicle_event_count_q.all())
+
         for vehicle in vehicles:
-            if session.query(Event).filter(Event.vehicle_id == vehicle.id).count() == 0:
+            if vehicle.id not in vehicle_event_count.keys():
                 add_initial_standby_event(vehicle, session)
 
         # Since we are doing no_autoflush blocks later, we need to flush the session once here so that unflushed stuff
@@ -594,6 +604,7 @@ def simulate_scenario(
     database_url: Optional[str] = None,
     smart_charging_strategy: SmartChargingStrategy = SmartChargingStrategy.EVEN,
     ignore_unstable_simulation: bool = False,
+    ignore_delayed_trips: bool = False,
 ) -> None:
     """
     This method simulates a scenario and adds the results to the database.
@@ -627,11 +638,13 @@ def simulate_scenario(
         - SmartChargingStrategy.MIN_PRICE: Not implemented yet.
 
     :param ignore_unstable_simulation: If True, the simulation will not raise an exception if it becomes unstable.
+    :param ignore_delayed_trips: If True, the simulation will not raise an exception if there are delayed trips.
 
     :return: Nothing. The results are added to the database.
 
     :raises UnstableSimulationException: If the simulation becomes numerically unstable or if
         the parameters cause the solver to diverge.
+    :raises DelayedTripException: If there are delayed trips in the simulation.
     """
     logger = logging.getLogger(__name__)
 
@@ -649,6 +662,11 @@ def simulate_scenario(
                 logger.warning("Simulation is unstable. Continuing.")
             else:
                 raise e
+        except eflips.depot.DelayedTripException as e:
+            if ignore_delayed_trips:
+                logger.warning("Simulation has delayed trips. Continuing.")
+            else:
+                raise e
 
         match smart_charging_strategy:
             case SmartChargingStrategy.NONE:
@@ -997,6 +1015,8 @@ def add_evaluation_to_database(
 
     :raises UnstableSimulationException: If the simulation becomes numerically unstable or if
         the parameters cause the solver to diverge.
+    :raises DelayedTripException: If there are delayed trips in the simulation.
+
     """
 
     # Read simulation start time

eflips/depot/api/private/consumption.py

@@ -78,13 +78,14 @@ def add_initial_standby_event(
         but changes are not yet committed.
     """
 
-    earliest_trip = (
+    earliest_trip_q = (
         session.query(Trip)
         .join(Rotation)
         .filter(Rotation.vehicle == vehicle)
         .order_by(Trip.departure_time)
-        .first()
+        .limit(1)
     )
+    earliest_trip = earliest_trip_q.one_or_none()
     if earliest_trip is None:
         warnings.warn(
             f"No trips found for vehicle {vehicle.id}. Cannot add initial standby event.",

eflips/depot/api/private/results_to_database.py

@@ -4,10 +4,12 @@ import logging
 from datetime import timedelta
 from typing import List, Dict
 
-from eflips.model import Event, EventType, Rotation, Vehicle, Area
+import numpy as np
+from eflips.model import Event, EventType, Rotation, Vehicle, Area, AreaType
 from sqlalchemy import select
 
 from eflips.depot import SimpleVehicle, ProcessStatus
+from eflips.depot import UnstableSimulationException, DelayedTripException
 
 
 def get_finished_schedules_per_vehicle(
@@ -47,10 +49,13 @@ def get_finished_schedules_per_vehicle(
     latest_time = None
 
     for i in range(len(list_of_finished_trips)):
-        assert list_of_finished_trips[i].atd == list_of_finished_trips[i].std, (
-            "The trip {current_trip.ID} is delayed. The simulation doesn't "
-            "support delayed trips for now."
-        )
+        try:
+            assert list_of_finished_trips[i].atd == list_of_finished_trips[i].std
+        except AssertionError:
+            raise DelayedTripException(
+                f"The trip {list_of_finished_trips[i].ID} is delayed. The simulation doesn't "
+                "support delayed trips for now."
+            )
 
         if list_of_finished_trips[i].is_copy is False:
             current_trip = list_of_finished_trips[i]
@@ -61,7 +66,7 @@ def get_finished_schedules_per_vehicle(
                 "id": int(current_trip.ID),
             }
             if i == 0:
-                raise ValueError(
+                raise UnstableSimulationException(
                     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 ."
@@ -164,8 +169,7 @@ def generate_vehicle_events(
         "dwd.active_processes_copy"
     ].items():
         if earliest_time <= time_stamp <= latest_time:
-            num_process = len(process_log)
-            if num_process == 0:
+            if len(process_log) == 0:
                 # A departure happens and this trip should already be stored in the dictionary
                 pass
             else:
@@ -202,35 +206,50 @@ def generate_vehicle_events(
                                     f"A process with no duration could only "
                                     f"happen in the last area before dispatched"
                                 )
-                                if (
-                                    time_stamp in dict_of_events.keys()
-                                    and "end" in dict_of_events[time_stamp].keys()
-                                ):
+                                start_this_event = None
+                                if time_stamp in dict_of_events.keys():
+                                    assert "end" in dict_of_events[time_stamp].keys(), (
+                                        f"The former event of {process} "
+                                        f"should have an end time."
+                                    )
                                     start_this_event = dict_of_events[time_stamp]["end"]
-                                    if start_this_event in dict_of_events.keys():
+                                else:
+                                    for other_process in process_log:
                                         if (
-                                            dict_of_events[start_this_event]["type"]
-                                            == "Trip"
+                                            other_process.ID != process.ID
+                                            and other_process.dur > 0
                                         ):
-                                            logger.info(
-                                                f"Vehicle {current_vehicle.ID} must depart immediately after charged. "
-                                                f"Thus there will be no STANDBY_DEPARTURE event."
-                                            )
-
-                                        else:
-                                            raise ValueError(
-                                                f"There is already an event "
-                                                f"{dict_of_events[start_this_event]} at {start_this_event}."
-                                            )
-
-                                        continue
-
-                                    dict_of_events[start_this_event] = {
-                                        "type": type(process).__name__,
-                                        "area": current_area.ID,
-                                        "slot": current_slot,
-                                        "id": process.ID,
-                                    }
+                                            start_this_event = other_process.ends[0]
+                                            break
+
+                                assert (
+                                    start_this_event is not None
+                                ), f"Current process {process} should have a start time by now"
+
+                                if start_this_event in dict_of_events.keys():
+                                    if (
+                                        dict_of_events[start_this_event]["type"]
+                                        == "Trip"
+                                    ):
+                                        logger.info(
+                                            f"Vehicle {current_vehicle.ID} must depart immediately after charged. "
+                                            f"Thus there will be no STANDBY_DEPARTURE event."
+                                        )
+
+                                    else:
+                                        raise ValueError(
+                                            f"There is already an event "
+                                            f"{dict_of_events[start_this_event]} at {start_this_event}."
+                                        )
+
+                                    continue
+
+                                dict_of_events[start_this_event] = {
+                                    "type": type(process).__name__,
+                                    "area": current_area.ID,
+                                    "slot": current_slot,
+                                    "id": process.ID,
+                                }
 
                         case ProcessStatus.IN_PROGRESS:
                             assert (
@@ -317,35 +336,25 @@ def add_soc_to_events(dict_of_events, battery_log) -> None:
         battery_log_list.append((log.t, log.energy / log.energy_real))
 
     time_keys = sorted(dict_of_events.keys())
+
+    battery_log_times = [log[0] for log in battery_log_list]
+    battery_log_socs = [log[1] for log in battery_log_list]
+
     for i in range(len(time_keys)):
         # Get soc
-        soc_start = None
-        soc_end = None
+
         start_time = time_keys[i]
         process_dict = dict_of_events[time_keys[i]]
-        for j in range(len(battery_log_list)):
-            # Access the correct battery log according to time since there is only one battery log for each time
-            log = battery_log_list[j]
-
-            if process_dict["type"] != "Trip":
-                if log[0] == start_time:
-                    soc_start = log[1]
-                if log[0] == process_dict["end"]:
-                    soc_end = log[1]
-                if log[0] < start_time < battery_log_list[j + 1][0]:
-                    soc_start = log[1]
-                if log[0] < process_dict["end"] < battery_log_list[j + 1][0]:
-                    soc_end = log[1]
-
-                if soc_start is not None:
-                    soc_start = min(soc_start, 1)  # so
-                process_dict["soc_start"] = soc_start
-                if soc_end is not None:
-                    soc_end = min(soc_end, 1)  # soc should not exceed 1
-                process_dict["soc_end"] = soc_end
 
-            else:
-                continue
+        if process_dict["type"] != "Trip":
+            soc_start = np.interp(start_time, battery_log_times, battery_log_socs)
+            process_dict["soc_start"] = min(float(soc_start), 1.0)
+            soc_end = np.interp(
+                process_dict["end"], battery_log_times, battery_log_socs
+            )
+            process_dict["soc_end"] = min(float(soc_end), 1.0)
+        else:
+            continue
 
 
 def add_events_into_database(

{eflips_depot-4.6.5.dist-info → eflips_depot-4.6.7.dist-info}/METADATA

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

{eflips_depot-4.6.5.dist-info → eflips_depot-4.6.7.dist-info}/RECORD

@@ -1,10 +1,10 @@
-eflips/depot/__init__.py,sha256=RQ_UKNrGWA6q17TZFu86ai8pC7qCpcbmAgVKh7aImwo,1613
-eflips/depot/api/__init__.py,sha256=0ifYtEwSs2LbpPINxdDsGNxdywKRicCQBETB7BpBh9Y,48631
+eflips/depot/__init__.py,sha256=06GUem0JIEunIyJ0_P_MLAGfibGEnNqcPPY0OBpO2NQ,1662
+eflips/depot/api/__init__.py,sha256=2isjSF0bef8Nq_lHMC2MGgfAFBgj4OWeezouzeSisss,49527
 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=vDPCogd3NPx2duCUhg_CcW9rMQWgrppfqsS4E7W9T1Y,16400
+eflips/depot/api/private/consumption.py,sha256=FTF_E-DsbvJNWZJKQy_CPoHQpLz--pWY-inJYg8lsjM,16453
 eflips/depot/api/private/depot.py,sha256=WcCcib3NSbvoL3G06I2ajT8U5L7AkDK5qe969PHq-fg,41014
-eflips/depot/api/private/results_to_database.py,sha256=Sh2VJ3k60QJ5RGkc8sw-7XbljiMe65EHeoagKIpYlHM,24585
+eflips/depot/api/private/results_to_database.py,sha256=R3wwGuaEsof2sW_fFv5Y9K0cl2K8W0JKe5VoN2elXTQ,25037
 eflips/depot/api/private/smart_charging.py,sha256=MQ9fXdKByHAz6RSKXYcpJXDBccdJKZ2qGReCHagVCyo,13033
 eflips/depot/api/private/util.py,sha256=gk5TJZrcvtkyrqnjR3Cq-hPRGRCovhzKz3LrBDIvN0E,16799
 eflips/depot/configuration.py,sha256=Op3hlir-dEN7yHr0kTqbYANoCBKFWK6uKOv3NJl8w_w,35678
@@ -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.5.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.6.5.dist-info/METADATA,sha256=aPK2OCraATDQr-H1kBZGqyZkj1fC0ZUBecES6EFCyoU,5940
-eflips_depot-4.6.5.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-eflips_depot-4.6.5.dist-info/RECORD,,
+eflips_depot-4.6.7.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.6.7.dist-info/METADATA,sha256=8ZhFsc9DzScN-igSjjhMmKbUnErElAu9FRWZn8rI1w8,5940
+eflips_depot-4.6.7.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+eflips_depot-4.6.7.dist-info/RECORD,,

{eflips_depot-4.6.5.dist-info → eflips_depot-4.6.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.1
+Generator: poetry-core 2.1.2
 Root-Is-Purelib: true
 Tag: py3-none-any