eflips-depot 4.3.7__tar.gz → 4.3.10__tar.gz

{eflips_depot-4.3.7 → eflips_depot-4.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eflips-depot
-Version: 4.3.7
+Version: 4.3.10
 Summary: Depot Simulation for eFLIPS
 Home-page: https://github.com/mpm-tu-berlin/eflips-depot
 License: AGPL-3.0-or-later

{eflips_depot-4.3.7 → eflips_depot-4.3.10}/eflips/depot/api/__init__.py

@@ -809,7 +809,7 @@ def generate_realistic_depot_layout(
         for (
             first_last_stop_tup,
             vehicle_type_rotation_dict,
-        ) in group_rotations_by_start_end_stop(scenario.id, session).items():
+        ) in depot_stations_and_vehicle_types.items():
             first_stop, last_stop = first_last_stop_tup
             if first_stop != last_stop:
                 raise ValueError("First and last stop of a rotation are not the same.")
@@ -1005,7 +1005,6 @@ def vehicle_counts_for_direct_layout(
     ret_val: Dict[Station, Dict[VehicleType, int]] = dict()
 
     for depot_id_as_str, ev in depot_evaluations.items():
-        ev = next(iter(depot_evaluations.values()))
         assert isinstance(ev, DepotEvaluation)
         counts: Dict[str, int] = real_peak_vehicle_count(ev)
         # The key of the dictionary is the vehicle type ID as a string. We need to convert it to a vehicle type object

{eflips_depot-4.3.7 → eflips_depot-4.3.10}/eflips/depot/depot.py

@@ -7,14 +7,14 @@ Created on Fri Oct 13 11:12:00 2017.
 Core components of the depot simulation model.
 """
 
+from abc import ABC, abstractmethod
 from collections import Counter
+from warnings import warn
+
 import simpy
-from simpy.resources.store import StorePut
-from simpy.core import BoundClass
-from simpy.util import start_delayed
 from eflips.evaluation import DataLogger
-from eflips.settings import globalConstants
 from eflips.helperFunctions import flexprint, SortedList
+from eflips.settings import globalConstants
 from eflips.simpy_ext import (
     FilterStoreExt,
     PositionalFilterStore,
@@ -26,18 +26,20 @@ from eflips.simpy_ext import (
     LineFilterStoreGet,
     ExclusiveRequest,
 )
-from eflips.depot.processes import EstimateValue, ChargeAbstract, Precondition
-from eflips.depot.resources import DepotChargingInterface
+from simpy.core import BoundClass
+from simpy.resources.store import StorePut
+from simpy.util import start_delayed
+
+from eflips.depot.evaluation import Departure, ProcessCalled
 from eflips.depot.filters import VehicleFilter
+from eflips.depot.processes import EstimateValue, ChargeAbstract, Precondition
 from eflips.depot.rating import (
     SlotAlternative,
     ParkRating,
     VehicleAlternative,
     DispatchRating,
 )
-from eflips.depot.evaluation import Departure, ProcessCalled
-from abc import ABC, abstractmethod
-from warnings import warn
+from eflips.depot.resources import DepotChargingInterface
 
 
 class DepotWorkingData:
@@ -869,6 +871,10 @@ class DSSmart(BaseDispatchStrategy):
 
         for parking_area_group in depot.parking_area_groups:
             for area in parking_area_group.stores:
+                # Speedup: Skip empty areas
+                if not any(item is not None for item in area.items):
+                    continue
+
                 if isinstance(area, LineArea):
                     # Add one vehicle at max. at Line area
                     rg = area.range_from_side(area.side_get_default)

{eflips_depot-4.3.7 → eflips_depot-4.3.10}/pyproject.toml

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