eflips-depot 3.0.3__py3-none-any.whl → 3.0.4__py3-none-any.whl

eflips/depot/api/__init__.py

@@ -306,7 +306,7 @@ def generate_depot_layout(
             max_occupancies: Dict[eflips.model.VehicleType, int] = {}
             max_clean_occupancies: Dict[eflips.model.VehicleType, int] = {}
             for vehicle_type, rotations in vehicle_type_dict.items():
-                # Slightly convoulted vehicle summation
+                # Slightly convoluted vehicle summation
                 start_time = min(
                     [rotation.trips[0].departure_time for rotation in rotations]
                 ).timestamp()
@@ -665,14 +665,10 @@ def add_evaluation_to_database(
 
         list_of_vehicles = []
 
-        list_of_events = []
-
         list_of_assigned_schedules = []
 
         # Read results from depot_evaluation categorized by vehicle
         for current_vehicle in depot_evaluation.vehicle_generator.items:
-            list_of_events_per_vehicle = []
-
             vehicle_type_id = int(current_vehicle.vehicle_type.ID)
 
             # Create a Vehicle object for database
@@ -759,7 +755,7 @@ def add_evaluation_to_database(
                     "end": end_time,
                     "area": waiting_area_id,
                     "slot": current_slot,
-                    "is_area_sink": waiting_area_id,
+                    "is_area_sink": False,
                 }
 
             # Create a list of battery log in order of time asc. Convenient for looking up corresponding soc
@@ -982,9 +978,6 @@ def add_evaluation_to_database(
                                 timeseries=None,
                             )
                             session.add(current_event)
-                            list_of_events_per_vehicle.append(current_event)
-
-                list_of_events.extend(list_of_events_per_vehicle)
 
                 # For non-copy schedules with no predecessor events, adding a dummy standby-departure
                 if (
@@ -1033,7 +1026,6 @@ def add_evaluation_to_database(
                     )
 
                     session.add(standby_event)
-                    list_of_events.append(standby_event)
 
         # New rotation assignment
         for schedule_id, vehicle_id in list_of_assigned_schedules:

{eflips_depot-3.0.3.dist-info → eflips_depot-3.0.4.dist-info}/METADATA

@@ -1,12 +1,13 @@
 Metadata-Version: 2.1
 Name: eflips-depot
-Version: 3.0.3
+Version: 3.0.4
 Summary: Depot Simulation for eFLIPS
-License: AGPLv3
+Home-page: https://github.com/mpm-tu-berlin/eflips-depot
+License: AGPL-3.0-or-later
 Author: Enrico Lauth
 Author-email: enrico.lauth@tu-berlin.de
 Requires-Python: >=3.10,<4.0
-Classifier: License :: Other/Proprietary License
+Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -17,6 +18,7 @@ Requires-Dist: pandas (>=2.1.4,<3.0.0)
 Requires-Dist: simpy (>=4.0.1,<5.0.0)
 Requires-Dist: xlrd (<=1.2.0)
 Requires-Dist: xlsxwriter (>=3.1.9,<4.0.0)
+Project-URL: Repository, https://github.com/mpm-tu-berlin/eflips-depot
 Description-Content-Type: text/markdown
 
 [![Tests](https://github.com/mpm-tu-berlin/eflips-depot/actions/workflows/postgres_eflips_depot.yml/badge.svg)](https://github.com/mpm-tu-berlin/eflips-depot/actions/workflows/postgres_eflips_depot.yml)

{eflips_depot-3.0.3.dist-info → eflips_depot-3.0.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 eflips/depot/__init__.py,sha256=n7jte8R6j_Ad4Mp4hkklKwil5r8u8Q_SbXrCC-nf5jM,1556
-eflips/depot/api/__init__.py,sha256=gh7IiB2w-nEhLhE1aHJ7qCWHiea8LMooeJ1_GOm3HFA,50146
+eflips/depot/api/__init__.py,sha256=8wTudvo_4K4rs2hopks-tFbNtKyy-rQ1XZEBK7T76uM,49861
 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=GlIk6vuanbQP3a4e9TYt6xJ-XJTdaFbaxxz_ni17zgo,17136
@@ -34,7 +34,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-3.0.3.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-3.0.3.dist-info/METADATA,sha256=pej-9i5Pkbllt-oWW5Cv3x3RZeLkJ2-qR1rNopHgMnI,5648
-eflips_depot-3.0.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-eflips_depot-3.0.3.dist-info/RECORD,,
+eflips_depot-3.0.4.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-3.0.4.dist-info/METADATA,sha256=FAyBc5jwSCKArr4nNQbExWg42FJWiwAUHxaU-V-Mf6M,5833
+eflips_depot-3.0.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+eflips_depot-3.0.4.dist-info/RECORD,,