eflips-depot 4.2.0__py3-none-any.whl → 4.2.1__py3-none-any.whl

eflips/depot/api/__init__.py

@@ -278,7 +278,7 @@ def simple_consumption_simulation(
                     timeseries = None
                 energy_used = consumption * trip.route.distance / 1000  # kWh
                 current_soc = soc_start - energy_used / vehicle_type.battery_capacity
-
+                session.flush()  # TODO
                 # Create a driving event
                 current_event = Event(
                     scenario_id=scenario.id,
@@ -294,6 +294,7 @@ def simple_consumption_simulation(
                     timeseries=timeseries,
                 )
                 session.add(current_event)
+                session.flush()  # TODO
 
                 # If the vehicle is
                 #  - Capable of opportunity charging
@@ -1188,6 +1189,24 @@ def _generate_vehicle_events(
                                     and "end" in dict_of_events[time_stamp].keys()
                                 ):
                                     start_this_event = dict_of_events[time_stamp]["end"]
+                                    if start_this_event in dict_of_events.keys():
+                                        if (
+                                            dict_of_events[start_this_event]["type"]
+                                            == "Trip"
+                                        ):
+                                            print(
+                                                f"Vehicle {current_vehicle.ID} must depart immediately after charged. "
+                                                f"Thus there will be no STANDBY_DEPARTURE event."
+                                            )
+
+                                        else:
+                                            raise ValueError(
+                                                f"There is already an event "
+                                                f"{dict_of_events[start_this_event]} at {start_this_event}."
+                                            )
+
+                                        continue
+
                                     dict_of_events[start_this_event] = {
                                         "type": type(process).__name__,
                                         "area": current_area.ID,

{eflips_depot-4.2.0.dist-info → eflips_depot-4.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eflips-depot
-Version: 4.2.0
+Version: 4.2.1
 Summary: Depot Simulation for eFLIPS
 Home-page: https://github.com/mpm-tu-berlin/eflips-depot
 License: AGPL-3.0-or-later

{eflips_depot-4.2.0.dist-info → eflips_depot-4.2.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 eflips/depot/__init__.py,sha256=n7jte8R6j_Ad4Mp4hkklKwil5r8u8Q_SbXrCC-nf5jM,1556
-eflips/depot/api/__init__.py,sha256=JiSTa2Q3GByvv9mAPtmvc-lTzlqN-mcTfeb59AfTxNE,66728
+eflips/depot/api/__init__.py,sha256=vfaJDCPdhAMfqNb9ik4lpmlz62j9JOrJSM9njAv4PJA,67824
 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=pgLk9rdjZthk35vKCTmcl4VfjYQJRnqR-CPGwBs_9zk,18111
@@ -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.2.0.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.2.0.dist-info/METADATA,sha256=FPm1Bqi3HVslAmgOnOludpt-0v1Ke_TpLJY-JKgND-I,5839
-eflips_depot-4.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-eflips_depot-4.2.0.dist-info/RECORD,,
+eflips_depot-4.2.1.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.2.1.dist-info/METADATA,sha256=py-gD6MYp6_5DbqTkz-9y2JpULWDEmWlKqzdLKeG9Wg,5839
+eflips_depot-4.2.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+eflips_depot-4.2.1.dist-info/RECORD,,