eflips-depot 4.6.7__py3-none-any.whl → 4.6.9__py3-none-any.whl

eflips/depot/api/__init__.py

@@ -500,14 +500,21 @@ def generate_depot_layout(
                     AreaType.DIRECT_ONESIDE: rotation_count,
                     AreaType.DIRECT_TWOSIDE: None,
                 }
+
+            total_rotation_count = (
+                session.query(Rotation)
+                .filter(Rotation.scenario_id == scenario.id)
+                .count()
+            )
+
             generate_depot(
                 vt_capacity_dict,
                 first_stop,
                 scenario,
                 session,
                 charging_power=charging_power,
-                num_shunting_slots=max(rotation_count // 10, 1),
-                num_cleaning_slots=max(rotation_count // 10, 1),
+                num_shunting_slots=max(total_rotation_count // 10, 1),
+                num_cleaning_slots=max(total_rotation_count // 10, 1),
             )
 
 

eflips/depot/api/private/util.py

@@ -394,6 +394,7 @@ class VehicleSchedule:
             distance=None,
             start_soc=self.departure_soc,
             end_soc=self.arrival_soc,
+            minimal_soc=self.minimal_soc,
             charge_on_track=self.opportunity_charging,
             is_copy=self._is_copy,
         )

eflips/depot/filters.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 import warnings
 
-import eflips
 from eflips.settings import globalConstants
-from eflips.helperFunctions import flexprint
+
+import eflips
 
 
 class VehicleFilter:
@@ -245,7 +245,7 @@ class VehicleFilter:
 
         elif globalConstants["depot"]["consumption_calc_mode"] == "soc_given":
             if self.trip.charge_on_track:
-                result = round(vehicle.battery.soc, 5) >= self.trip.start_soc
+                result = round(vehicle.battery.soc, 5) >= self.trip.minimal_soc
             else:
                 required_energy = (
                     self.trip.start_soc - self.trip.end_soc

eflips/depot/processes.py

@@ -762,8 +762,6 @@ class ChargeAbstract(VehicleProcess, ABC):
             if called by Charge(sub-)-classes). Leave None for update requests
             from outside the process.
         """
-        self.last_update = self.env.now
-
         if amount is None and (
             self.last_update == self.env.now or self.starts[-1] == self.env.now
         ):
@@ -791,6 +789,7 @@ class ChargeAbstract(VehicleProcess, ABC):
         self.vehicle.battery_logs.append(
             BatteryLog(self.env.now, self.vehicle, event_name)
         )
+        self.last_update = self.env.now
 
 
 class Charge(ChargeAbstract):
@@ -906,9 +905,7 @@ class Charge(ChargeAbstract):
 
         except simpy.Interrupt:
             flexprint("charge interrupted", env=self.env, switch="processes")
-            actual_charging_duration = self.env.now - self.starts[0]
-            actual_charged_energy = (effective_power * actual_charging_duration) / 3600
-            self.update_battery("charge_interrupt", amount=actual_charged_energy)
+            self.update_battery("charge_interrupt")
 
         self.charging_interface.current_power = 0
         self.vehicle.power_logs[self.env.now] = 0

eflips/depot/standalone.py

@@ -185,6 +185,7 @@ class SimpleTrip:
         distance,
         start_soc=None,
         end_soc=None,
+        minimal_soc: float | None = None,
         charge_on_track=False,
         is_copy=False,
     ):
@@ -199,6 +200,7 @@ class SimpleTrip:
         self.distance = distance
         self.start_soc = start_soc
         self.end_soc = end_soc
+        self.minimal_soc = minimal_soc
         self.charge_on_track = charge_on_track
         self.is_copy = is_copy
 

{eflips_depot-4.6.7.dist-info → eflips_depot-4.6.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eflips-depot
-Version: 4.6.7
+Version: 4.6.9
 Summary: Depot Simulation for eFLIPS
 License: AGPL-3.0-or-later
 Author: Enrico Lauth

{eflips_depot-4.6.7.dist-info → eflips_depot-4.6.9.dist-info}/RECORD

@@ -1,16 +1,16 @@
 eflips/depot/__init__.py,sha256=06GUem0JIEunIyJ0_P_MLAGfibGEnNqcPPY0OBpO2NQ,1662
-eflips/depot/api/__init__.py,sha256=2isjSF0bef8Nq_lHMC2MGgfAFBgj4OWeezouzeSisss,49527
+eflips/depot/api/__init__.py,sha256=GgFmHnpawNDdhc8ki4DwXzpMDrRjl1r0TYNXKdRUehk,49718
 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/consumption.py,sha256=FTF_E-DsbvJNWZJKQy_CPoHQpLz--pWY-inJYg8lsjM,16453
 eflips/depot/api/private/depot.py,sha256=WcCcib3NSbvoL3G06I2ajT8U5L7AkDK5qe969PHq-fg,41014
 eflips/depot/api/private/results_to_database.py,sha256=R3wwGuaEsof2sW_fFv5Y9K0cl2K8W0JKe5VoN2elXTQ,25037
 eflips/depot/api/private/smart_charging.py,sha256=MQ9fXdKByHAz6RSKXYcpJXDBccdJKZ2qGReCHagVCyo,13033
-eflips/depot/api/private/util.py,sha256=gk5TJZrcvtkyrqnjR3Cq-hPRGRCovhzKz3LrBDIvN0E,16799
+eflips/depot/api/private/util.py,sha256=YcvjKikgdquYXx61pbDiB3Naa1FTEvEfiEcWbnFGNH8,16841
 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
-eflips/depot/filters.py,sha256=52esFT_kldMC9-LteY4CFe8BETwr0bn-CacegVe6jsA,16131
+eflips/depot/filters.py,sha256=1aUK7czuhiATC3P3NN5oRtH1I-kN_-mp_-vkzyyBXn4,16089
 eflips/depot/input_epex_power_price.py,sha256=VPDC1zy-klQpveGIZ8941hL1P_jeNq3IHoLgFTsANig,5569
 eflips/depot/layout_opt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eflips/depot/layout_opt/doc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,16 +28,16 @@ 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=fC9Eoy1N8QC1D1r8hZnuHG3oeli5vth8DVfxsugtemM,58798
+eflips/depot/processes.py,sha256=wVacSuHQnHwe2kN18h4014eN4xs2XEegy9vJdHZ7wzQ,58610
 eflips/depot/rating.py,sha256=audUASHExeWg5ugytPLlcy5QGiTiFucnZ6-v3REoO2g,16427
 eflips/depot/resources.py,sha256=0SuzN8qgMmCqa7oUEXVC_XE6pCUtxTsqOfCsaM9Oh3o,13568
 eflips/depot/settings_config.py,sha256=z7CqPdjd8QRlgZj0Zis-H13cL7LOiheRT4ctYCYGguc,2527
 eflips/depot/simple_vehicle.py,sha256=Wl3IqYxMrs6J0U0iCrG3Qq8ONuDGoZ00r7h7svVyEik,9375
 eflips/depot/simulation.py,sha256=ee0qTzOzG-8ybN36ie_NJallXfC7jUaS9JZvaYFziLs,10676
 eflips/depot/smart_charging.py,sha256=C3BYqzn2-OYY4ipXm0ETtavbAM9QXZMYULBpVoChf0E,54311
-eflips/depot/standalone.py,sha256=VxcTzBaB67fNJUMmjPRwKXjhqTy6oQ41Coote2LvAmk,22338
+eflips/depot/standalone.py,sha256=8O01zEXghFG9zZBu0fUD0sXvbHQ-AXw6RB5M750a_sM,22419
 eflips/depot/validation.py,sha256=TIuY7cQtEJI4H2VVMSuY5IIVkacEEZ67weeMuY3NSAM,7097
-eflips_depot-4.6.7.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.6.7.dist-info/METADATA,sha256=8ZhFsc9DzScN-igSjjhMmKbUnErElAu9FRWZn8rI1w8,5940
-eflips_depot-4.6.7.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-eflips_depot-4.6.7.dist-info/RECORD,,
+eflips_depot-4.6.9.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.6.9.dist-info/METADATA,sha256=8JDd8PEG-WlgbVE4NV01trvOyBazApzaPZKBMALcJ_Y,5940
+eflips_depot-4.6.9.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+eflips_depot-4.6.9.dist-info/RECORD,,