eflips-depot 4.1.2__py3-none-any.whl → 4.1.4__py3-none-any.whl

eflips/depot/api/__init__.py

@@ -33,6 +33,7 @@ import warnings
 from collections import OrderedDict
 from datetime import timedelta
 from enum import Enum
+from math import ceil
 from typing import Any, Dict, Optional, Union, List
 
 import numpy as np
@@ -47,7 +48,6 @@ from eflips.model import (
     Trip,
     Vehicle,
 )
-from math import ceil
 from sqlalchemy.orm import Session
 from sqlalchemy.sql import select
 
@@ -1017,21 +1017,22 @@ def _get_finished_schedules_per_vehicle(
                 "type": "Trip",
                 "id": int(current_trip.ID),
             }
-
             if i == 0:
-                earliest_time = current_trip.atd
-
-            if i == len(list_of_finished_trips) - 1:
-                latest_time = current_trip.atd
+                raise ValueError(
+                    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 ."
+                )
 
-            if i != 0 and list_of_finished_trips[i - 1].is_copy is True:
+            elif i == len(list_of_finished_trips) - 1:
                 earliest_time = list_of_finished_trips[i - 1].atd
+                latest_time = list_of_finished_trips[i].ata
 
-            if (
-                i != len(list_of_finished_trips) - 1
-                or list_of_finished_trips[i + 1].is_copy is True
-            ):
-                latest_time = list_of_finished_trips[i + 1].atd
+            else:
+                if list_of_finished_trips[i - 1].is_copy is True:
+                    earliest_time = list_of_finished_trips[i - 1].ata
+                if list_of_finished_trips[i + 1].is_copy is True:
+                    latest_time = list_of_finished_trips[i + 1].atd
 
     return finished_schedules, earliest_time, latest_time
 
@@ -1270,7 +1271,11 @@ def _add_soc_to_events(dict_of_events, battery_log) -> None:
                 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:
