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

eflips/depot/api/private/depot.py

@@ -126,20 +126,27 @@ class DepotConfigurationWish:
         self.areas = areas
 
         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 must be provided."
-                )
-            if (
-                self.cleaning_slots is not None
-                or self.cleaning_duration is not None
-                or self.shunting_slots is not None
-                or self.shunting_duration is not None
-            ):
-                raise ValueError(
-                    "If auto_generate is True, default_power, standard_block_length, cleaning_slots, cleaning_duration and shunting_slots cannot be provided."
-                )
-        # do some simple validation here
+            assert (
+                self.default_power is not None
+            ), "default_power must be provided if auto_generate is True"
+            assert (
+                self.standard_block_length is not None
+            ), "standard_block_length must be provided if auto_generate is True"
+
+            assert (
+                self.cleaning_slots is None
+            ), "cleaning_slots cannot be provided if auto_generate is True"
+            assert (
+                self.cleaning_duration is None
+            ), "cleaning_duration cannot be provided if auto_generate is True"
+            assert (
+                self.shunting_slots is None
+            ), "shunting_slots cannot be provided if auto_generate is True"
+            assert (
+                self.shunting_duration is None
+            ), "shunting_duration cannot be provided if auto_generate is True"
+
+            assert areas is None, "areas cannot be provided if auto_generate is True"
 
 
 def delete_depots(scenario: Scenario, session: Session) -> None:

eflips/depot/api/private/results_to_database.py

@@ -545,8 +545,9 @@ def add_events_into_database(
             area_id=area_id,
             subloc_no=process_dict["slot"] if "slot" in process_dict.keys() else 00,
             trip_id=None,
-            time_start=timedelta(seconds=start_time) + simulation_start_time,
-            time_end=timedelta(seconds=process_dict["end"]) + simulation_start_time,
+            time_start=timedelta(seconds=math.ceil(start_time)) + simulation_start_time,
+            time_end=timedelta(seconds=math.ceil(process_dict["end"]))
+            + simulation_start_time,
             soc_start=process_dict["soc_start"]
             if process_dict["soc_start"] is not None
             else process_dict["soc_end"],

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

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

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

@@ -3,8 +3,8 @@ eflips/depot/api/__init__.py,sha256=HvPtHi55hXwGgxD_DcYZxUnws1KRkKnezxI3Bao9TTg,
 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=wFzKYbUTtU-mOGZD6gB_fQBaKGRTXZn4f5hRuuV6gkg,59629
-eflips/depot/api/private/results_to_database.py,sha256=OewbDwbk54GPORMVavLbJ7DSZpRKBLHM7q9aWKTngs8,30026
+eflips/depot/api/private/depot.py,sha256=5w2g8Ki6HqR5LRfCgU2sF72jG6EDixqIOTHq2NpWZBY,59864
+eflips/depot/api/private/results_to_database.py,sha256=7gQMPPQpOrArFE3R_8Fni6jK8IZsd5SoNdUh2Zt6pJA,30060
 eflips/depot/api/private/util.py,sha256=e7T_-1AUXoCV9c11zaED2-za7p0TDhYG4Dg0lBZnrZI,18342
 eflips/depot/configuration.py,sha256=Op3hlir-dEN7yHr0kTqbYANoCBKFWK6uKOv3NJl8w_w,35678
 eflips/depot/depot.py,sha256=5NBw5bvOP2cplkRGZbKbG3SOA23F2Kw-UsabHubocPU,107555
@@ -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.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,,
+eflips_depot-4.15.6.dist-info/METADATA,sha256=9nnGlmtfW4-SdK24I21ZAoYZBKlnhTntfcpj_5nJ8w0,5961
+eflips_depot-4.15.6.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+eflips_depot-4.15.6.dist-info/licenses/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.15.6.dist-info/RECORD,,