eflips-depot 4.14.2__py3-none-any.whl → 4.14.3__py3-none-any.whl

eflips/depot/api/__init__.py

@@ -1381,10 +1381,11 @@ def auto_generate_depot_inplace(
                 for trip in rot.trips:
                     for stop_time in trip.stop_times:
                         to_delete.append(stop_time)
+                    for event in trip.events:
+                        to_delete.append(event)
                     to_delete.append(trip)
                 to_delete.append(rot)
 
-        # debugging
         for obj in to_delete:
             session.flush()
             session.delete(obj)
@@ -1392,13 +1393,49 @@ def auto_generate_depot_inplace(
 
         # Consumption simulation for rotations of this depot
 
-        consumption_results = generate_consumption_result(scenario)
-        simple_consumption_simulation(
-            scenario,
-            initialize_vehicles=True,
-            consumption_result=consumption_results,
+        # if the driving events are already in the database, we do not need to run the consumption simulation again
+        current_driving_trips = (
+            session.query(Event.trip_id)
+            .filter(
+                Event.scenario_id == scenario.id, Event.event_type == EventType.DRIVING
+            )
+            .all()
+        )
+        current_trips = (
+            session.query(Trip.id).filter(Trip.scenario_id == scenario.id).all()
         )
 
+        # if the two lists are identical, we can skip the consumption simulation
+        if set([t[0] for t in current_driving_trips]) != set(
+            [t[0] for t in current_trips]
+        ):
+            logger.info(
+                "Running eflips consumption simulation for depot layout generation since the driving events do not cover all trips"
+            )
+            driving_events_to_delete = (
+                session.query(Event)
+                .filter(
+                    Event.scenario_id == scenario.id,
+                    Event.event_type == EventType.DRIVING,
+                )
+                .all()
+            )
+            if len(driving_events_to_delete) > 0:
+                logger.info(
+                    "Deleting existing driving events before running consumption simulation"
+                )
+                for event in driving_events_to_delete:
+                    session.delete(event)
+                session.flush()
+
+            logger.warning("Starting eflips consumption sim")
+            consumption_results = generate_consumption_result(scenario)
+            simple_consumption_simulation(
+                scenario,
+                initialize_vehicles=True,
+                consumption_result=consumption_results,
+            )
+
         logger.info(f"Generating depot layout for station {station.name}")
         vt_capacities_for_station = depot_smallest_possible_size(
             station,
@@ -1460,9 +1497,9 @@ def generate_optimal_depot_layout(
     """
 
     with create_session(scenario, database_url) as (session, scenario):
-        # Delete all depot events
+        # Delete all non-Driving events
         session.query(Event).filter(
-            Event.scenario_id == scenario.id, Event.area_id.isnot(None)
+            Event.scenario_id == scenario.id, Event.event_type != EventType.DRIVING
         ).delete()
 
         if session.query(Depot).filter(Depot.scenario_id == scenario.id).count() != 0:
@@ -1486,9 +1523,7 @@ def generate_optimal_depot_layout(
         # Delete all vehicles and events, also disconnect the vehicles from the rotations
         rotation_q = session.query(Rotation).filter(Rotation.scenario_id == scenario.id)
         rotation_q.update({"vehicle_id": None})
-        session.query(Event).filter(Event.scenario_id == scenario.id).delete()
-        session.query(Vehicle).filter(Vehicle.scenario_id == scenario.id).delete()
-        session.expire_all()
+
         for depot_wish in depot_config_wishes:
             if depot_wish.auto_generate is False:
                 continue

{eflips_depot-4.14.2.dist-info → eflips_depot-4.14.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eflips-depot
-Version: 4.14.2
+Version: 4.14.3
 Summary: Depot Simulation for eFLIPS
 License: AGPL-3.0-or-later
 License-File: LICENSE.md

{eflips_depot-4.14.2.dist-info → eflips_depot-4.14.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 eflips/depot/__init__.py,sha256=FCVnYU7aSfR4BNCo722I1V3uU5336qr1tTt-zT6X4UI,1555
-eflips/depot/api/__init__.py,sha256=TDjYjf2h_oBwm3Wmcw1J1RQrV2xct7ETOMsgVZ6c30A,65406
+eflips/depot/api/__init__.py,sha256=B1Ph7nQd0W0-Io2tInnaw07bzxCXK7d1M7oWbr1jN8I,66813
 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/consumption.py,sha256=0wfI3ryfZS9qUqPbJP0okvwY2s6ogylw1PZFyAnCRf4,28915
@@ -36,7 +36,7 @@ eflips/depot/simulation.py,sha256=ee0qTzOzG-8ybN36ie_NJallXfC7jUaS9JZvaYFziLs,10
 eflips/depot/smart_charging.py,sha256=C3BYqzn2-OYY4ipXm0ETtavbAM9QXZMYULBpVoChf0E,54311
 eflips/depot/standalone.py,sha256=8O01zEXghFG9zZBu0fUD0sXvbHQ-AXw6RB5M750a_sM,22419
 eflips/depot/validation.py,sha256=TIuY7cQtEJI4H2VVMSuY5IIVkacEEZ67weeMuY3NSAM,7097
-eflips_depot-4.14.2.dist-info/METADATA,sha256=UvewbAnnEpknimQuan3FpVOmSmBXAvXmFPtfSxZbUdI,5961
-eflips_depot-4.14.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-eflips_depot-4.14.2.dist-info/licenses/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.14.2.dist-info/RECORD,,
+eflips_depot-4.14.3.dist-info/METADATA,sha256=7kG6MB_RgTTOyfwBxNFRle9rfIvnk3bLm5CIGHsygwk,5961
+eflips_depot-4.14.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+eflips_depot-4.14.3.dist-info/licenses/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.14.3.dist-info/RECORD,,