eflips-depot 4.15.0__tar.gz → 4.15.1__tar.gz

{eflips_depot-4.15.0 → eflips_depot-4.15.1}/PKG-INFO

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

{eflips_depot-4.15.0 → eflips_depot-4.15.1}/eflips/depot/api/private/consumption.py

@@ -286,20 +286,6 @@ def extract_trip_information(
             )
             .one()
         )
-        # Check exactly one of the vehicle classes has a consumption LUT
-        all_consumption_luts = [
-            vehicle_class.consumption_lut
-            for vehicle_class in trip.rotation.vehicle_type.vehicle_classes
-        ]
-        all_consumption_luts = [x for x in all_consumption_luts if x is not None]
-        if len(all_consumption_luts) != 1:
-            raise ValueError(
-                f"Expected exactly one consumption LUT, got {len(all_consumption_luts)}"
-            )
-        consumption_lut = all_consumption_luts[0]
-        # Disconnect the consumption LUT from the session to avoid loading the whole table
-
-        del all_consumption_luts
 
         total_distance = trip.route.distance / 1000  # km
         total_duration = (
@@ -307,6 +293,13 @@ def extract_trip_information(
         ).total_seconds() / 3600
         average_speed = total_distance / total_duration  # km/h
 
+        # Check exactly one of the vehicle classes has a consumption LUT
+        all_consumption_luts = [
+            vehicle_class.consumption_lut
+            for vehicle_class in trip.rotation.vehicle_type.vehicle_classes
+        ]
+        all_consumption_luts = [x for x in all_consumption_luts if x is not None]
+
         temperature = temperature_for_trip(trip_id, session)
 
         payload_mass = passenger_mass * passenger_count
@@ -324,16 +317,46 @@ def extract_trip_information(
         )
         level_of_loading = payload_mass / full_payload
 
-        info = ConsumptionInformation(
-            trip_id=trip.id,
-            consumption_lut=consumption_lut,
-            average_speed=average_speed,
-            distance=total_distance,
-            temperature=temperature,
-            level_of_loading=level_of_loading,
-        )
+        if len(all_consumption_luts) == 1:
+            consumption_lut = all_consumption_luts[0]
+            # Disconnect the consumption LUT from the session to avoid loading the whole table
+
+            del all_consumption_luts
+
+            info = ConsumptionInformation(
+                trip_id=trip.id,
+                consumption_lut=consumption_lut,
+                average_speed=average_speed,
+                distance=total_distance,
+                temperature=temperature,
+                level_of_loading=level_of_loading,
+            )
+            info.calculate()
+        elif len(all_consumption_luts) == 0:
+            warnings.warn(
+                f"No consumption LUT found for vehicle type {trip.rotation.vehicle_type}.",
+                ConsistencyWarning,
+            )
+            # Here, we fill out the condumption information without the LUT and LUT data, but with `consumption_per_km`
+            # set to the vehicle's `consumption` value.
+            assert (
+                VehicleType.consumption is not None
+            ), f"Vehicle type {trip.rotation.vehicle_type} must have a consumption value set if no consumption LUT is available."
+            info = ConsumptionInformation(
+                trip_id=trip.id,
+                average_speed=average_speed,
+                distance=total_distance,
+                consumption_per_km=trip.rotation.vehicle_type.consumption,
+                consumption=trip.rotation.vehicle_type.consumption * total_distance,
+                consumption_lut=None,
+                temperature=temperature,
+                level_of_loading=level_of_loading,
+            )
+        else:
+            raise ValueError(
+                f"Expected exactly one consumption LUT, got {len(all_consumption_luts)}"
+            )
 
-        info.calculate()
     return info
 
 

{eflips_depot-4.15.0 → eflips_depot-4.15.1}/eflips/depot/api/private/util.py

@@ -1,6 +1,7 @@
 """This module contains miscellaneous utility functions for the eflips-depot API."""
 import logging
 import os
+import warnings
 from contextlib import contextmanager
 from dataclasses import dataclass
 from datetime import timedelta, datetime
@@ -17,9 +18,11 @@ from eflips.model import (
     Trip,
     Depot,
     Temperatures,
+    ConsistencyWarning,
 )
 from eflips.model import create_engine
 from sqlalchemy import inspect
+from sqlalchemy.exc import NoResultFound
 from sqlalchemy.orm import Session
 
 from eflips.depot import SimpleTrip, Timetable as EflipsTimeTable
@@ -204,7 +207,9 @@ def check_depot_validity(depot: Depot) -> None:
 
 def temperature_for_trip(trip_id: int, session: Session) -> float:
     """
-    Returns the temperature for a trip. Finds the temperature for the mid-point of the trip.
+    Returns the temperature for a trip.
+
+    Finds the temperature for the mid-point of the trip.
 
     :param trip_id: The ID of the trip
     :param session: The SQLAlchemy session
@@ -212,11 +217,18 @@ def temperature_for_trip(trip_id: int, session: Session) -> float:
     """
 
     trip = session.query(Trip).filter(Trip.id == trip_id).one()
-    temperatures = (
-        session.query(Temperatures)
-        .filter(Temperatures.scenario_id == trip.scenario_id)
-        .one()
-    )
+    try:
+        temperatures = (
+            session.query(Temperatures)
+            .filter(Temperatures.scenario_id == trip.scenario_id)
+            .one()
+        )
+    except NoResultFound:
+        warnings.warn(
+            f"No temperatures found for scenario {trip.scenario_id}.",
+            ConsistencyWarning,
+        )
+        return None
 
     # Find the mid-point of the trip
     mid_time = trip.departure_time + (trip.arrival_time - trip.departure_time) / 2

{eflips_depot-4.15.0 → eflips_depot-4.15.1}/pyproject.toml

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