eflips-depot 4.3.19__py3-none-any.whl → 4.4.0__py3-none-any.whl

eflips/depot/api/private/results_to_database.py

@@ -294,7 +294,8 @@ def complete_standby_departure_events(
             # End time of a standby_departure will be the start of the following trip
             if i == len(time_keys) - 1:
                 # The event reaches simulation end
-                end_time = latest_time
+                end_time = max(latest_time, max(time_keys))
+                # Lu: Apparently sometimes there are events going beyond the simulation end time?
             else:
                 end_time = time_keys[i + 1]
 

eflips/depot/api/private/smart_charging.py

@@ -6,7 +6,9 @@ import scipy
 from eflips.model import Event, EventType
 
 
-def optimize_charging_events_even(charging_events: List[Event]) -> None:
+def optimize_charging_events_even(
+    charging_events: List[Event], debug_plots: bool = False
+) -> None:
     """
     This function optimizes the power draw of a list of charging events.
 
@@ -42,7 +44,6 @@ def optimize_charging_events_even(charging_events: List[Event]) -> None:
     # Also note down the peak power and transferred energy
     params_for_events: List[Dict[str, float | np.ndarray | Event]] = []
     for event in charging_events:
-        power_draw = np.zeros_like(total_time, dtype=float)
         charging_allowed = np.zeros_like(total_time, dtype=int)
 
         # Calculate the power draw vector, from the start SoC, end SoC and timeseries, if available
@@ -144,7 +145,7 @@ def optimize_charging_events_even(charging_events: List[Event]) -> None:
             scipy.integrate.trapezoid(optimized_power, total_time) / 3600
         )  # kWh
 
-        if False:
+        if debug_plots:
             # Some plots for only this charging event
             from matplotlib import pyplot as plt
 
@@ -152,7 +153,7 @@ def optimize_charging_events_even(charging_events: List[Event]) -> None:
                 params_for_event["charging_allowed"] == 1
             )[0]
 
-            fig, axs = plt.subplots(3, 1, sharex=True)
+            _, axs = plt.subplots(3, 1, sharex=True)
             axs[0].axhline(mean_power, color="red", linestyle="--", label="Mean power")
             axs[0].plot(
                 total_time[valid_charging_indices],
@@ -256,10 +257,10 @@ def optimize_charging_events_even(charging_events: List[Event]) -> None:
             event.timeseries = None
 
     # Now we have the power draw and charging allowed for each event
-    if False:
+    if debug_plots:
         from matplotlib import pyplot as plt
 
-        fig, axs = plt.subplots(3, 1, sharex=True)
+        _, axs = plt.subplots(3, 1, sharex=True)
         total_power = np.sum(
             [event["power_draw"] for event in params_for_events], axis=0
         )

eflips/depot/api/private/util.py

@@ -20,7 +20,6 @@ from sqlalchemy import inspect, create_engine
 from sqlalchemy.orm import Session
 
 from eflips.depot import SimpleTrip, Timetable as EflipsTimeTable
-from eflips.depot import VehicleType as EflipsVehicleType
 
 
 @contextmanager
@@ -82,22 +81,6 @@ def create_session(
                 engine.dispose()
 
 
-def vehicle_type_to_eflips(vt: VehicleType) -> EflipsVehicleType:
-    """Convert a VehicleType object to an eflips-depot VehicleType object."""
-
-    # Create the depot VehicleType object
-    eflips_vehicle_type = EflipsVehicleType(
-        str(vt.id),
-        vt.battery_capacity,
-        0.0,
-        1.0,
-        1.0,
-        1.0,
-        vt.consumption,
-    )
-    return eflips_vehicle_type
-
-
 def vehicle_type_to_global_constants_dict(vt: VehicleType) -> Dict[str, float]:
     """
     This converts the VehicleType object into a dictionary, which is the input.
@@ -342,7 +325,7 @@ class VehicleSchedule:
         )
         if len(events) != len(trips):
             raise ValueError(
-                f"Rotation {rot.id} has {len(trips)} trips but only {len(events)} events."
+                f"Rotation {rot.id} has {len(trips)} trips but {len(events)} events."
             )
         if set([event.trip_id for event in events]) != set([trip.id for trip in trips]):
             raise ValueError(f"The events of rotation {rot.id} do not match the trips.")
