eflips-depot 4.14.1__tar.gz → 4.14.3__tar.gz

{eflips_depot-4.14.1 → eflips_depot-4.14.3}/PKG-INFO

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

{eflips_depot-4.14.1 → eflips_depot-4.14.3}/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.1 → eflips_depot-4.14.3}/eflips/depot/api/private/consumption.py

@@ -121,38 +121,29 @@ class ConsumptionInformation:
             )
 
         # Recover the scales along each of the four axes from the datapoints
+        incline_col_index = self.consumption_lut.columns.index("incline")
+        temperature_col_index = self.consumption_lut.columns.index("t_amb")
+        level_of_loading_col_index = self.consumption_lut.columns.index(
+            "level_of_loading"
+        )
+        speed_col_index = self.consumption_lut.columns.index("mean_speed_kmh")
 
         incline_scale = sorted(
-            set(
-                [
-                    x[self.consumption_lut.columns.index("incline")]
-                    for x in self.consumption_lut.data_points
-                ]
-            )
+            set([x[incline_col_index] for x in self.consumption_lut.data_points])
         )
         temperature_scale = sorted(
-            set(
-                [
-                    x[self.consumption_lut.columns.index("t_amb")]
-                    for x in self.consumption_lut.data_points
-                ]
-            )
+            set([x[temperature_col_index] for x in self.consumption_lut.data_points])
         )
         level_of_loading_scale = sorted(
             set(
                 [
-                    x[self.consumption_lut.columns.index("level_of_loading")]
+                    x[level_of_loading_col_index]
                     for x in self.consumption_lut.data_points
                 ]
             )
         )
         speed_scale = sorted(
-            set(
-                [
-                    x[self.consumption_lut.columns.index("mean_speed_kmh")]
-                    for x in self.consumption_lut.data_points
-                ]
-            )
+            set([x[speed_col_index] for x in self.consumption_lut.data_points])
         )
 
         # Create the 4d array
@@ -168,9 +159,14 @@ class ConsumptionInformation:
         # Fill it with NaNs
         consumption_lut.fill(np.nan)
 
-        for i, (incline, temperature, level_of_loading, speed) in enumerate(
-            self.consumption_lut.data_points
-        ):
+        for (
+            i,
+            data_point,
+        ) in enumerate(self.consumption_lut.data_points):
+            incline = data_point[incline_col_index]
+            temperature = data_point[temperature_col_index]
+            level_of_loading = data_point[level_of_loading_col_index]
+            speed = data_point[speed_col_index]
             consumption_lut[
                 incline_scale.index(incline),
                 temperature_scale.index(temperature),

{eflips_depot-4.14.1 → eflips_depot-4.14.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "eflips-depot"
-version = "4.14.1"
+version = "4.14.3"
 description = "Depot Simulation for eFLIPS"
 authors = ["Enrico Lauth <enrico.lauth@tu-berlin.de>",
     "Ludger Heide <ludger.heide@tu-berlin.de",