eflips-depot 3.2.1__py3-none-any.whl → 3.2.2__py3-none-any.whl

eflips/depot/api/__init__.py

@@ -45,6 +45,7 @@ from eflips.model import (
     Vehicle,
     Process,
     AssocAreaProcess,
+    Station,
 )
 from sqlalchemy.orm import Session
 from sqlalchemy.sql import select
@@ -842,8 +843,8 @@ def add_evaluation_to_database(
                         # In case there are no copy trips before or after the non-copy trip
                         continue
 
-            # The range of time of events to be generated. It is between the copy trip before the first non-copy trip and the
-            # copy trip after the last non-copy trip
+            # The range of time of events to be generated. It is between the copy trip before the first non-copy trip
+            # and the copy trip after the last non-copy trip
             earliest_time = sorted(dict_of_events.keys())[0]
             latest_time = sorted(dict_of_events.keys())[-1]
 
@@ -874,6 +875,21 @@ def add_evaluation_to_database(
                     expected_area = waiting_info["area"]
                     # Find the area for standby arrival event
 
+                    # Get the corresponding depot id first by grabbing one of the rotations and get its departure station
+                    some_rotation_id = current_vehicle.finished_trips[0].ID
+                    some_rotation = (
+                        session.query(Rotation)
+                        .filter(Rotation.id == some_rotation_id)
+                        .one()
+                    )
+                    start_station = some_rotation.trips[0].route.departure_station_id
+                    depot_id = (
+                        session.query(Depot.id)
+                        .join(Station)
+                        .filter(Station.id == start_station)
+                        .one()[0]
+                    )
+
                     waiting_area_id = (
                         session.query(Area.id)
                         .join(AssocAreaProcess, AssocAreaProcess.area_id == Area.id)
@@ -886,6 +902,7 @@ def add_evaluation_to_database(
                             Area.vehicle_type_id
                             == int(current_vehicle.vehicle_type.ID),
                             Area.scenario_id == scenario.id,
+                            Area.depot_id == depot_id,
                         )
                         .one()[0]
                     )

{eflips_depot-3.2.1.dist-info → eflips_depot-3.2.2.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 eflips/depot/__init__.py,sha256=n7jte8R6j_Ad4Mp4hkklKwil5r8u8Q_SbXrCC-nf5jM,1556
-eflips/depot/api/__init__.py,sha256=sSNY1CBO2AmekxdNi-o_mCbWUlMpsBUfVaYT6jYFuxo,57378
+eflips/depot/api/__init__.py,sha256=OhjCyPvGZ-XYuyfaCqCp8XHyN9MvJVUGBayB3IoNKBI,58172
 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
@@ -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-3.2.1.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-3.2.1.dist-info/METADATA,sha256=yQQVxr8UEGtM9z_1O6E2v0yA7s1tJCZ_kuPkHx-7k3g,5840
-eflips_depot-3.2.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-eflips_depot-3.2.1.dist-info/RECORD,,
+eflips_depot-3.2.2.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-3.2.2.dist-info/METADATA,sha256=UWxPQcC7Ml5aWUmfKTtYKxEgKkV9-JfCVhh6OiqD7C8,5840
+eflips_depot-3.2.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+eflips_depot-3.2.2.dist-info/RECORD,,