Update TimeToCollisionCondition to call SpeedCondition in standar…

…d compatible mode Signed-off-by: yamacir-kit <[email protected]>
tier4 · Dec 13, 2024 · 1717315 · 1717315
1 parent 04c0b05
commit 1717315
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/...nario_interpreter/include/openscenario_interpreter/syntax/time_to_collision_condition.hpp b/...nario_interpreter/include/openscenario_interpreter/syntax/time_to_collision_condition.hpp
@@ -158,7 +158,8 @@ struct TimeToCollisionCondition : private Scope, private SimulatorCore::Conditio
           entities, triggering_entity, time_to_collision_condition_target.as<Entity>(),
           directional_dimension());
       } else {
-        return SpeedCondition::evaluate(entities, triggering_entity, directional_dimension());
+        return SpeedCondition::evaluate(
+          entities, triggering_entity, directional_dimension(), Compatibility::standard);
       }
     };
 

diff --git a/test_runner/scenario_test_runner/scenario/sample.yaml b/test_runner/scenario_test_runner/scenario/sample.yaml
@@ -10,16 +10,7 @@ OpenSCENARIO:
     revMajor: 1
     revMinor: 0
   ParameterDeclarations:
-    ParameterDeclaration:
-      - name: random_offset
-        parameterType: double
-        value: $(ros2 run openscenario_interpreter_example uniform_distribution -1.0 1.0)
-        ConstraintGroup:
-          - ValueConstraint:
-            - rule: lessOrEqual
-              value: 1.0
-            - rule: greaterOrEqual
-              value: -1.0
+    ParameterDeclaration: []
   CatalogLocations:
     VehicleCatalog:
       Directory:
@@ -54,7 +45,7 @@ OpenSCENARIO:
                       roadId: ''
                       laneId: LANE_ID
                       s: 1
-                      offset: $random_offset
+                      offset: 0
                       Orientation:
                         type: relative
                         h: 0