eflips-depot 4.15.1__tar.gz → 4.15.9__tar.gz

{eflips_depot-4.15.1 → eflips_depot-4.15.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eflips-depot
-Version: 4.15.1
+Version: 4.15.9
 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.1 → eflips_depot-4.15.9}/README.md

@@ -104,4 +104,4 @@ 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.1 → eflips_depot-4.15.9}/eflips/depot/api/__init__.py

@@ -685,7 +685,9 @@ def simulate_scenario(
             case SmartChargingStrategy.NONE:
                 pass
             case SmartChargingStrategy.EVEN:
-                apply_even_smart_charging(scenario, database_url)
+                apply_even_smart_charging(
+                    scenario, database_url, delete_existing_charging_timeseries=True
+                )
             case SmartChargingStrategy.MIN_PRICE:
                 raise NotImplementedError("MIN_PRICE strategy is not implemented yet.")
             case _:

{eflips_depot-4.15.1 → eflips_depot-4.15.9}/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-4.15.1 → eflips_depot-4.15.9}/eflips/depot/api/private/depot.py

@@ -126,20 +126,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, cleaning_slots, cleaning_duration and shunting_slots 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 areas is None, "areas cannot be provided if auto_generate is True"
 
 
 def delete_depots(scenario: Scenario, session: Session) -> None:
