eflips-depot 4.2.2__py3-none-any.whl → 4.3.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,7 +294,6 @@ def simple_consumption_simulation(
                     timeseries=timeseries,
                 )
                 session.add(current_event)
-                session.flush()  # TODO
 
                 # If the vehicle is
                 #  - Capable of opportunity charging
@@ -365,7 +364,7 @@ def simple_consumption_simulation(
                             soc_end=post_charge_soc,
                             event_type=EventType.CHARGING_OPPORTUNITY,
                             description=f"Opportunity charging event for trip {trip.id}.",
-                            timeseries=None,
+                            timeseries=timeseries,
                         )
                         current_soc = post_charge_soc
                         session.add(current_event)
@@ -493,8 +492,6 @@ 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:
@@ -523,7 +520,7 @@ def apply_even_smart_charging(
                     next_event is None
                     or next_event.event_type != EventType.STANDBY_DEPARTURE
                 ):
-                    logger.info(
+                    warnings.warn(
                         f"Event {charging_event.id} has no STANDBY_DEPARTURE event after a CHARGING_DEPOT "
                         f"event. No room for smart charging."
                     )
@@ -1102,8 +1099,6 @@ 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"]
@@ -1123,7 +1118,7 @@ def _generate_vehicle_events(
             if waiting_info["waiting_time"] == 0:
                 continue
 
-            logger.info(
+            warnings.warn(
                 f"Vehicle {current_vehicle.ID} has been waiting for {waiting_info['waiting_time']} seconds. "
             )
 
@@ -1193,24 +1188,6 @@ 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,
@@ -1460,8 +1437,6 @@ 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)
@@ -1488,7 +1463,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:
-        logger.info(
+        print(
             "No waiting events found. The depot has enough capacity for waiting. Change the waiting area capacity to 10 as buffer."
         )
 
@@ -1519,7 +1494,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:
-        logger.info(
+        warnings.warn(
             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/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.2.dist-info → eflips_depot-4.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eflips-depot
-Version: 4.2.2
+Version: 4.3.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.2.dist-info → eflips_depot-4.3.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 eflips/depot/__init__.py,sha256=n7jte8R6j_Ad4Mp4hkklKwil5r8u8Q_SbXrCC-nf5jM,1556
-eflips/depot/api/__init__.py,sha256=gprfIzkDZe7KW1K8GAC3TqNjXZRbMqh0q4aOgc0Uvcc,67956
+eflips/depot/api/__init__.py,sha256=iAGL9CPL2pjs0ol3VW0jCokvYa-OZqnwdjfq07wpMvw,66734
 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
 eflips/depot/api/private/smart_charging.py,sha256=JqYlUv_TnEqnp1Ks3FV3Od2rkYMOSORfUhrxZ49lUyE,13775
-eflips/depot/api/private/util.py,sha256=0l1ZFtMamdapPjk3OXiGCP5STefmN6b-RlfUyMd9PbQ,17017
+eflips/depot/api/private/util.py,sha256=LtDIW904chDby9ERmvbVum5YtOZXi1OmN4a2SszmIfs,16834
 eflips/depot/configuration.py,sha256=Op3hlir-dEN7yHr0kTqbYANoCBKFWK6uKOv3NJl8w_w,35678
 eflips/depot/depot.py,sha256=afIlaiX-J-M5-K_oAGMr_soL3_QjIAwrQKDaZzTwle0,105566
 eflips/depot/evaluation.py,sha256=qqXyP4jA1zFcKuWhliQ6n25ZlGl9mJV-vtXf0yu8WN8,140842
@@ -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.2.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.2.2.dist-info/METADATA,sha256=t4Xabe9jTtFICqcvdTvCsqRS5Ix0aOl0A2GlKAsOT1g,5839
-eflips_depot-4.2.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-eflips_depot-4.2.2.dist-info/RECORD,,
+eflips_depot-4.3.1.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.3.1.dist-info/METADATA,sha256=16VRLrJjzOpO0C_BvhQlohKOQ1DMlflFLeJNLWm4DXs,5839
+eflips_depot-4.3.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+eflips_depot-4.3.1.dist-info/RECORD,,