#35 made naming within ActivateALKSControllerStory consistent

asam-oss · Feb 4, 2021 · adc4877 · adc4877
2 parents eaf4185 + 880a99b
commit adc4877
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 30 deletions.
diff --git a/Scenarios/ALKS_Scenario_4.1_1_FreeDriving_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.1_1_FreeDriving_TEMPLATE.xosc
@@ -70,7 +70,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -82,7 +82,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>

diff --git a/Scenarios/ALKS_Scenario_4.1_2_SwervingLeadVehicle_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.1_2_SwervingLeadVehicle_TEMPLATE.xosc
@@ -98,7 +98,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -110,7 +110,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>

diff --git a/Scenarios/ALKS_Scenario_4.1_3_SwervingSideVehicle_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.1_3_SwervingSideVehicle_TEMPLATE.xosc
@@ -98,7 +98,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -110,7 +110,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>

diff --git a/Scenarios/ALKS_Scenario_4.2_1_FullyBlockingTarget_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.2_1_FullyBlockingTarget_TEMPLATE.xosc
@@ -85,7 +85,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -97,7 +97,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>

diff --git a/Scenarios/ALKS_Scenario_4.2_2_PartiallyBlockingTarget_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.2_2_PartiallyBlockingTarget_TEMPLATE.xosc
@@ -86,7 +86,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -98,7 +98,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>

diff --git a/Scenarios/ALKS_Scenario_4.2_3_CrossingPedestrian_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.2_3_CrossingPedestrian_TEMPLATE.xosc
@@ -86,7 +86,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -98,7 +98,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>

diff --git a/Scenarios/ALKS_Scenario_4.2_4_MultipleBlockingTargets_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.2_4_MultipleBlockingTargets_TEMPLATE.xosc
@@ -98,7 +98,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -110,7 +110,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>

diff --git a/Scenarios/ALKS_Scenario_4.3_1_FollowLeadVehicleComfortable_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.3_1_FollowLeadVehicleComfortable_TEMPLATE.xosc
@@ -98,7 +98,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -110,7 +110,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>

diff --git a/Scenarios/ALKS_Scenario_4.3_2_FollowLeadVehicleEmergencyBrake_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.3_2_FollowLeadVehicleEmergencyBrake_TEMPLATE.xosc
@@ -96,7 +96,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -108,7 +108,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>

diff --git a/Scenarios/ALKS_Scenario_4.4_1_CutInNoCollision_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.4_1_CutInNoCollision_TEMPLATE.xosc
@@ -99,7 +99,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -111,7 +111,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>

diff --git a/Scenarios/ALKS_Scenario_4.4_2_CutInUnavoidableCollision_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.4_2_CutInUnavoidableCollision_TEMPLATE.xosc
@@ -99,7 +99,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -111,7 +111,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>

diff --git a/Scenarios/ALKS_Scenario_4.5_1_CutOutFullyBlocking_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.5_1_CutOutFullyBlocking_TEMPLATE.xosc
@@ -112,7 +112,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -124,7 +124,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>

diff --git a/Scenarios/ALKS_Scenario_4.5_2_CutOutMultipleBlockingTargets_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.5_2_CutOutMultipleBlockingTargets_TEMPLATE.xosc
@@ -123,7 +123,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -135,7 +135,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>

diff --git a/Scenarios/ALKS_Scenario_4.6_1_ForwardDetectionRange_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.6_1_ForwardDetectionRange_TEMPLATE.xosc
@@ -86,7 +86,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -98,7 +98,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>

diff --git a/Scenarios/ALKS_Scenario_4.6_2_LateralDetectionRange_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.6_2_LateralDetectionRange_TEMPLATE.xosc
@@ -98,7 +98,7 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerStartCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
                       <SimulationTimeCondition value="10000" rule="greaterThan" />
                     </ByValueCondition>
@@ -110,7 +110,7 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerStart" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
               <ByValueCondition>
                 <SimulationTimeCondition value="0" rule="greaterThan" />
               </ByValueCondition>