eflips-depot 4.2.0__tar.gz → 4.2.2__tar.gz

{eflips_depot-4.2.0 → eflips_depot-4.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eflips-depot
-Version: 4.2.0
+Version: 4.2.2
 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 → eflips_depot-4.2.2}/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
@@ -492,6 +493,8 @@ def apply_even_smart_charging(
 
     :return: None. The results are added to the database.
     """
+    logger = logging.getLogger(__name__)
+
     with create_session(scenario, database_url) as (session, scenario):
         depots = session.query(Depot).filter(Depot.scenario_id == scenario.id).all()
         for depot in depots:
@@ -520,7 +523,7 @@ def apply_even_smart_charging(
                     next_event is None
                     or next_event.event_type != EventType.STANDBY_DEPARTURE
                 ):
-                    warnings.warn(
+                    logger.info(
                         f"Event {charging_event.id} has no STANDBY_DEPARTURE event after a CHARGING_DEPOT "
                         f"event. No room for smart charging."
                     )
@@ -1099,6 +1102,8 @@ def _generate_vehicle_events(
     :return: None. The results are added to the dictionary.
     """
 
+    logger = logging.getLogger(__name__)
+
     # For convenience
     area_log = current_vehicle.logger.loggedData["dwd.current_area"]
     slot_log = current_vehicle.logger.loggedData["dwd.current_slot"]
@@ -1118,7 +1123,7 @@ def _generate_vehicle_events(
             if waiting_info["waiting_time"] == 0:
                 continue
 
-            warnings.warn(
+            logger.info(
                 f"Vehicle {current_vehicle.ID} has been waiting for {waiting_info['waiting_time']} seconds. "
             )
 
@@ -1188,6 +1193,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"
+                                        ):
+                                            logger.info(
+                                                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,
@@ -1437,6 +1460,8 @@ def _update_waiting_events(session, scenario, waiting_area_id) -> None:
 
     :return: None. The results are added to the database.
     """
+    logger = logging.getLogger(__name__)
+
     # Process all the STANDBY (waiting) events #
     all_waiting_starts = (
         session.query(Event)
@@ -1463,7 +1488,7 @@ def _update_waiting_events(session, scenario, waiting_area_id) -> None:
     ), f"Number of waiting events starts {len(all_waiting_starts)} is not equal to the number of waiting event ends"
 
     if len(all_waiting_starts) == 0:
-        print(
+        logger.info(
             "No waiting events found. The depot has enough capacity for waiting. Change the waiting area capacity to 10 as buffer."
         )
 
@@ -1494,7 +1519,7 @@ def _update_waiting_events(session, scenario, waiting_area_id) -> None:
     waiting_area_id = all_waiting_starts[0].area_id
     waiting_area = session.query(Area).filter(Area.id == waiting_area_id).first()
     if waiting_area.capacity > peak_waiting_occupancy:
-        warnings.warn(
+        logger.info(
             f"Current waiting area capacity {waiting_area.capacity} "
             f"is greater than the peak waiting occupancy. Updating the capacity to {peak_waiting_occupancy}."
         )

{eflips_depot-4.2.0 → eflips_depot-4.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "eflips-depot"
-version = "4.2.0"
+version = "4.2.2"
 description = "Depot Simulation for eFLIPS"
 authors = ["Enrico Lauth <enrico.lauth@tu-berlin.de>",
     "Ludger Heide <ludger.heide@tu-berlin.de",