eflips-depot 4.13.3__py3-none-any.whl → 4.13.4__py3-none-any.whl

eflips/depot/api/private/consumption.py

@@ -5,9 +5,9 @@ from datetime import timedelta, datetime
 from math import ceil
 from typing import Tuple, List
 from zoneinfo import ZoneInfo
-import scipy
 
 import numpy as np
+import scipy
 import sqlalchemy.orm
 from eflips.model import (
     Event,
@@ -99,7 +99,9 @@ class ConsumptionInformation:
 
     def calculate(self):
         """
-        Calculates the consumption for the trip. Returns a float in kWh.
+        Calculates the consumption for the trip.
+
+        Returns a float in kWh.
 
         :return: The energy consumption in kWh. This is already the consumption for the whole trip.
         """
@@ -171,12 +173,26 @@ class ConsumptionInformation:
                 ConsistencyWarning,
             )
 
-            interpolator_nn = scipy.interpolate.RegularGridInterpolator(
-                (incline_scale, temperature_scale, level_of_loading_scale, speed_scale),
-                consumption_lut,
-                bounds_error=False,
-                fill_value=None,  # Fill NaN with 0.0
-                method="nearest",
+            x, y, z, alpha = np.meshgrid(
+                incline_scale,
+                temperature_scale,
+                level_of_loading_scale,
+                speed_scale,
+                indexing="ij",
+            )
+            points_array = np.column_stack(
+                [x.ravel(), y.ravel(), z.ravel(), alpha.ravel()]
+            )
+            consumption_lut_flattened = consumption_lut.ravel()
+
+            # Remove the NaN entries from consumption_lut and points_array
+            valid_mask = ~np.isnan(consumption_lut_flattened)
+            points_array = points_array[valid_mask]
+            consumption_lut = consumption_lut_flattened[valid_mask]
+
+            interpolator_nn = scipy.interpolate.NearestNDInterpolator(
+                x=points_array,
+                y=consumption_lut.ravel(),
             )
             consumption_per_km = interpolator_nn(
                 [
@@ -228,9 +244,7 @@ def extract_trip_information(
     passenger_mass=68,
     passenger_count=17.6,
 ) -> ConsumptionInformation:
-    """
-    Extracts the information needed for the consumption simulation from a trip.
-    """
+    """Extracts the information needed for the consumption simulation from a trip."""
 
     with create_session(scenario) as (session, scenario):
         # Load the trip with its route and rotation, including vehicle type and consumption LUT

{eflips_depot-4.13.3.dist-info → eflips_depot-4.13.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eflips-depot
-Version: 4.13.3
+Version: 4.13.4
 Summary: Depot Simulation for eFLIPS
 License: AGPL-3.0-or-later
 Author: Enrico Lauth

{eflips_depot-4.13.3.dist-info → eflips_depot-4.13.4.dist-info}/RECORD

@@ -2,7 +2,7 @@ eflips/depot/__init__.py,sha256=I42xmkE7GDZfoZeSn_ey85sYGI7xyGqAt6Xd4UZpHLw,2872
 eflips/depot/api/__init__.py,sha256=I0KQ_lDAWWPaH4HJfNLPxkv2eFKai9by2WqX0AKNsP4,58571
 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=nImegyhKrZlEwKTNdmAmDxjTQCvwfPgxA588e0M_F9o,27282
+eflips/depot/api/private/consumption.py,sha256=ICgToPQtUBvVhTwz5_oVrNKRUnM_0HGxWrH4Tby9IQ0,27776
 eflips/depot/api/private/depot.py,sha256=NLrRBjb-wq7E3hnVAiX08IzUSVjfMV_NgRqzIx53CE0,44120
 eflips/depot/api/private/results_to_database.py,sha256=FBlZRKqAIG80tFyuf5vCGHRycWKYkm53jFxJEk9t1NA,25984
 eflips/depot/api/private/util.py,sha256=DasTkuGUhlBpY_BtTFWoxSNZU_CRyM3RqEDgO07Eks8,17990
@@ -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.13.3.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.13.3.dist-info/METADATA,sha256=FHoPKGqzbw6Vv25vPaFZm_4vDWXtmbvgiIHqaulg6VQ,5936
-eflips_depot-4.13.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-eflips_depot-4.13.3.dist-info/RECORD,,
+eflips_depot-4.13.4.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.13.4.dist-info/METADATA,sha256=d6pp3rq0_9aYTEzRfdcLgaevh6GiC4BRdHrsYBHU0Po,5936
+eflips_depot-4.13.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+eflips_depot-4.13.4.dist-info/RECORD,,