eflips-depot 4.2.1__tar.gz → 4.3.0__tar.gz

{eflips_depot-4.2.1 → eflips_depot-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eflips-depot
-Version: 4.2.1
+Version: 4.3.0
 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.1 → eflips_depot-4.3.0}/eflips/depot/api/__init__.py

@@ -493,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:
@@ -521,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."
                     )
@@ -1100,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"]
@@ -1119,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. "
             )
 
@@ -1194,7 +1198,7 @@ def _generate_vehicle_events(
                                             dict_of_events[start_this_event]["type"]
                                             == "Trip"
                                         ):
-                                            print(
+                                            logger.info(
                                                 f"Vehicle {current_vehicle.ID} must depart immediately after charged. "
                                                 f"Thus there will be no STANDBY_DEPARTURE event."
                                             )
@@ -1456,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)
@@ -1482,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."
         )
 
@@ -1513,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.1 → eflips_depot-4.3.0}/eflips/depot/api/private/util.py

@@ -130,11 +130,7 @@ def repeat_vehicle_schedules(
 
     for vehicle_schedule in vehicle_schedules:
         schedule_list_backward.append(vehicle_schedule.repeat(-repetition_period))
-        if repetition_period == timedelta(days=1):
-            # For daily schedules, repeat the schedule backward twice for the stability of the results
-            schedule_list_backward.append(
-                vehicle_schedule.repeat(-2 * repetition_period)
-            )
+        schedule_list_backward.append(vehicle_schedule.repeat(-2 * repetition_period))
 
         schedule_list_forward.append(vehicle_schedule.repeat(repetition_period))
 
@@ -180,7 +176,9 @@ def start_and_end_times(vehicle_schedules) -> Tuple[datetime, int]:
 
 def check_depot_validity(depot: Depot) -> None:
     """
-    Check if the depot is valid for the eflips-depot simulation. Raise an AssertionError if it is not.
+    Check if the depot is valid for the eflips-depot simulation.
+
+    Raise an AssertionError if it is not.
     :param depot: a :class:`eflips.model.Depot` object.
     :return: None
     """

{eflips_depot-4.2.1 → eflips_depot-4.3.0}/pyproject.toml

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