eflips-depot 4.15.4__py3-none-any.whl → 4.15.12__py3-none-any.whl

eflips/depot/api/__init__.py

@@ -328,13 +328,23 @@ def simple_consumption_simulation(
 
             # The departure SoC for this rotation is the SoC of the last event preceding the first trip
             with session.no_autoflush:
-                current_soc = (
+                current_soc_q = (
                     session.query(Event.soc_end)
                     .filter(Event.vehicle_id == rotation.vehicle_id)
                     .filter(Event.time_end <= rotation.trips[0].departure_time)
                     .order_by(Event.time_end.desc())
-                    .first()[0]
+                    .first()
                 )
+                if current_soc_q is None:
+                    # We – for some reason – do not have an initial event for this vehicle. This is due to unstable
+                    # simulation in the depot. We set the SoC to 1.0 and add a warning.
+                    current_soc = 1.0
+                    warnings.warn(
+                        f"No initial event found for vehicle {vehicle.id} before rotation {rotation.id}. Assuming 100% SoC.",
+                        ConsistencyWarning,
+                    )
+                else:
+                    current_soc = current_soc_q[0]
 
             for trip in rotation.trips:
                 # Set up a timeseries

eflips/depot/api/private/consumption.py

@@ -3,7 +3,7 @@ import warnings
 from dataclasses import dataclass
 from datetime import timedelta, datetime
 from math import ceil
-from typing import Tuple, List
+from typing import Tuple, List, Optional
 from zoneinfo import ZoneInfo
 
 import numpy as np
@@ -88,11 +88,13 @@ class ConsumptionInformation:
     """
 
     trip_id: int
-    consumption_lut: ConsumptionLut | None  # the LUT for the vehicle class
+    consumption_lut: Optional[ConsumptionLut]  # the LUT for the vehicle class
     average_speed: float  # the average speed of the trip in km/h
     distance: float  # the distance of the trip in km
-    temperature: float  # The ambient temperature in °C
-    level_of_loading: float
+    temperature: Optional[float]  # The ambient temperature in °C
+    level_of_loading: Optional[
+        float
+    ]  # The level of loading of the vehicle as a fraction of its maximum payload
     incline: float = 0.0  # The incline of the trip in 0.0-1.0
     consumption: float = None  # The consumption of the trip in kWh
     consumption_per_km: float = None  # The consumption per km in kWh
@@ -302,22 +304,22 @@ def extract_trip_information(
 
         temperature = temperature_for_trip(trip_id, session)
 
-        payload_mass = passenger_mass * passenger_count
-        assert (
-            trip.rotation.vehicle_type.allowed_mass is not None
-        ), f"allowed_mass of vehicle {trip.rotation.vehicle_type} must be set"
+        if len(all_consumption_luts) == 1:
+            payload_mass = passenger_mass * passenger_count
+            assert (
+                trip.rotation.vehicle_type.allowed_mass is not None
+            ), f"allowed_mass of vehicle {trip.rotation.vehicle_type} must be set"
 
-        assert (
-            trip.rotation.vehicle_type.empty_mass is not None
-        ), f"empty_mass of vehicle {trip.rotation.vehicle_type} must be set"
+            assert (
+                trip.rotation.vehicle_type.empty_mass is not None
+            ), f"empty_mass of vehicle {trip.rotation.vehicle_type} must be set"
 
-        full_payload = (
-            trip.rotation.vehicle_type.allowed_mass
-            - trip.rotation.vehicle_type.empty_mass
-        )
-        level_of_loading = payload_mass / full_payload
+            full_payload = (
+                trip.rotation.vehicle_type.allowed_mass
+                - trip.rotation.vehicle_type.empty_mass
+            )
+            level_of_loading = payload_mass / full_payload
 
-        if len(all_consumption_luts) == 1:
             consumption_lut = all_consumption_luts[0]
             # Disconnect the consumption LUT from the session to avoid loading the whole table
 
@@ -339,9 +341,10 @@ def extract_trip_information(
             )
             # Here, we fill out the condumption information without the LUT and LUT data, but with `consumption_per_km`
             # set to the vehicle's `consumption` value.
-            assert (
-                VehicleType.consumption is not None
-            ), f"Vehicle type {trip.rotation.vehicle_type} must have a consumption value set if no consumption LUT is available."
+            if trip.rotation.vehicle_type.consumption is None:
+                raise ValueError(
+                    f"Vehicle type {trip.rotation.vehicle_type} must have a consumption value set if no consumption LUT is available."
+                )
             info = ConsumptionInformation(
                 trip_id=trip.id,
                 average_speed=average_speed,
@@ -350,7 +353,7 @@ def extract_trip_information(
                 consumption=trip.rotation.vehicle_type.consumption * total_distance,
                 consumption_lut=None,
                 temperature=temperature,
-                level_of_loading=level_of_loading,
+                level_of_loading=None,
             )
         else:
             raise ValueError(

eflips/depot/api/private/depot.py

@@ -49,7 +49,7 @@ class AreaInformation:
     capacity: int
     """Capacity of the area."""
     block_length: int | None
-    """Block length of the area in meters. Only needed for AreaType.LINE."""
+    """Block length of the area in number of buses. Only needed for AreaType.LINE."""
     power: float
     """Charging power of the area in kW."""
     vehicle_type_id: int
@@ -96,12 +96,33 @@ class DepotConfigurationWish:
     True if the depot should be auto-generated, False if the depot should be created from user input.
     """
     default_power: float | None
+    """
+    Default charging power in kW for auto-generated depots.
+    """
     standard_block_length: int | None
+    """
+    Default number of vehicles in a line for auto-generated depots.
+    """
     cleaning_slots: int | None
+    """
+    Number of cleaning slots for auto-generated depots.
+    """
     cleaning_duration: timedelta | None
+    """
+    Duration of the cleaning process for auto-generated depots.
+    """
     shunting_slots: int | None
+    """
+    Duration of the shunting process for auto-generated depots.
+    """
     shunting_duration: timedelta | None
+    """
+    Duration of the shunting process for auto-generated depots.
+    """
     areas: list[AreaInformation] | None  #
+    """
+    List of AreaInformation objects representing charging area configurations for user-defined depots.
+    """
 
     def __init__(
         self,
@@ -126,20 +147,27 @@ class DepotConfigurationWish:
         self.areas = areas
 
         if self.auto_generate is True:
-            if self.default_power is None or self.standard_block_length is None:
-                raise ValueError(
-                    "If auto_generate is True, default_power, standard_block_length must be provided."
-                )
-            if (
-                self.cleaning_slots is not None
-                or self.cleaning_duration is not None
-                or self.shunting_slots is not None
-                or self.shunting_duration is not None
-            ):
-                raise ValueError(
-                    "If auto_generate is True, default_power, standard_block_length, cleaning_slots, cleaning_duration and shunting_slots cannot be provided."
-                )
-        # do some simple validation here
+            assert (
+                self.default_power is not None
+            ), "default_power must be provided if auto_generate is True"
+            assert (
+                self.standard_block_length is not None
+            ), "standard_block_length must be provided if auto_generate is True"
+
+            assert (
+                self.cleaning_slots is None
+            ), "cleaning_slots cannot be provided if auto_generate is True"
+            assert (
+                self.cleaning_duration is None
+            ), "cleaning_duration cannot be provided if auto_generate is True"
+            assert (
+                self.shunting_slots is None
+            ), "shunting_slots cannot be provided if auto_generate is True"
+            assert (
+                self.shunting_duration is None
+            ), "shunting_duration cannot be provided if auto_generate is True"
+
+            assert not areas, "areas cannot be provided if auto_generate is True"
 
 
 def delete_depots(scenario: Scenario, session: Session) -> None:

eflips/depot/api/private/results_to_database.py

@@ -501,7 +501,7 @@ def add_events_into_database(
                     '"Standby", "Precondition"'
                 )
 
-        if process_dict["end"] == start_time:
+        if math.ceil(process_dict["end"]) == math.ceil(start_time):
             logger.warning("Refusing to create an event with zero duration.")
             continue
 
@@ -545,8 +545,9 @@ def add_events_into_database(
             area_id=area_id,
             subloc_no=process_dict["slot"] if "slot" in process_dict.keys() else 00,
             trip_id=None,
-            time_start=timedelta(seconds=start_time) + simulation_start_time,
-            time_end=timedelta(seconds=process_dict["end"]) + simulation_start_time,
+            time_start=timedelta(seconds=math.ceil(start_time)) + simulation_start_time,
+            time_end=timedelta(seconds=math.ceil(process_dict["end"]))
+            + simulation_start_time,
             soc_start=process_dict["soc_start"]
             if process_dict["soc_start"] is not None
             else process_dict["soc_end"],

{eflips_depot-4.15.4.dist-info → eflips_depot-4.15.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eflips-depot
-Version: 4.15.4
+Version: 4.15.12
 Summary: Depot Simulation for eFLIPS
 License: AGPL-3.0-or-later
 License-File: LICENSE.md
@@ -131,5 +131,5 @@ This project is licensed under the AGPLv3 license - see the [LICENSE](LICENSE.md
 
 ## Funding Notice
 
-This code was developed as part of the project [eBus2030+]([https://www.eflip.de/](https://www.now-gmbh.de/projektfinder/e-bus-2030/)) funded by the Federal German Ministry for Digital and Transport (BMDV) under grant number 03EMF0402.
+This code was developed as part of the project [eBus2030+](https://www.now-gmbh.de/projektfinder/e-bus-2030/) funded by the Federal German Ministry for Digital and Transport (BMDV) under grant number 03EMF0402.
 

{eflips_depot-4.15.4.dist-info → eflips_depot-4.15.12.dist-info}/RECORD

@@ -1,10 +1,10 @@
 eflips/depot/__init__.py,sha256=FCVnYU7aSfR4BNCo722I1V3uU5336qr1tTt-zT6X4UI,1555
-eflips/depot/api/__init__.py,sha256=HvPtHi55hXwGgxD_DcYZxUnws1KRkKnezxI3Bao9TTg,67619
+eflips/depot/api/__init__.py,sha256=m3B8HQbUc9PRNZbF_OyPF4BiqUz4c54GGZkHK4KpoO0,68206
 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=494u6FelymWfI-Yt3ybJpLHUL-6zEqBOT2qSrPhRmMo,30038
-eflips/depot/api/private/depot.py,sha256=wFzKYbUTtU-mOGZD6gB_fQBaKGRTXZn4f5hRuuV6gkg,59629
-eflips/depot/api/private/results_to_database.py,sha256=OewbDwbk54GPORMVavLbJ7DSZpRKBLHM7q9aWKTngs8,30026
+eflips/depot/api/private/consumption.py,sha256=fgivEmP9A-kLpVpxCzxYdXW_OnvopUOKbmX8siBERd0,30244
+eflips/depot/api/private/depot.py,sha256=pwPIdU1kwZhxh2cK0ut7az3V5KKxRXuu1lxdgXWPLUo,60460
+eflips/depot/api/private/results_to_database.py,sha256=daNGNsqsVPqs-0xVBhIdHmtcJUcNjcYMsBJxSB66zWo,30082
 eflips/depot/api/private/util.py,sha256=e7T_-1AUXoCV9c11zaED2-za7p0TDhYG4Dg0lBZnrZI,18342
 eflips/depot/configuration.py,sha256=Op3hlir-dEN7yHr0kTqbYANoCBKFWK6uKOv3NJl8w_w,35678
 eflips/depot/depot.py,sha256=5NBw5bvOP2cplkRGZbKbG3SOA23F2Kw-UsabHubocPU,107555
@@ -36,7 +36,7 @@ eflips/depot/simulation.py,sha256=ee0qTzOzG-8ybN36ie_NJallXfC7jUaS9JZvaYFziLs,10
 eflips/depot/smart_charging.py,sha256=C3BYqzn2-OYY4ipXm0ETtavbAM9QXZMYULBpVoChf0E,54311
 eflips/depot/standalone.py,sha256=8O01zEXghFG9zZBu0fUD0sXvbHQ-AXw6RB5M750a_sM,22419
 eflips/depot/validation.py,sha256=TIuY7cQtEJI4H2VVMSuY5IIVkacEEZ67weeMuY3NSAM,7097
-eflips_depot-4.15.4.dist-info/METADATA,sha256=96QASZxpS3Z6obl3xDrwcEsxD-84hCR2y88o_6Yg0kE,5961
-eflips_depot-4.15.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-eflips_depot-4.15.4.dist-info/licenses/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.15.4.dist-info/RECORD,,
+eflips_depot-4.15.12.dist-info/METADATA,sha256=GBPVrOAwSZqkNdwCndYbJDygTriTqBUVP3v6eJUQMY0,5937
+eflips_depot-4.15.12.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+eflips_depot-4.15.12.dist-info/licenses/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.15.12.dist-info/RECORD,,

{eflips_depot-4.15.4.dist-info → eflips_depot-4.15.12.dist-info}/WHEEL

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