eflips-depot 4.3.6__py3-none-any.whl → 4.3.8__py3-none-any.whl

eflips/depot/api/__init__.py

@@ -35,8 +35,7 @@ from dataclasses import dataclass
 from datetime import timedelta
 from enum import Enum
 from math import ceil
-from eflips.model import Process
-from typing import Any, Dict, Optional, Tuple, Union, List
+from typing import Any, Dict, Optional, Union, List
 
 import numpy as np
 import sqlalchemy.orm
@@ -55,6 +54,7 @@ from eflips.model import (
     Vehicle,
     VehicleType,
 )
+from eflips.model import Process
 from sqlalchemy.orm import Session
 from sqlalchemy.sql import select
 
@@ -803,6 +803,9 @@ def generate_realistic_depot_layout(
 
         # STEP 3: Put "all direct" depots at these spots and find the vehicle counts
         depot_stations = []
+        vehicle_type_rotation_dict_by_station: Dict[
+            Station, Dict[VehicleType, List[Rotation]]
+        ] = dict()
         for (
             first_last_stop_tup,
             vehicle_type_rotation_dict,
@@ -811,6 +814,11 @@ def generate_realistic_depot_layout(
             if first_stop != last_stop:
                 raise ValueError("First and last stop of a rotation are not the same.")
             depot_stations.append(first_stop)
+            vehicle_type_rotation_dict_by_station[
+                first_stop
+            ] = vehicle_type_rotation_dict
+
+        del first_last_stop_tup, vehicle_type_rotation_dict
 
         all_direct_counts: Dict[
             Station, Dict[VehicleType, int]
@@ -820,7 +828,7 @@ def generate_realistic_depot_layout(
             stations=depot_stations,
             scenario=scenario,
             session=session,
-            vehicle_type_dict=vehicle_type_rotation_dict,
+            vehicle_type_dict_by_station=vehicle_type_rotation_dict_by_station,
             shunting_duration=shunting_duration,
         )
 
@@ -847,7 +855,9 @@ def generate_realistic_depot_layout(
                 direct_counts=direct_counts,
                 line_counts=line_counts,
                 line_length=line_length,
-                vehicle_type_rotation_dict=vehicle_type_rotation_dict,
+                vehicle_type_rotation_dict=vehicle_type_rotation_dict_by_station[
+                    station
+                ],
                 shunting_duration=shunting_duration,
             )
 
@@ -926,7 +936,9 @@ def generate_realistic_depot_layout(
                 direct_counts=direct_counts,
                 line_counts=line_counts,
                 line_length=line_length,
-                vehicle_type_rotation_dict=vehicle_type_rotation_dict,
+                vehicle_type_rotation_dict=vehicle_type_rotation_dict_by_station[
+                    station
+                ],
                 shunting_duration=shunting_duration,
             )
 
@@ -937,7 +949,7 @@ def vehicle_counts_for_direct_layout(
     stations: List[Station],
     scenario: Scenario,
     session: sqlalchemy.orm.session.Session,
-    vehicle_type_dict: Dict[VehicleType, List[Rotation]],
+    vehicle_type_dict_by_station: Dict[Station, Dict[VehicleType, List[Rotation]]],
     shunting_duration: timedelta = timedelta(minutes=5),
 ) -> Dict[Station, Dict[VehicleType, int]]:
     """
@@ -959,7 +971,7 @@ def vehicle_counts_for_direct_layout(
         # Generate the depot
         direct_counts = {}
         line_counts = {}
-        for vehicle_type, rotations in vehicle_type_dict.items():
+        for vehicle_type, rotations in vehicle_type_dict_by_station[station].items():
             direct_counts[vehicle_type] = len(rotations)
             line_counts[vehicle_type] = 1
 
@@ -972,7 +984,7 @@ def vehicle_counts_for_direct_layout(
             direct_counts=direct_counts,
             line_counts=line_counts,
             line_length=8,  # We don't care about the line length here
-            vehicle_type_rotation_dict=vehicle_type_dict,
+            vehicle_type_rotation_dict=vehicle_type_dict_by_station[station],
             shunting_duration=shunting_duration,
         )
 

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 all([item is 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.6.dist-info → eflips_depot-4.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eflips-depot
-Version: 4.3.6
+Version: 4.3.8
 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.6.dist-info → eflips_depot-4.3.8.dist-info}/RECORD

@@ -1,12 +1,12 @@
 eflips/depot/__init__.py,sha256=n7jte8R6j_Ad4Mp4hkklKwil5r8u8Q_SbXrCC-nf5jM,1556
-eflips/depot/api/__init__.py,sha256=vP1OGzKcRXyoL-TsqbzDRl1OalqmCfib4suFons1aMg,93972
+eflips/depot/api/__init__.py,sha256=6voBU0iXtWsIRecVNwI6qF6VVu1w6X-sGrNYZJqWEoA,94478
 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/depot.py,sha256=IpXQR2GuEUuilP02njKpvExgSkktkyHPmcn2j_Q3YPk,21276
 eflips/depot/api/private/smart_charging.py,sha256=LcD0SN26O6KPBL5Ha7tpovnMn_4dAi17Kb21jEeAoE0,13052
 eflips/depot/api/private/util.py,sha256=Ye-WXNzHcNfunFijK7FCIU3AiCuMg83KnEhnKbtlZu8,17242
 eflips/depot/configuration.py,sha256=Op3hlir-dEN7yHr0kTqbYANoCBKFWK6uKOv3NJl8w_w,35678
-eflips/depot/depot.py,sha256=afIlaiX-J-M5-K_oAGMr_soL3_QjIAwrQKDaZzTwle0,105566
+eflips/depot/depot.py,sha256=w-5kurK-1ztEYHATHGSD0j3qBI96nM4dHfoc8OErfd8,105705
 eflips/depot/evaluation.py,sha256=qqXyP4jA1zFcKuWhliQ6n25ZlGl9mJV-vtXf0yu8WN8,140842
 eflips/depot/filters.py,sha256=52esFT_kldMC9-LteY4CFe8BETwr0bn-CacegVe6jsA,16131
 eflips/depot/input_epex_power_price.py,sha256=VPDC1zy-klQpveGIZ8941hL1P_jeNq3IHoLgFTsANig,5569
@@ -35,7 +35,7 @@ eflips/depot/simulation.py,sha256=ee0qTzOzG-8ybN36ie_NJallXfC7jUaS9JZvaYFziLs,10
 eflips/depot/smart_charging.py,sha256=C3BYqzn2-OYY4ipXm0ETtavbAM9QXZMYULBpVoChf0E,54311
 eflips/depot/standalone.py,sha256=VxcTzBaB67fNJUMmjPRwKXjhqTy6oQ41Coote2LvAmk,22338
 eflips/depot/validation.py,sha256=TIuY7cQtEJI4H2VVMSuY5IIVkacEEZ67weeMuY3NSAM,7097
-eflips_depot-4.3.6.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
-eflips_depot-4.3.6.dist-info/METADATA,sha256=ly5A27qHm7fI0i6PWaEmVYb9KjvGAxwk8vHM5a6ZFC8,5839
-eflips_depot-4.3.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-eflips_depot-4.3.6.dist-info/RECORD,,
+eflips_depot-4.3.8.dist-info/LICENSE.md,sha256=KB4XTk1fPHjtZCYDyPyreu6h1LVJVZXYg-5vePcWZAc,34143
+eflips_depot-4.3.8.dist-info/METADATA,sha256=utmVXHhrJTkZY0vrilXVw6aJkp7XOzzPIVsbJdvEauY,5839
+eflips_depot-4.3.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+eflips_depot-4.3.8.dist-info/RECORD,,