eflips-depot 4.15.2__py3-none-any.whl → 4.15.4__py3-none-any.whl

eflips/depot/api/__init__.py

@@ -685,7 +685,9 @@ def simulate_scenario(
             case SmartChargingStrategy.NONE:
                 pass
             case SmartChargingStrategy.EVEN:
-                apply_even_smart_charging(scenario, database_url)
+                apply_even_smart_charging(
+                    scenario, database_url, delete_existing_charging_timeseries=True
+                )
             case SmartChargingStrategy.MIN_PRICE:
                 raise NotImplementedError("MIN_PRICE strategy is not implemented yet.")
             case _:

eflips/depot/api/private/depot.py

@@ -128,7 +128,7 @@ class DepotConfigurationWish:
         if self.auto_generate is True:
             if self.default_power is None or self.standard_block_length is None:
                 raise ValueError(
-                    "If auto_generate is True, default_power, standard_block_length, cleaning_slots, cleaning_duration and shunting_slots must be provided."
+                    "If auto_generate is True, default_power, standard_block_length must be provided."
                 )
             if (
                 self.cleaning_slots is not None
@@ -1196,7 +1196,9 @@ def depot_smallest_possible_size(
 
                     # Simulate the depot
                     simulate_scenario(
-                        scenario, smart_charging_strategy=SmartChargingStrategy.NONE
+                        scenario,
+                        smart_charging_strategy=SmartChargingStrategy.NONE,
+                        ignore_unstable_simulation=True,
                     )
 
                     # Find the peak usage of the depot
@@ -1260,12 +1262,6 @@ def depot_smallest_possible_size(
 
                 except MissingVehicleDimensionError as e:
                     raise e
-                except UnstableSimulationException as e:
-                    # This change is made after Unstable exception and delay exceptions are introduced
-                    logger.debug(
-                        f"Results are unstable, suggesting depot is too small."
-                    )
-                    continue
                 except DelayedTripException as e:
                     logger.debug(f"Trips are delayed, suggesting depot is too small.")
                     continue
@@ -1275,6 +1271,10 @@ def depot_smallest_possible_size(
         # Identify the best configuration for each vehicle type
         ret_val: Dict[VehicleType, Dict[AreaType, int]] = dict()
         for vt in vts_and_rotations.keys():
+            assert area_needed[vt] != {}, (
+                f"No valid configurations found for {vt.name}, "
+                f"please check if there are any delays after simulating scenario."
+            )
             best_config = min(area_needed[vt].keys(), key=lambda x: area_needed[vt][x])
             ret_val[vt] = {
                 AreaType.LINE: best_config * standard_block_length,

{eflips_depot-4.15.2.dist-info → eflips_depot-4.15.4.dist-info}/METADATA

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

{eflips_depot-4.15.2.dist-info → eflips_depot-4.15.4.dist-info}/RECORD

@@ -1,9 +1,9 @@
 eflips/depot/__init__.py,sha256=FCVnYU7aSfR4BNCo722I1V3uU5336qr1tTt-zT6X4UI,1555
-eflips/depot/api/__init__.py,sha256=nq5aHGTOIpDmvDfcGMlCH_jd97E0VZ28KVcT3XTwpbE,67539
+eflips/depot/api/__init__.py,sha256=HvPtHi55hXwGgxD_DcYZxUnws1KRkKnezxI3Bao9TTg,67619
 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=494u6FelymWfI-Yt3ybJpLHUL-6zEqBOT2qSrPhRmMo,30038
-eflips/depot/api/private/depot.py,sha256=G08E9yZ18c2oSQVYGRI8nAHtGZ8EHWsRJUOR23a2bao,59720
+eflips/depot/api/private/depot.py,sha256=wFzKYbUTtU-mOGZD6gB_fQBaKGRTXZn4f5hRuuV6gkg,59629
 eflips/depot/api/private/results_to_database.py,sha256=OewbDwbk54GPORMVavLbJ7DSZpRKBLHM7q9aWKTngs8,30026
 eflips/depot/api/private/util.py,sha256=e7T_-1AUXoCV9c11zaED2-za7p0TDhYG4Dg0lBZnrZI,18342
 eflips/depot/configuration.py,sha256=Op3hlir-dEN7yHr0kTqbYANoCBKFWK6uKOv3NJl8w_w,35678
@@ -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=8O01zEXghFG9zZBu0fUD0sXvbHQ-AXw6RB5M750a_sM,22419
 eflips/depot/validation.py,sha256=TIuY7cQtEJI4H2VVMSuY5IIVkacEEZ67weeMuY3NSAM,7097
-eflips_depot-4.15.2.dist-info/METADATA,sha256=vxdX4GRYggcgaLeIG84k6D6teA4g0i_PSYFY-U1IkGg,5961
-eflips_depot-4.15.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-eflips_depot-4.15.2.dist-info/licenses/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.15.2.dist-info/RECORD,,
+eflips_depot-4.15.4.dist-info/METADATA,sha256=96QASZxpS3Z6obl3xDrwcEsxD-84hCR2y88o_6Yg0kE,5961
+eflips_depot-4.15.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+eflips_depot-4.15.4.dist-info/licenses/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.15.4.dist-info/RECORD,,