init adaptions

Author: sventarika

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "python-envs.defaultEnvManager": "ms-python.python:venv",
+    "python-envs.defaultPackageManager": "ms-python.python:pip",
+    "debugpy.debugJustMyCode": false
+}

README.md

@@ -93,8 +93,8 @@ $ pytest
 Use the following commands to generate test scenarios of different logical scenarios:
 
 - [`alks_scenarios/cutin_scenario_generator.py`](https://github.com/ika-rwth-aachen/alks-scenarios/blob/main/alks_scenarios/cutin_scenario_generator.py): Generate *Cut-in* test scenarios from UNECE R157 E/ECE/TRANS/505/Rev.3/Add.156/Amend.4, Annex 3, pp. 45-52
-- [`alks_scenarios/cutin_scenario_generator.py`](https://github.com/ika-rwth-aachen/alks-scenarios/blob/main/alks_scenarios/cutout_scenario_generator.py): Generate *Cut-out* test scenarios from UNECE R157 E/ECE/TRANS/505/Rev.3/Add.156/Amend.4, Annex 3, pp. 53-55 
-- [`alks_scenarios/cutin_scenario_generator.py`](https://github.com/ika-rwth-aachen/alks-scenarios/blob/main/alks_scenarios/deceleration_scenario_generator.py): Generate *Deceleration* test scenarios from UNECE R157 E/ECE/TRANS/505/Rev.3/Add.156/Amend.4, Annex 3, p. 56
+- [`alks_scenarios/cutout_scenario_generator.py`](https://github.com/ika-rwth-aachen/alks-scenarios/blob/main/alks_scenarios/cutout_scenario_generator.py): Generate *Cut-out* test scenarios from UNECE R157 E/ECE/TRANS/505/Rev.3/Add.156/Amend.4, Annex 3, pp. 53-55 
+- [`alks_scenarios/deceleration_scenario_generator.py`](https://github.com/ika-rwth-aachen/alks-scenarios/blob/main/alks_scenarios/deceleration_scenario_generator.py): Generate *Deceleration* test scenarios from UNECE R157 E/ECE/TRANS/505/Rev.3/Add.156/Amend.4, Annex 3, p. 56
 
 Per default, test scenarios are generated in `results/annex3`.
 Per test scenario, the following files are generated:

alks_scenarios/cutin_scenario_generator.py

@@ -12,8 +12,7 @@
 from tqdm import tqdm
 
 from simple_scenario import Scenario, EgoConfiguration, Vehicle
-from simple_scenario.road import Road, StraightSegment
-
+from simple_scenario.road import SyntheticRoad, StraightSegment
 
 class CutInScenarioGenerator:
     def __init__(self, result_dir: str | Path) -> None:
@@ -35,9 +34,9 @@ def __init__(self, result_dir: str | Path) -> None:
         vy_max = 3
         dx0_min = 0
         dx0_max = 60
-        # Vary
-        vy_step = 0.1
-        dx0_step = 1
+        # Varying values
+        vy_step = 2.0
+        dx0_step = 10
         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)
 
@@ -147,9 +146,9 @@ def _create_single_scenario(
 
         # Calculate object_vehicle_t0 from dy0
         ego_width = ego_configuration.width
-        dummy_vehicle = Vehicle(0, 0, 0, 0, 0)
+        dummy_vehicle = Vehicle(0)
         object_vehicle_width = dummy_vehicle.width
-        object_vehicle_t0_from_ego_llt = ego_configuration.t0 - (
+        object_vehicle_t0_from_ego_llt = self._ego_t0 - (
             self._dy0 + ego_width / 2 + object_vehicle_width / 2
         )
         object_vehicle_t0 = object_vehicle_t0_from_ego_llt + self._lane_width
@@ -165,10 +164,10 @@ def _create_single_scenario(
         object_vehicle_lc_duration = self._dy0 / vy
         object_vehicle = Vehicle(
             0,
-            self._object_lanelet_id,
-            object_vehicle_s0,
-            object_vehicle_t0,
-            vo0,
+            start_lanelet_id= self._object_lanelet_id,
+            start_s=object_vehicle_s0,
+            start_t=object_vehicle_t0,
+            v0=vo0,
             lc_direction=1,
             lc_type="vy",
             lc_vy=vy,
@@ -179,11 +178,13 @@ def _create_single_scenario(
         ego_dist = ve0 * scenario_duration
         road_length = max(ego_dist, self._min_road_length) + self._ego_s0 + 100
         goal_position = self._ego_s0 + 0.75 * ego_dist
-        road = Road(
+        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
+        )
+        road = SyntheticRoad(
             self._n_lanes,
             self._lane_width,
             segments=[StraightSegment(road_length)],
-            goal_position=goal_position,
             speed_limit=60,
         )
 
@@ -221,7 +222,7 @@ def generate_all_scenarios() -> None:
     result_dir = Path(__file__).parent / ".." / "results" / "annex3" / "cutin"
     result_dir.mkdir(exist_ok=True, parents=True)
 
-    n_plots_in_regulation = 14
+    n_plots_in_regulation = 1
 
     n_workers = n_plots_in_regulation
 

pyproject.toml

@@ -18,7 +18,7 @@ version = "0.1.0"
 dependencies = [
     "loguru>=0.7.3",
     "numpy>=1.24.4",
-    "simple-scenario[commonroad]>=0.10.1",
+    "simple-scenario[commonroad]",
     "tqdm>=4.67.1",
 ]
 classifiers = [
@@ -43,6 +43,9 @@ build = [
 ]
 
 
+[tool.uv.sources]
+simple-scenario = { path = "/work/tarlowski/simple/github/simple-scenario", editable = true }
+
 [tool.setuptools]
 packages = [
     "alks_scenarios"