ruff

Author: sventarika

.gitignore

@@ -162,3 +162,4 @@ cython_debug/
 examples/*.gif
 results/
 test/test_results/
+.vscode/

.vscode/settings.json

@@ -14,6 +14,7 @@
 from simple_scenario import Scenario, EgoConfiguration, Vehicle
 from simple_scenario.road import SyntheticRoad, StraightSegment
 
+
 class CutInScenarioGenerator:
     def __init__(self, result_dir: str | Path) -> None:
         self._result_dir = Path(result_dir)
@@ -35,8 +36,8 @@ def __init__(self, result_dir: str | Path) -> None:
         dx0_min = 0
         dx0_max = 60
         # Varying values
-        vy_step = 3.0
-        dx0_step = 20
+        vy_step = 0.1
+        dx0_step = 1
         self._vy_values = np.arange(vy_min + vy_step, vy_max + vy_step, vy_step)
         self._dx0_values = np.arange(dx0_min, dx0_max + dx0_step, dx0_step)
 
@@ -125,7 +126,10 @@ def _create_single_scenario(
 
         # Create simple scenario object
         ego_configuration = EgoConfiguration(
-            self._ego_lanelet_id, self._ego_s0, self._ego_t0, ve0
+            start_lanelet_id=self._ego_lanelet_id,
+            start_s=self._ego_s0,
+            start_t=self._ego_t0,
+            v0=ve0,
         )
 
         # Calculate object_vehicle_t0 from dy0
@@ -148,7 +152,7 @@ def _create_single_scenario(
         object_vehicle_lc_duration = self._dy0 / vy
         object_vehicle = Vehicle(
             0,
-            start_lanelet_id= self._object_lanelet_id,
+            start_lanelet_id=self._object_lanelet_id,
             start_s=object_vehicle_s0,
             start_t=object_vehicle_t0,
             v0=vo0,
@@ -163,7 +167,13 @@ def _create_single_scenario(
         road_length = max(ego_dist, self._min_road_length) + self._ego_s0 + 100
         goal_position = self._ego_s0 + 0.75 * ego_dist
         ego_configuration = EgoConfiguration(
-            self._ego_lanelet_id, self._ego_s0, self._ego_t0, ve0, target_s=goal_position , target_t=0 , target_lanelet_id=self._ego_lanelet_id
+            start_lanelet_id=self._ego_lanelet_id,
+            start_s=self._ego_s0,
+            start_t=self._ego_t0,
+            v0=ve0,
+            target_s=goal_position,
+            target_t=0,
+            target_lanelet_id=self._ego_lanelet_id,
         )
         road = SyntheticRoad(
             self._n_lanes,
@@ -204,14 +214,17 @@ def _create_single_scenario(
 def unpack_and_run(args_list: list) -> None:
     scenario_generator = CutInScenarioGenerator(args_list[0])
     scenario_generator.create_all_scenarios(
-        only_plot_no=args_list[1], create_image=args_list[2], create_openx=args_list[3], create_gif=args_list[4]
+        only_plot_no=args_list[1],
+        create_image=args_list[2],
+        create_openx=args_list[3],
+        create_gif=args_list[4],
     )
 
 
 def generate_all_scenarios() -> None:
     result_dir = Path(__file__).parent / ".." / "results" / "annex3" / "cutin"
     result_dir.mkdir(exist_ok=True, parents=True)
-    
+
     create_image = True
     create_openx = True
     create_gif = False
@@ -220,7 +233,10 @@ def generate_all_scenarios() -> None:
 
     n_workers = n_plots_in_regulation
 
-    all_args_lists = [[result_dir, i + 1, create_image, create_openx, create_gif] for i in range(n_plots_in_regulation)]
+    all_args_lists = [
+        [result_dir, i + 1, create_image, create_openx, create_gif]
+        for i in range(n_plots_in_regulation)
+    ]
 
     if n_workers == 1:
         for arg_list in all_args_lists:

alks_scenarios/cutin_scenario_generator.py

@@ -165,7 +165,7 @@ def _create_single_scenario(  # noqa: PLR0912
         vf0: float | None = None,
         scenario_name: str | None = None,
         check_collision_feasibility: bool = True,
-        plot_no: str | None = None,
+        plot_no: int | None = None,
         plot_no_result_dir: str | Path | None = None,
         create_gif: bool = False,
         create_image: bool = False,
@@ -226,17 +226,31 @@ def _create_single_scenario(  # noqa: PLR0912
         # f vehicle (slow vehicle)
         f_vehicle_s0 = object_vehicle_s0 + dummy_vehicle.length + dx0_f
         f_vehicle_t0 = object_vehicle_t0
-        f_vehicle = Vehicle(1, start_lanelet_id=self._f_lanelet_id, start_s=f_vehicle_s0, start_t=f_vehicle_t0, v0=vf0)
+        f_vehicle = Vehicle(
+            1,
+            start_lanelet_id=self._f_lanelet_id,
+            start_s=f_vehicle_s0,
+            start_t=f_vehicle_t0,
+            v0=vf0,
+        )
 
         # Calculate road length
         ego_dist = ve0 * scenario_duration
-        road_length = max(ego_dist, self._min_road_length) + self._ego_s0 + 110 # TODO: check length of object trajectory as well
+        road_length = (
+            max(ego_dist, self._min_road_length) + self._ego_s0 + 110
+        )  # TODO(STA): check length of object trajectory as well
         goal_position = max(
             self._ego_s0 + 0.75 * ego_dist,
             f_vehicle_s0 + vf0 * scenario_duration + dummy_vehicle.length,
         )
         ego_configuration = EgoConfiguration(
-            self._ego_lanelet_id, self._ego_s0, self._ego_t0, ve0, target_s=goal_position, target_t=0, target_lanelet_id=self._ego_lanelet_id
+            self._ego_lanelet_id,
+            self._ego_s0,
+            self._ego_t0,
+            ve0,
+            target_s=goal_position,
+            target_t=0,
+            target_lanelet_id=self._ego_lanelet_id,
         )
         road = SyntheticRoad(
             self._n_lanes,
@@ -290,7 +304,10 @@ def _create_single_scenario(  # noqa: PLR0912
 def unpack_and_run(args_list: list) -> None:
     scenario_generator = CutOutScenarioGenerator(args_list[0])
     scenario_generator.create_all_scenarios(
-        only_plot_no=args_list[1], create_image=args_list[2], create_openx=args_list[3], create_gif=args_list[4]
+        only_plot_no=args_list[1],
+        create_image=args_list[2],
+        create_openx=args_list[3],
+        create_gif=args_list[4],
     )
 
 
@@ -306,7 +323,10 @@ def generate_all_scenarios() -> None:
 
     n_workers = n_plots_in_regulation
 
-    all_args_lists = [[result_dir, i + 1, create_image, create_openx, create_gif] for i in range(n_plots_in_regulation)]
+    all_args_lists = [
+        [result_dir, i + 1, create_image, create_openx, create_gif]
+        for i in range(n_plots_in_regulation)
+    ]
 
     if n_workers == 1:
         for arg_list in all_args_lists:

alks_scenarios/cutout_scenario_generator.py

@@ -94,7 +94,12 @@ def _create_single_scenario(
         object_a0 = -gx * self._g
 
         object_vehicle = Vehicle(
-            0, start_lanelet_id=self._object_lanelet_id, start_s=object_s0, start_t=self._ego_t0, v0=vo0, a0=object_a0
+            0,
+            start_lanelet_id=self._object_lanelet_id,
+            start_s=object_s0,
+            start_t=self._ego_t0,
+            v0=vo0,
+            a0=object_a0,
         )
 
         # Calculate road length
@@ -110,7 +115,13 @@ def _create_single_scenario(
         road_length = max(ego_dist, self._min_road_length) + self._ego_s0 + 100
         goal_position = self._ego_s0 + 0.75 * ego_dist
         ego_configuration = EgoConfiguration(
-            self._ego_lanelet_id, self._ego_s0, self._ego_t0, ve0, target_s=goal_position, target_t=0, target_lanelet_id=self._ego_lanelet_id
+            self._ego_lanelet_id,
+            self._ego_s0,
+            self._ego_t0,
+            ve0,
+            target_s=goal_position,
+            target_t=0,
+            target_lanelet_id=self._ego_lanelet_id,
         )
         road = SyntheticRoad(
             self._n_lanes,
@@ -153,7 +164,9 @@ def generate_all_scenarios() -> None:
     result_dir.mkdir(exist_ok=True, parents=True)
 
     scenario_generator = DecelerationScenarioGenerator(result_dir)
-    scenario_generator.create_all_scenarios(create_openx=True, create_image=True, create_gif=False)
+    scenario_generator.create_all_scenarios(
+        create_openx=True, create_image=True, create_gif=False
+    )
 
 
 if __name__ == "__main__":

alks_scenarios/deceleration_scenario_generator.py

@@ -45,7 +45,6 @@ build = [
 ]
 
 
-
 [tool.setuptools]
 packages = [
     "alks_scenarios"
@@ -141,6 +140,7 @@ ignore = [
     "TID252",
     "RUF012",
     "SIM117",
+    "TD003",
 ]
 
 [tool.ruff.lint.per-file-ignores]