eflips-depot 4.15.0__tar.gz → 4.15.2__tar.gz

{eflips_depot-4.15.0 → eflips_depot-4.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eflips-depot
-Version: 4.15.0
+Version: 4.15.2
 Summary: Depot Simulation for eFLIPS
 License: AGPL-3.0-or-later
 License-File: LICENSE.md

{eflips_depot-4.15.0 → eflips_depot-4.15.2}/eflips/depot/api/private/consumption.py

@@ -286,20 +286,6 @@ def extract_trip_information(
             )
             .one()
         )
-        # Check exactly one of the vehicle classes has a consumption LUT
-        all_consumption_luts = [
-            vehicle_class.consumption_lut
-            for vehicle_class in trip.rotation.vehicle_type.vehicle_classes
-        ]
-        all_consumption_luts = [x for x in all_consumption_luts if x is not None]
-        if len(all_consumption_luts) != 1:
-            raise ValueError(
-                f"Expected exactly one consumption LUT, got {len(all_consumption_luts)}"
-            )
-        consumption_lut = all_consumption_luts[0]
-        # Disconnect the consumption LUT from the session to avoid loading the whole table
-
-        del all_consumption_luts
 
         total_distance = trip.route.distance / 1000  # km
         total_duration = (
@@ -307,6 +293,13 @@ def extract_trip_information(
         ).total_seconds() / 3600
         average_speed = total_distance / total_duration  # km/h
 
+        # Check exactly one of the vehicle classes has a consumption LUT
+        all_consumption_luts = [
+            vehicle_class.consumption_lut
+            for vehicle_class in trip.rotation.vehicle_type.vehicle_classes
+        ]
+        all_consumption_luts = [x for x in all_consumption_luts if x is not None]
+
         temperature = temperature_for_trip(trip_id, session)
 
         payload_mass = passenger_mass * passenger_count
@@ -324,16 +317,46 @@ def extract_trip_information(
         )
         level_of_loading = payload_mass / full_payload
 
-        info = ConsumptionInformation(
-            trip_id=trip.id,
-            consumption_lut=consumption_lut,
-            average_speed=average_speed,
-            distance=total_distance,
-            temperature=temperature,
-            level_of_loading=level_of_loading,
-        )
+        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
+
+            del all_consumption_luts
+
+            info = ConsumptionInformation(
+                trip_id=trip.id,
+                consumption_lut=consumption_lut,
+                average_speed=average_speed,
+                distance=total_distance,
+                temperature=temperature,
+                level_of_loading=level_of_loading,
+            )
+            info.calculate()
+        elif len(all_consumption_luts) == 0:
+            warnings.warn(
+                f"No consumption LUT found for vehicle type {trip.rotation.vehicle_type}.",
+                ConsistencyWarning,
+            )
+            # 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."
+            info = ConsumptionInformation(
+                trip_id=trip.id,
+                average_speed=average_speed,
+                distance=total_distance,
+                consumption_per_km=trip.rotation.vehicle_type.consumption,
+                consumption=trip.rotation.vehicle_type.consumption * total_distance,
+                consumption_lut=None,
+                temperature=temperature,
+                level_of_loading=level_of_loading,
+            )
+        else:
+            raise ValueError(
+                f"Expected exactly one consumption LUT, got {len(all_consumption_luts)}"
+            )
 
-        info.calculate()
     return info
 
 

{eflips_depot-4.15.0 → eflips_depot-4.15.2}/eflips/depot/api/private/depot.py

@@ -230,7 +230,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 +253,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 +386,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]

{eflips_depot-4.15.0 → eflips_depot-4.15.2}/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())
@@ -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"]

{eflips_depot-4.15.0 → eflips_depot-4.15.2}/eflips/depot/api/private/util.py

@@ -1,6 +1,7 @@
 """This module contains miscellaneous utility functions for the eflips-depot API."""
 import logging
 import os
+import warnings
 from contextlib import contextmanager
 from dataclasses import dataclass
 from datetime import timedelta, datetime
@@ -17,9 +18,11 @@ from eflips.model import (
     Trip,
     Depot,
     Temperatures,
+    ConsistencyWarning,
 )
 from eflips.model import create_engine
 from sqlalchemy import inspect
+from sqlalchemy.exc import NoResultFound
 from sqlalchemy.orm import Session
 
 from eflips.depot import SimpleTrip, Timetable as EflipsTimeTable
@@ -99,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
 
@@ -204,7 +208,9 @@ def check_depot_validity(depot: Depot) -> None:
 
 def temperature_for_trip(trip_id: int, session: Session) -> float:
     """
-    Returns the temperature for a trip. Finds the temperature for the mid-point of the trip.
+    Returns the temperature for a trip.
+
+    Finds the temperature for the mid-point of the trip.
 
     :param trip_id: The ID of the trip
     :param session: The SQLAlchemy session
@@ -212,11 +218,18 @@ def temperature_for_trip(trip_id: int, session: Session) -> float:
     """
 
     trip = session.query(Trip).filter(Trip.id == trip_id).one()
-    temperatures = (
-        session.query(Temperatures)
-        .filter(Temperatures.scenario_id == trip.scenario_id)
-        .one()
-    )
+    try:
+        temperatures = (
+            session.query(Temperatures)
+            .filter(Temperatures.scenario_id == trip.scenario_id)
+            .one()
+        )
+    except NoResultFound:
+        warnings.warn(
+            f"No temperatures found for scenario {trip.scenario_id}.",
+            ConsistencyWarning,
+        )
+        return None
 
     # Find the mid-point of the trip
     mid_time = trip.departure_time + (trip.arrival_time - trip.departure_time) / 2

{eflips_depot-4.15.0 → eflips_depot-4.15.2}/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.0 → eflips_depot-4.15.2}/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.0 → eflips_depot-4.15.2}/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.0 → eflips_depot-4.15.2}/pyproject.toml

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