eflips-depot 4.11.0__tar.gz → 4.12.0__tar.gz

{eflips_depot-4.11.0 → eflips_depot-4.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eflips-depot
-Version: 4.11.0
+Version: 4.12.0
 Summary: Depot Simulation for eFLIPS
 License: AGPL-3.0-or-later
 Author: Enrico Lauth
@@ -13,8 +13,8 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: eflips (>=0.1.3,<0.2.0)
-Requires-Dist: eflips-model (>=8.1.0,<9.0.0)
-Requires-Dist: eflips-opt (>=0.3.0,<0.4.0)
+Requires-Dist: eflips-model (>8.1.0,<10.0.0)
+Requires-Dist: eflips-opt (>=0.3.3,<0.4.0)
 Requires-Dist: pandas (>=2.2.0,<3.0.0)
 Requires-Dist: scipy (>=1.14.0,<2.0.0)
 Requires-Dist: simpy (>=4.0.1,<5.0.0)

{eflips_depot-4.11.0 → eflips_depot-4.12.0}/eflips/depot/api/__init__.py

@@ -124,7 +124,8 @@ def generate_consumption_result(scenario):
     Generate consumption information for the scenario.
 
     This function retrieves the consumption LUT and vehicle classes from the database and returns a dictionary
-    containing the consumption information for each vehicle type in the scenario.
+    containing the consumption information for each vehicle type in the scenario. If a trip has no corresponding
+    consumption LUT, it won't be included in the results.
 
     :param scenario: A :class:`eflips.model.Scenario` object containing the input data for the simulation.
 
@@ -135,10 +136,18 @@ def generate_consumption_result(scenario):
         trips = session.query(Trip).filter(Trip.scenario_id == scenario.id).all()
         consumption_results = {}
         for trip in trips:
-            consumption_info = extract_trip_information(
-                trip.id,
-                scenario,
-            )
+            try:
+                consumption_info = extract_trip_information(
+                    trip.id,
+                    scenario,
+                )
+            except ValueError as e:
+                # If the trip has no consumption information, skip it
+                logging.warning(
+                    f"Skipping trip {trip.id} due to missing consumption information: {e}"
+                )
+                continue
+
             battery_capacity_current_vt = trip.rotation.vehicle_type.battery_capacity
             consumption_result = consumption_info.generate_consumption_result(
                 battery_capacity_current_vt
@@ -1102,7 +1111,7 @@ def generate_depot_optimal_size(
     charging_power: float = 90,
     database_url: Optional[str] = None,
     delete_existing_depot: bool = False,
-    consumption_results: Optional[Dict[int, ConsumptionResult]] = None,
+    use_consumption_lut: bool = False,
 ) -> None:
     """
     Generates an optimal depot layout with the smallest possible size for each depot in the scenario. Line charging areas
@@ -1114,8 +1123,8 @@ def generate_depot_optimal_size(
     :param database_url: An optional database URL. Used if no database url is given by the environment variable.
     :param delete_existing_depot: If there is already a depot existing in this scenario, set True to delete this
         existing depot. Set to False and a ValueError will be raised if there is a depot in this scenario.
-    :param consumption_results: A dictionary of consumption results for each vehicle type. It is used to simulate the consumption with
-        given look-up tables. If not given, the constant consumption will be used in the simulation.
+    :param using_consumption_lut: If True, the depot layout will be generated based on the consumption lookup table.
+        If False, constant consumption stored in VehicleType table will be used.
 
     :return: None. The depot layout will be added to the database.
 
@@ -1139,9 +1148,18 @@ def generate_depot_optimal_size(
 
         ##### Step 0: Consumption Simulation #####
         # Run the consumption simulation for all depots
-        simple_consumption_simulation(
-            scenario, initialize_vehicles=True, consumption_result=consumption_results
-        )
+
+        if use_consumption_lut:
+            # If using the consumption lookup table, we need to calculate the consumption results
+            consumption_results = generate_consumption_result(scenario)
+            simple_consumption_simulation(
+                scenario,
+                initialize_vehicles=True,
+                consumption_result=consumption_results,
+            )
+        else:
+            # If not using the consumption lookup table, we need to initialize the vehicles with the constant consumption
+            simple_consumption_simulation(scenario, initialize_vehicles=True)
 
         ##### Step 1: Find all potential depots #####
         # These are all the spots where a rotation starts and end

{eflips_depot-4.11.0 → eflips_depot-4.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "eflips-depot"
-version = "4.11.0"
+version = "4.12.0"
 description = "Depot Simulation for eFLIPS"
 authors = ["Enrico Lauth <enrico.lauth@tu-berlin.de>",
     "Ludger Heide <ludger.heide@tu-berlin.de",
@@ -22,8 +22,8 @@ xlsxwriter = "^3.1.9"
 pandas = "^2.2.0"
 xlrd = "<=1.2.0"
 scipy = "^1.14.0"
-eflips-model = "^8.1.0"
-eflips-opt = "^0.3.0"
+eflips-model = ">8.1.0, <10.0.0"
+eflips-opt = "^0.3.3"
 
 
 [tool.pytest.ini_options]