@@ -357,12 +340,12 @@ class VehicleSchedule:
         start_depot = (
             session.query(Depot)
             .filter(Depot.station_id == trips[0].route.departure_station_id)
-            .one()
+            .one_or_none()
         )
         end_depot = (
             session.query(Depot)
             .filter(Depot.station_id == trips[-1].route.arrival_station_id)
-            .one()
+            .one_or_none()
         )
 
         if start_depot is None or end_depot is None:

{eflips_depot-4.3.19.dist-info → eflips_depot-4.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eflips-depot
-Version: 4.3.19
+Version: 4.4.0
 Summary: Depot Simulation for eFLIPS
 Home-page: https://github.com/mpm-tu-berlin/eflips-depot
 License: AGPL-3.0-or-later
@@ -18,6 +18,7 @@ Requires-Dist: eflips-model (>=5.0.0,<6.0.0)
 Requires-Dist: pandas (>=2.1.4,<3.0.0)
 Requires-Dist: scipy (>=1.13.1,<2.0.0)
 Requires-Dist: simpy (>=4.0.1,<5.0.0)
+Requires-Dist: tqdm (>=4.67.0,<5.0.0)
 Requires-Dist: xlrd (<=1.2.0)
 Requires-Dist: xlsxwriter (>=3.1.9,<4.0.0)
 Project-URL: Repository, https://github.com/mpm-tu-berlin/eflips-depot

{eflips_depot-4.3.19.dist-info → eflips_depot-4.4.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 eflips/depot/__init__.py,sha256=n7jte8R6j_Ad4Mp4hkklKwil5r8u8Q_SbXrCC-nf5jM,1556
-eflips/depot/api/__init__.py,sha256=lEGFfWXFZsq49jY7CUVFkXjYksxRT9exILPEglTnK1E,57457
+eflips/depot/api/__init__.py,sha256=Usdwsf1OdyoRGJVsvaczuRortD5qRGo980-q_uOoxr8,45933
 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=Fan7vyVDNcQmuKxoETI6FqLEYII-TJlSor2wiT79zNc,35344
-eflips/depot/api/private/results_to_database.py,sha256=HrElB_ctOZX-Jir4uab76ii26H2LOdwpFTCmNmLawHg,24223
-eflips/depot/api/private/smart_charging.py,sha256=bgxBJ-Lytd2JXN_fm8wb268wbRDrwur_zfEzj0cnhu4,13052
-eflips/depot/api/private/util.py,sha256=Ye-WXNzHcNfunFijK7FCIU3AiCuMg83KnEhnKbtlZu8,17242
+eflips/depot/api/private/depot.py,sha256=v5Edb0sQP2QNIyBLvccVzAK9_kxCszar0cOu5ciFyrw,40780
+eflips/depot/api/private/results_to_database.py,sha256=PIH1GWYpdtCQJRL7PEAy-Z0HFxB-g1KfIdemLsQd4Rs,24342
+eflips/depot/api/private/smart_charging.py,sha256=MQ9fXdKByHAz6RSKXYcpJXDBccdJKZ2qGReCHagVCyo,13033
+eflips/depot/api/private/util.py,sha256=gk5TJZrcvtkyrqnjR3Cq-hPRGRCovhzKz3LrBDIvN0E,16799
 eflips/depot/configuration.py,sha256=Op3hlir-dEN7yHr0kTqbYANoCBKFWK6uKOv3NJl8w_w,35678
 eflips/depot/depot.py,sha256=35P1P3jMBbfq9jevmZVI46oM82osEoDL_B6C65drww0,105711
 eflips/depot/evaluation.py,sha256=qqXyP4jA1zFcKuWhliQ6n25ZlGl9mJV-vtXf0yu8WN8,140842
@@ -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=VxcTzBaB67fNJUMmjPRwKXjhqTy6oQ41Coote2LvAmk,22338
 eflips/depot/validation.py,sha256=TIuY7cQtEJI4H2VVMSuY5IIVkacEEZ67weeMuY3NSAM,7097
-eflips_depot-4.3.19.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.3.19.dist-info/METADATA,sha256=jeE1B9_GHvTXPKbsiqrqK3RQFLQMea9oD99gJ7tc_AM,5891
-eflips_depot-4.3.19.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-eflips_depot-4.3.19.dist-info/RECORD,,
+eflips_depot-4.4.0.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.4.0.dist-info/METADATA,sha256=Qmweh--AZG_voe17R6in8ubAMemjwMtnVuZbQe5UEZE,5928
+eflips_depot-4.4.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+eflips_depot-4.4.0.dist-info/RECORD,,