eflips-depot 4.1.6__tar.gz → 4.2.1__tar.gz

{eflips_depot-4.1.6 → eflips_depot-4.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eflips-depot
-Version: 4.1.6
+Version: 4.2.1
 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.6 → eflips_depot-4.2.1}/eflips/depot/api/__init__.py

@@ -101,6 +101,7 @@ def simple_consumption_simulation(
     initialize_vehicles: bool,
     database_url: Optional[str] = None,
     calculate_timeseries: bool = False,
+    terminus_deadtime: timedelta = timedelta(minutes=1),
 ) -> None:
     """
     A simple consumption simulation and vehicle initialization.
@@ -131,6 +132,10 @@ def simple_consumption_simulation(
         is set to False, the "timeseries" column of the Event table will be set to ``None``. Setting this to false
         may significantly speed up the simulation.
 
+    :param terminus_deadtime: The total deadtime taken to both attach and detach the charging cable at the terminus.
+                              If the total deadtime is greater than the time between the arrival and departure of the
+                              vehicle at the terminus, the vehicle will not be able to charge at the terminus.
+
     :return: Nothing. The results are added to the database.
     """
     logger = logging.getLogger(__name__)
@@ -273,7 +278,7 @@ def simple_consumption_simulation(
                     timeseries = None
                 energy_used = consumption * trip.route.distance / 1000  # kWh
                 current_soc = soc_start - energy_used / vehicle_type.battery_capacity
-
+                session.flush()  # TODO
                 # Create a driving event
                 current_event = Event(
                     scenario_id=scenario.id,
@@ -289,6 +294,7 @@ def simple_consumption_simulation(
                     timeseries=timeseries,
                 )
                 session.add(current_event)
+                session.flush()  # TODO
 
                 # If the vehicle is
                 #  - Capable of opportunity charging
@@ -314,7 +320,10 @@ def simple_consumption_simulation(
                     # How much energy can be charged in this time?
                     energy_charged = (
                         max([v[1] for v in vehicle_type.charging_curve])
-                        * break_time.total_seconds()
+                        * (
+                            break_time.total_seconds()
+                            - terminus_deadtime.total_seconds()
+                        )
                         / 3600
                     )
 
@@ -326,6 +335,24 @@ def simple_consumption_simulation(
                             1,
                         )
 
+                        # Create a simple timeseries for the charging event
+                        timeseries = {
+                            "time": [
+                                trip.arrival_time.isoformat(),
+                                (trip.arrival_time + terminus_deadtime / 2).isoformat(),
+                                (
+                                    next_trip.departure_time - terminus_deadtime / 2
+                                ).isoformat(),
+                                next_trip.departure_time.isoformat(),
+                            ],
+                            "soc": [
+                                current_soc,
+                                current_soc,
+                                post_charge_soc,
+                                post_charge_soc,
+                            ],
+                        }
+
                         # Create the charging event
                         current_event = Event(
                             scenario_id=scenario.id,
@@ -1162,6 +1189,24 @@ def _generate_vehicle_events(
                                     and "end" in dict_of_events[time_stamp].keys()
                                 ):
                                     start_this_event = dict_of_events[time_stamp]["end"]
+                                    if start_this_event in dict_of_events.keys():
+                                        if (
+                                            dict_of_events[start_this_event]["type"]
+                                            == "Trip"
+                                        ):
+                                            print(
+                                                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,

{eflips_depot-4.1.6 → eflips_depot-4.2.1}/pyproject.toml

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