eflips-depot 3.0.3__tar.gz → 3.0.4__tar.gz

{eflips_depot-3.0.3 → eflips_depot-3.0.4}/PKG-INFO

@@ -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 → eflips_depot-3.0.4}/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 → eflips_depot-3.0.4}/pyproject.toml

@@ -1,12 +1,14 @@
 [tool.poetry]
 name = "eflips-depot"
-version = "3.0.3"
+version = "3.0.4"
 description = "Depot Simulation for eFLIPS"
 authors = ["Enrico Lauth <enrico.lauth@tu-berlin.de>",
     "Ludger Heide <ludger.heide@tu-berlin.de",
     "Shuyao Guo <shuyao.guo@tu-berlin.de"]
-license = "AGPLv3"
+license = "AGPL-3.0-or-later"
 readme = "README.md"
+homepage = "https://github.com/mpm-tu-berlin/eflips-depot"
+repository = "https://github.com/mpm-tu-berlin/eflips-depot"
 packages = [{ include = "eflips/depot" }]
 
 [tool.poetry.dependencies]