@@ -230,7 +237,7 @@ def depot_to_template(depot: Depot) -> Dict[str, str | Dict[str, str | int]]:
                 if process_type(processes_in_area) == ProcessType.CHARGING:
                     # Add the charging process for this vehicle type
                     template["areas"][area_name]["available_processes"].append(
-                        str(processes_in_area.id) + str(area.vehicle_type_id)
+                        str(processes_in_area.id) + "vt" + str(area.vehicle_type_id)
                     )
                     # Delete the original charging process
                     template["areas"][area_name]["available_processes"].remove(
@@ -253,7 +260,7 @@ def depot_to_template(depot: Depot) -> Dict[str, str | Dict[str, str | int]]:
                     # Add the charging process for this vehicle type
                     for vt in scenario.vehicle_types:
                         template["areas"][area_name]["available_processes"].append(
-                            str(processes_in_area.id) + str(vt.id)
+                            str(processes_in_area.id) + "vt" + str(vt.id)
                         )
                     # Delete the original charging process
                     template["areas"][area_name]["available_processes"].remove(
@@ -386,30 +393,31 @@ def depot_to_template(depot: Depot) -> Dict[str, str | Dict[str, str | int]]:
 
                 for vt in all_vehicle_types:
                     charging_curve = vt.charging_curve
-                    template["processes"][process_name + str(vt.id)] = template[
+
+                    charging_process_name = process_name + "vt" + str(vt.id)
+                    template["processes"][charging_process_name] = template[
                         "processes"
                     ][process_name].copy()
-                    template["processes"][process_name + str(vt.id)][
+                    template["processes"][charging_process_name][
                         "typename"
                     ] = "ChargeEquationSteps"
-                    template["processes"][process_name + str(vt.id)][
-                        "vehicle_filter"
-                    ] = {
+                    template["processes"][charging_process_name]["vehicle_filter"] = {
                         "filter_names": ["vehicle_type"],
                         "vehicle_types": [str(vt.id)],
                     }
 
-                    template["processes"][process_name + str(vt.id)][
+                    template["processes"][charging_process_name][
                         "peq_name"
                     ] = "charging_curve_power"
-                    template["processes"][process_name + str(vt.id)]["peq_params"] = {
+                    template["processes"][charging_process_name]["peq_params"] = {
                         "soc": [soc_power_pair[0] for soc_power_pair in charging_curve],
                         "power": [
                             soc_power_pair[1] for soc_power_pair in charging_curve
                         ],
+                        "precision": 0.01,
                     }
 
-                    del template["processes"][process_name + str(vt.id)]["dur"]
+                    del template["processes"][charging_process_name]["dur"]
 
                 # delete the original process
                 del template["processes"][process_name]
@@ -1195,7 +1203,9 @@ def depot_smallest_possible_size(
 
                     # Simulate the depot
                     simulate_scenario(
-                        scenario, smart_charging_strategy=SmartChargingStrategy.NONE
+                        scenario,
+                        smart_charging_strategy=SmartChargingStrategy.NONE,
+                        ignore_unstable_simulation=True,
                     )
 
                     # Find the peak usage of the depot
@@ -1259,12 +1269,6 @@ def depot_smallest_possible_size(
 
                 except MissingVehicleDimensionError as e:
                     raise e
-                except UnstableSimulationException as e:
-                    # This change is made after Unstable exception and delay exceptions are introduced
-                    logger.debug(
-                        f"Results are unstable, suggesting depot is too small."
-                    )
-                    continue
                 except DelayedTripException as e:
                     logger.debug(f"Trips are delayed, suggesting depot is too small.")
                     continue
@@ -1274,6 +1278,10 @@ def depot_smallest_possible_size(
         # Identify the best configuration for each vehicle type
         ret_val: Dict[VehicleType, Dict[AreaType, int]] = dict()
         for vt in vts_and_rotations.keys():
+            assert area_needed[vt] != {}, (
+                f"No valid configurations found for {vt.name}, "
+                f"please check if there are any delays after simulating scenario."
+            )
             best_config = min(area_needed[vt].keys(), key=lambda x: area_needed[vt][x])
             ret_val[vt] = {
                 AreaType.LINE: best_config * standard_block_length,

{eflips_depot-4.15.1 → eflips_depot-4.15.9}/eflips/depot/api/private/results_to_database.py

@@ -1,6 +1,7 @@
 import datetime
 import itertools
 import logging
+import math
 import warnings
 from datetime import timedelta
 from typing import List, Dict
@@ -398,6 +399,10 @@ def add_soc_to_events(dict_of_events, battery_log) -> None:
     """
     battery_log_list = []
     for log in battery_log:
+        # TODO this is a bypass of update events having lower energy_real than the event before. It happens in processes L 1304
+        if log.event_name == "update":
+            continue
+
         battery_log_list.append((log.t, round(log.energy / log.energy_real, 4)))
 
     time_keys = sorted(dict_of_events.keys())
@@ -496,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
 
@@ -522,7 +527,7 @@ def add_events_into_database(
         if "timeseries" in process_dict.keys():
             # Convert "time" in timeseries to timedelta
             timeseries["time"] = [
-                (timedelta(seconds=t) + simulation_start_time).isoformat()
+                (timedelta(seconds=math.ceil(t)) + simulation_start_time).isoformat()
                 for t in process_dict["timeseries"]["time"]
             ]
             timeseries["soc"] = process_dict["timeseries"]["soc"]
@@ -540,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.1 → eflips_depot-4.15.9}/eflips/depot/api/private/util.py

@@ -102,6 +102,7 @@ def vehicle_type_to_global_constants_dict(vt: VehicleType) -> Dict[str, float]:
         "soc_max": 1.0,
         "soc_init": 1.0,
         "soh": 1.0,
+        "charging_efficiency": vt.charging_efficiency,
     }
     return the_dict
 

{eflips_depot-4.15.1 → eflips_depot-4.15.9}/eflips/depot/processes.py

@@ -840,6 +840,7 @@ class Charge(ChargeAbstract):
 
     @property
     def power(self):
+        # TODO this doesn't consider vehicle charging power
         return self.charging_interface.max_power
 
     def _action(self, *args, **kwargs):
@@ -1240,6 +1241,8 @@ class ChargeEquationSteps(ChargeAbstract):
         self.precision = precision
         Charge.check_soc_target(soc_target, vehicle_filter)
         self.soc_target = soc_target
+        if "precision" in self.peq_params:
+            self.precision = self.peq_params["precision"]
 
     @property
     def power(self):
@@ -1271,8 +1274,12 @@ class ChargeEquationSteps(ChargeAbstract):
                 )
                 soc_target_step = self.vehicle.battery.soc + soc_interval
                 amount = self.vehicle.battery.energy_real * soc_interval
-                effective_power = self.power * self.efficiency
-                self.dur = int(amount / effective_power * 3600)
+                effective_power = (
+                    self.power
+                    * self.efficiency
+                    * self.vehicle.vehicle_type.charging_efficiency
+                )
+                self.dur = round(amount / effective_power * 3600, 12)
 
                 if self.dur == 0:
                     # amount is so small that dur is <1s. Reduce the precision
@@ -1295,6 +1302,7 @@ class ChargeEquationSteps(ChargeAbstract):
                 yield self.env.timeout(self.dur)
 
                 if soc_target_step < self.soc_target:
+                    # TODO why here we have energy higher than the step_soc_target?
                     # recalculate amount because update_battery may have been
                     # called in the meantime
                     amount_step = (
@@ -1438,13 +1446,21 @@ def charging_curve_power(vehicle, charging_interface, peq_params):
     :return: charging power in float for given SimpleVehicle
     """
 
+    precision = peq_params.get("precision", 0.01)
     current_soc = vehicle.battery.soc
     p_max = charging_interface.max_power
+    target_step_soc = min(vehicle.battery.soc + precision, vehicle.battery.soc_max)
 
-    current_power = min(
+    power_current_soc = min(
         p_max, np.interp(current_soc, peq_params["soc"], peq_params["power"])
     )
 
+    power_target_soc = min(
+        p_max, np.interp(target_step_soc, peq_params["soc"], peq_params["power"])
+    )
+
+    current_power = min(power_current_soc, power_target_soc)
+
     return float(current_power)
 
 

{eflips_depot-4.15.1 → eflips_depot-4.15.9}/eflips/depot/rating.py

@@ -422,7 +422,7 @@ class RfdDiffDispatch:
         diffs = []
         for vehicle in area.vehicles:
             etc = vehicle.dwd.etc_processes
-            if isinstance(etc, int):
+            if isinstance(etc, int) or isinstance(etc, float):
                 diff = etc - slot[0].env.now
                 diffs.append(diff)
             # Convert EstimateValue to numerical rfddiff

{eflips_depot-4.15.1 → eflips_depot-4.15.9}/eflips/depot/simple_vehicle.py

@@ -36,7 +36,17 @@ class VehicleType:
 
     """
 
-    def __init__(self, ID, battery_capacity, soc_min, soc_max, soc_init, soh, CR=None):
+    def __init__(
+        self,
+        ID,
+        battery_capacity,
+        soc_min,
+        soc_max,
+        soc_init,
+        soh,
+        charging_efficiency=1.0,
+        CR=None,
+    ):
         self.ID = ID
         self.battery_capacity = battery_capacity
         self.soc_min = soc_min
@@ -45,6 +55,7 @@ class VehicleType:
         self.soh = soh
         self.CR = CR
         self.group = None
+        self.charging_efficiency = charging_efficiency
 
         self.count = {}
         self.share = {}

{eflips_depot-4.15.1 → eflips_depot-4.15.9}/pyproject.toml

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