eflips-depot 4.7.1__tar.gz → 4.8.0__tar.gz

{eflips_depot-4.7.1 → eflips_depot-4.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eflips-depot
-Version: 4.7.1
+Version: 4.8.0
 Summary: Depot Simulation for eFLIPS
 License: AGPL-3.0-or-later
 Author: Enrico Lauth
@@ -13,7 +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 (>=6.0.6,<7.0.0)
+Requires-Dist: eflips-model (>=7.0.0,<8.0.0)
+Requires-Dist: eflips-opt (>=0.3.0,<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.7.1 → eflips_depot-4.8.0}/eflips/depot/api/__init__.py

@@ -812,7 +812,11 @@ def init_simulation(
                         # The areas allow either one type, or all vehicle types
                         for p in area.processes:
                             if p.electric_power is not None and p.duration is None:
-                                vehicle_count += area.capacity
+                                row_count = (
+                                    area.row_count if area.row_count is not None else 1
+                                )
+
+                                vehicle_count += area.capacity * row_count
 
                 assert (
                     vehicle_count > 0

{eflips_depot-4.7.1 → eflips_depot-4.8.0}/eflips/depot/api/private/depot.py

@@ -90,6 +90,7 @@ def depot_to_template(depot: Depot) -> Dict[str, str | Dict[str, str | int]]:
     list_of_processes = []
 
     # Get dictionary of each area
+    # For line areas, generate an dictionary item for total areas, later it will be split into individual lines
     for area in depot.areas:
         area_name = str(area.id)
         template["areas"][area_name] = {
@@ -101,6 +102,8 @@ def depot_to_template(depot: Depot) -> Dict[str, str | Dict[str, str | int]]:
             "issink": False,
             "entry_filter": None,
         }
+        if area.area_type == AreaType.LINE:
+            template["areas"][area_name]["row_count"] = area.row_count
 
         # Fill in vehicle_filter.
         # If the vehicle type id is set, the area is only for this vehicle type
@@ -142,6 +145,33 @@ def depot_to_template(depot: Depot) -> Dict[str, str | Dict[str, str | int]]:
             if process_type(process) == ProcessType.STANDBY_DEPARTURE:
                 template["areas"][area_name]["issink"] = True
 
+    # Generate line areas in the unit of a single line for the simulation core and assigning charging interfaces
+    area_template = template["areas"]
+
+    line_area_template = {}
+    line_areas_to_delete = []
+    for name, area in area_template.items():
+        if area["typename"] == "LineArea":
+            line_areas_to_delete.append(name)
+            capacity_per_line = int(area["capacity"] / area["row_count"])
+            for i in range(area["row_count"]):
+                area_name = name + "_row_" + str(i)
+                line_area_template[area_name] = {
+                    "typename": "LineArea",
+                    "capacity": capacity_per_line,
+                    "available_processes": area["available_processes"],
+                    "issink": area["issink"],
+                    "entry_filter": area["entry_filter"],
+                    "charging_interfaces": area["charging_interfaces"][
+                        i * capacity_per_line : (i + 1) * capacity_per_line
+                    ],
+                }
+    area_template.update(line_area_template)
+
+    for name in line_areas_to_delete:
+        del area_template[name]
+
+    # Fill in the dictionary of processess
     for process in list_of_processes:
         process_name = str(process.id)
         # Shared template for all processes
@@ -240,11 +270,27 @@ def depot_to_template(depot: Depot) -> Dict[str, str | Dict[str, str | int]]:
         group_name = str(process.name) + "_group"
         template["groups"][group_name] = {
             "typename": "AreaGroup",
-            "stores": [str(area.id) for area in process.areas],
+            "stores": [
+                str(area.id)
+                for area in process.areas
+                if area.area_type != AreaType.LINE
+            ],
         }
-        if process_type(process) == ProcessType.CHARGING:
-            template["groups"][group_name]["typename"] = "ParkingAreaGroup"
-            template["groups"][group_name]["parking_strategy_name"] = "FIRST"
+        if (
+            process_type(process) == ProcessType.CHARGING
+            or process_type(process) == ProcessType.STANDBY_DEPARTURE
+        ):
+            areas_this_process = process.areas
+            for area in areas_this_process:
+                if area.area_type == AreaType.LINE:
+                    for i in range(area.row_count):
+                        template["groups"][group_name]["stores"].append(
+                            str(area.id) + "_row_" + str(i)
+                        )
+
+            if process_type(process) == ProcessType.CHARGING:
+                template["groups"][group_name]["typename"] = "ParkingAreaGroup"
+                template["groups"][group_name]["parking_strategy_name"] = "FIRST"
 
         # Fill in locations of the plan
         template["plans"]["default"]["locations"].append(group_name)
@@ -547,19 +593,20 @@ def generate_depot(
         capacities: Dict[AreaType, None | int]
         if capacities[AreaType.LINE] is not None and capacities[AreaType.LINE] > 0:
             # Create a number of LINE areas
-            number_of_areas = capacities[AreaType.LINE] // standard_block_length
-            for i in range(number_of_areas):
-                area = Area(
-                    scenario=scenario,
-                    name=f"Line Area {i + 1} for {vehicle_type.name_short}",
-                    depot=depot,
-                    area_type=AreaType.LINE,
-                    vehicle_type=vehicle_type,
-                    capacity=standard_block_length,
-                )
-                area.processes.append(charging)
-                area.processes.append(standby_departure)
-                session.add(area)
+            number_of_rows = capacities[AreaType.LINE] // standard_block_length
+
+            area = Area(
+                scenario=scenario,
+                name=f"Line Area for {vehicle_type.name_short}",
+                depot=depot,
+                area_type=AreaType.LINE,
+                vehicle_type=vehicle_type,
+                capacity=capacities[AreaType.LINE],
+                row_count=number_of_rows,
+            )
+            area.processes.append(charging)
+            area.processes.append(standby_departure)
+            session.add(area)
         if (
             capacities[AreaType.DIRECT_ONESIDE] is not None
             and capacities[AreaType.DIRECT_ONESIDE] > 0

{eflips_depot-4.7.1 → eflips_depot-4.8.0}/eflips/depot/api/private/results_to_database.py

@@ -410,18 +410,29 @@ def add_events_into_database(
 
         # Get station_id of the current depot through area
 
-        current_area = session.query(Area).filter(Area.id == process_dict["area"]).one()
+        # TODO needs better implementation
+        if type(process_dict["area"]) == str and "_" in process_dict["area"]:
+            area_name = process_dict["area"].split("_")
+            area_id = int(area_name[0])
+            row = int(area_name[-1])
+
+        else:
+            area_id = int(process_dict["area"])
+
+        current_area = session.query(Area).filter(Area.id == area_id).one()
         station_id = current_area.depot.station_id
 
+        if current_area.area_type == AreaType.LINE:
+            capacity_per_line = int(current_area.capacity / current_area.row_count)
+            process_dict["slot"] = capacity_per_line * row + process_dict["slot"] - 1
+
         current_event = Event(
             scenario=scenario,
             vehicle_type_id=db_vehicle.vehicle_type_id,
             vehicle=db_vehicle,
             station_id=station_id,
-            area_id=int(process_dict["area"]),
-            subloc_no=int(process_dict["slot"]) - 1
-            if "slot" in process_dict.keys()
-            else 00,
+            area_id=area_id,
+            subloc_no=process_dict["slot"] if "slot" in process_dict.keys() else 00,
             trip_id=None,
             time_start=timedelta(seconds=start_time) + simulation_start_time,
             time_end=timedelta(seconds=process_dict["end"]) + simulation_start_time,

{eflips_depot-4.7.1 → eflips_depot-4.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "eflips-depot"
-version = "4.7.1"
+version = "4.8.0"
 description = "Depot Simulation for eFLIPS"
 authors = ["Enrico Lauth <enrico.lauth@tu-berlin.de>",
     "Ludger Heide <ludger.heide@tu-berlin.de",
@@ -14,7 +14,6 @@ packages = [{ include = "eflips/depot" }]
 [tool.poetry.dependencies]
 python = ">=3.10, <3.14"
 simpy = "^4.0.1"
-eflips-model = ">=6.0.6, <7.0.0"
 tqdm = "^4.67.0"
 
 # Legacy dependencies, which are still needed until we refactor the code
@@ -23,6 +22,8 @@ xlsxwriter = "^3.1.9"
 pandas = "^2.2.0"
 xlrd = "<=1.2.0"
 scipy = "^1.14.0"
+eflips-model = "^7.0.0"
+eflips-opt = "^0.3.0"
 
 
 [tool.pytest.ini_options]
@@ -45,7 +46,6 @@ django-environ = "^0.11.2"
 pre-commit = "^3.4.0"
 coverage = "^7.3.2"
 openpyxl = "^3.1.2"
-eflips-opt = ">=0.2.0"
 
 [build-system]
 requires = ["poetry-core"]