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

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

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

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

@@ -290,7 +290,7 @@ def depot_to_template(depot: Depot) -> Dict[str, str | Dict[str, str | int]]:
 
             if process_type(process) == ProcessType.CHARGING:
                 template["groups"][group_name]["typename"] = "ParkingAreaGroup"
-                template["groups"][group_name]["parking_strategy_name"] = "FIRST"
+                template["groups"][group_name]["parking_strategy_name"] = "LINEFIRST"
 
         # Fill in locations of the plan
         template["plans"]["default"]["locations"].append(group_name)

{eflips_depot-4.8.0 → eflips_depot-4.9.0}/eflips/depot/depot.py

@@ -2224,6 +2224,35 @@ class PSFirst(BaseParkingStrategy):
         return None
 
 
+class PSLineFirst(BaseParkingStrategy):
+    name = "LINEFIRST"
+    short_description = "first available (default)"
+    tooltip = (
+        "This strategy will try to park a vehicle on the first "
+        "available\n line area with most vacant slot. If there are no available line area, "
+        "assign to the area with most vacant slot."
+    )
+
+    @staticmethod
+    def determine_store(preselected_stores, *args, **kwargs):
+        line_area_in_stores = []
+
+        for store in preselected_stores:
+            if store.vacant_accessible and type(store).__name__ == "LineArea":
+                line_area_in_stores.append(store)
+
+        if line_area_in_stores:
+            sorted(line_area_in_stores, key=lambda x: x.vacant_accessible, reverse=True)
+            return line_area_in_stores[0]
+
+        else:
+            sorted(preselected_stores, key=lambda x: x.vacant_accessible, reverse=True)
+            if preselected_stores[0].vacant_accessible:
+                return preselected_stores[0]
+
+        return None
+
+
 class PSEven(BaseParkingStrategy):
     name = "EVEN"
     short_description = "even"
@@ -2574,6 +2603,7 @@ class ParkingAreaGroup(AreaGroup):
         PSMixed.name: PSMixed,
         PSSmart.name: PSSmart,
         PSSmart2.name: PSSmart2,
+        PSLineFirst.name: PSLineFirst,
     }
 
     def __init__(self, env, stores, ID, parking_strategy_name="FIRST"):

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

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