@@ -1348,58 +1353,6 @@ def _add_events_into_database(
 
         session.add(current_event)
 
-        # For non-copy schedules with no predecessor events, adding a dummy standby-departure
-
-    time_keys = sorted(dict_of_events.keys())
-    if (
-        dict_of_events[time_keys[0]]["type"]
-        == "Trip"
-        # and dict_of_events[time_keys[0]]["is_copy"] is False
-    ):
-        standby_start = time_keys[0] - 1
-        standby_end = time_keys[0]
-        rotation_id = int(dict_of_events[time_keys[0]]["id"])
-        area = (
-            session.query(Area)
-            .filter(Area.vehicle_type_id == db_vehicle.vehicle_type_id)
-            .first()
-        )
-
-        first_trip = (
-            session.query(Trip)
-            .filter(Trip.rotation_id == rotation_id)
-            .order_by(Trip.departure_time)
-            .first()
-        )
-
-        soc = (
-            session.query(Event.soc_end)
-            .filter(Event.scenario == scenario)
-            .filter(Event.trip_id == first_trip.id)
-            .first()[0]
-        )
-
-        standby_event = Event(
-            scenario=scenario,
-            vehicle_type_id=db_vehicle.vehicle_type_id,
-            vehicle=db_vehicle,
-            station_id=None,
-            area_id=area.id,
-            subloc_no=area.capacity,
-            trip_id=None,
-            time_start=timedelta(seconds=standby_start) + simulation_start_time,
-            time_end=timedelta(seconds=standby_end) + simulation_start_time,
-            soc_start=soc,
-            soc_end=soc,
-            event_type=EventType.STANDBY_DEPARTURE,
-            description=f"DUMMY Standby event for {rotation_id}.",
-            timeseries=None,
-        )
-
-        session.add(standby_event)
-
-    session.flush()
-
 
 def _update_vehicle_in_rotation(session, scenario, list_of_assigned_schedules) -> None:
     """

eflips/depot/api/private/depot.py

@@ -353,7 +353,7 @@ def create_simple_depot(
     charging = Process(
         name="Charging",
         scenario=scenario,
-        dispatchable=False,
+        dispatchable=True,
         electric_power=charging_power,
     )
     standby_departure = Process(

eflips/depot/api/private/smart_charging.py

@@ -153,7 +153,7 @@ def optimize_charging_events_even(charging_events: List[Event]) -> None:
 
         # Make sure the transferred energy is the same
         post_opt_energy = (
-            scipy.integrate.trapz(optimized_power, total_time) / 3600
+            scipy.integrate.trapezoid(optimized_power, total_time) / 3600
         )  # kWh
 
         if False:
@@ -238,7 +238,7 @@ def optimize_charging_events_even(charging_events: List[Event]) -> None:
         )  # +1 to include the last index
         powers = params_for_event["optimized_power"][start_index:end_index]
 
-        energies = scipy.integrate.cumtrapz(powers, initial=0) / (
+        energies = scipy.integrate.cumulative_trapezoid(powers, initial=0) / (
             3600 / TEMPORAL_RESOLUTION.total_seconds()
         )  # kWh
         socs = event.soc_start + energies / event.vehicle.vehicle_type.battery_capacity
@@ -306,13 +306,15 @@ def optimize_charging_events_even(charging_events: List[Event]) -> None:
         )
 
         # Energy transferred
-        total_energy = scipy.integrate.cumtrapz(total_power, total_time, initial=0)
+        total_energy = scipy.integrate.cumulative_trapezoid(
+            total_power, total_time, initial=0
+        )
         axs[1].plot(total_time, total_energy, label="Original energy transferred")
-        optimized_energy = scipy.integrate.cumtrapz(
+        optimized_energy = scipy.integrate.cumulative_trapezoid(
             optimized_power, total_time, initial=0
         )
         axs[1].plot(total_time, optimized_energy, label="Optimized energy transferred")
-        optimized_energy2 = scipy.integrate.cumtrapz(
+        optimized_energy2 = scipy.integrate.cumulative_trapezoid(
             optimized_power2, total_time, initial=0
         )
         axs[1].plot(total_time, optimized_energy2, label="Mean energy transferred")

eflips/depot/api/private/util.py

@@ -130,6 +130,12 @@ def repeat_vehicle_schedules(
 
     for vehicle_schedule in vehicle_schedules:
         schedule_list_backward.append(vehicle_schedule.repeat(-repetition_period))
+        if repetition_period == timedelta(days=1):
+            # For daily schedules, repeat the schedule backward twice for the stability of the results
+            schedule_list_backward.append(
+                vehicle_schedule.repeat(-2 * repetition_period)
+            )
+
         schedule_list_forward.append(vehicle_schedule.repeat(repetition_period))
 
     vehicle_schedules = (

eflips/depot/processes.py

@@ -575,11 +575,11 @@ class VehicleProcess(BaseDepotProcess, ABC):
                 ]
             )
         ):
-            flexprint(
-                "NOTIFYING ASSIGNMENT AFTER %s END for vehicle %s"
-                % (self.ID, self.vehicle.ID),
-                env=self.env,
-            )
+            # flexprint(
+            #     "NOTIFYING ASSIGNMENT AFTER %s END for vehicle %s"
+            #     % (self.ID, self.vehicle.ID),
+            #     env=self.env,
+            # )
 
             self.vehicle.dwd.current_depot.depot_control.trigger_dispatch()
 

{eflips_depot-4.1.2.dist-info → eflips_depot-4.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eflips-depot
-Version: 4.1.2
+Version: 4.1.4
 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.2.dist-info → eflips_depot-4.1.4.dist-info}/RECORD

@@ -1,10 +1,10 @@
 eflips/depot/__init__.py,sha256=n7jte8R6j_Ad4Mp4hkklKwil5r8u8Q_SbXrCC-nf5jM,1556
-eflips/depot/api/__init__.py,sha256=m3TBAArGLC-ujan8yvRFpYno8rbhnak4GcA0XVLl4eI,66372
+eflips/depot/api/__init__.py,sha256=ONSNwj4H8bPnOdRc49ooMQhHQuDM-Q6JQk16URDgkMc,65235
 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/depot.py,sha256=z17kGwXyt3XmOze8hn0hKpDrAUOd4pFV9ojNDEQmx5A,18112
-eflips/depot/api/private/smart_charging.py,sha256=2wPBV67qq7TKvU4YYQeqNLhMxOgAHSLNXyanEZp_9a0,13701
-eflips/depot/api/private/util.py,sha256=BFdhyaCSClLJo8DjlIQCV_db-Cc-qqNuGnNa50GzaLs,16741
+eflips/depot/api/private/depot.py,sha256=pgLk9rdjZthk35vKCTmcl4VfjYQJRnqR-CPGwBs_9zk,18111
+eflips/depot/api/private/smart_charging.py,sha256=JqYlUv_TnEqnp1Ks3FV3Od2rkYMOSORfUhrxZ49lUyE,13775
+eflips/depot/api/private/util.py,sha256=0l1ZFtMamdapPjk3OXiGCP5STefmN6b-RlfUyMd9PbQ,17017
 eflips/depot/configuration.py,sha256=Op3hlir-dEN7yHr0kTqbYANoCBKFWK6uKOv3NJl8w_w,35678
 eflips/depot/depot.py,sha256=afIlaiX-J-M5-K_oAGMr_soL3_QjIAwrQKDaZzTwle0,105566
 eflips/depot/evaluation.py,sha256=qqXyP4jA1zFcKuWhliQ6n25ZlGl9mJV-vtXf0yu8WN8,140842
@@ -26,7 +26,7 @@ eflips/depot/layout_opt/settings.py,sha256=EUGCp4dAX22j2uF8sKqbi9a5iP8hb6QpP7t2N
 eflips/depot/layout_opt/template_creation.py,sha256=H4LoFjQfbPjTt9rGvapH2tEUWcQ56kPwDucq7t6YahU,9736
 eflips/depot/layout_opt/util.py,sha256=EYh7IN58ZjysmCFdSieQqIQ9goe1a_ZwARRHxOgjEQo,3780
 eflips/depot/plots.py,sha256=85xInZWfJIOVm03onvppgP5yLTgQeMn-1t5aoNdavyY,2509
-eflips/depot/processes.py,sha256=vqwtaK5UfG5aJwsQL2Eo9ZOFg1z5khuNPyEC9-3M83Y,58757
+eflips/depot/processes.py,sha256=Z7Bu2I8K_JcXkVMs54ljzO1g5iTju4zlmAUL2KGkz0Y,58767
 eflips/depot/rating.py,sha256=vBUr3y31DBcA-LjZW8t6wLfpAsuB8DPkrMThtCtN908,16648
 eflips/depot/resources.py,sha256=0SuzN8qgMmCqa7oUEXVC_XE6pCUtxTsqOfCsaM9Oh3o,13568
 eflips/depot/settings_config.py,sha256=z7CqPdjd8QRlgZj0Zis-H13cL7LOiheRT4ctYCYGguc,2527
@@ -35,7 +35,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.1.2.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.1.2.dist-info/METADATA,sha256=qPSjQQt8UpZjJ8iNOFbEVrFJUVSkBkSV-evkZOQDhX0,5839
-eflips_depot-4.1.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-eflips_depot-4.1.2.dist-info/RECORD,,
+eflips_depot-4.1.4.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.1.4.dist-info/METADATA,sha256=AWjHM-eLPTc_TfvBnUqcrDMJKqWN8_H4C0g7AaIdAXk,5839
+eflips_depot-4.1.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+eflips_depot-4.1.4.dist-info/RECORD,,