Merge pull request #44 from asam-oss/adjust_rules_to_1_1

Use new 1.1 rules greaterOrEqual and lessOrEqual
openMSL · Jul 1, 2021 · 4303d0f · 4303d0f
2 parents b03cc8a + 3163fe0
commit 4303d0f
Show file tree

Hide file tree

Showing 15 changed files with 87 additions and 87 deletions.
diff --git a/Scenarios/ALKS_Scenario_4.1_1_FreeDriving_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.1_1_FreeDriving_TEMPLATE.xosc
@@ -74,7 +74,7 @@
                 <ConditionGroup>
                   <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
-                      <SimulationTimeCondition value="10000" rule="greaterThan" />
+                      <SimulationTimeCondition value="10000" rule="greaterOrEqual" />
                     </ByValueCondition>
                   </Condition>
                 </ConditionGroup>
@@ -84,9 +84,9 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="none">
               <ByValueCondition>
-                <SimulationTimeCondition value="0" rule="greaterThan" />
+                <SimulationTimeCondition value="0" rule="greaterOrEqual" />
               </ByValueCondition>
             </Condition>
           </ConditionGroup>
@@ -97,10 +97,10 @@
       <ConditionGroup>
         <Condition name="End" delay="0" conditionEdge="rising">
           <ByValueCondition>
-            <SimulationTimeCondition value="$Duration" rule="greaterThan" />
+            <SimulationTimeCondition value="$Duration" rule="greaterOrEqual" />
           </ByValueCondition>
         </Condition>
       </ConditionGroup>
     </StopTrigger>
   </Storyboard>
-</OpenSCENARIO>
+</OpenSCENARIO>
diff --git a/Scenarios/ALKS_Scenario_4.1_2_SwervingLeadVehicle_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.1_2_SwervingLeadVehicle_TEMPLATE.xosc
@@ -100,9 +100,9 @@
               </Action>
               <StartTrigger>
                 <ConditionGroup>
-                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
+                  <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="none">
                     <ByValueCondition>
-                      <SimulationTimeCondition value="10000" rule="greaterThan" />
+                      <SimulationTimeCondition value="10000" rule="greaterOrEqual" />
                     </ByValueCondition>
                   </Condition>
                 </ConditionGroup>
@@ -112,9 +112,9 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="none">
               <ByValueCondition>
-                <SimulationTimeCondition value="0" rule="greaterThan" />
+                <SimulationTimeCondition value="0" rule="greaterOrEqual" />
               </ByValueCondition>
             </Condition>
           </ConditionGroup>
@@ -145,7 +145,7 @@
                 <ConditionGroup>
                   <Condition name="SwerveEventStart" delay="0" conditionEdge="rising">
                     <ByValueCondition>
-                      <SimulationTimeCondition value="5.0" rule="greaterThan" />
+                      <SimulationTimeCondition value="5.0" rule="greaterOrEqual" />
                     </ByValueCondition>
                   </Condition>
                 </ConditionGroup>
@@ -224,9 +224,9 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="SwerveActStart" delay="0" conditionEdge="rising">
+            <Condition name="SwerveActStart" delay="0" conditionEdge="none">
               <ByValueCondition>
-                <SimulationTimeCondition value="0.0" rule="greaterThan" />
+                <SimulationTimeCondition value="0.0" rule="greaterOrEqual" />
               </ByValueCondition>
             </Condition>
           </ConditionGroup>
@@ -237,7 +237,7 @@
       <ConditionGroup>
         <Condition name="End" delay="0" conditionEdge="rising">
           <ByValueCondition>
-            <SimulationTimeCondition value="$Duration" rule="greaterThan" />
+            <SimulationTimeCondition value="$Duration" rule="greaterOrEqual" />
           </ByValueCondition>
         </Condition>
       </ConditionGroup>

diff --git a/Scenarios/ALKS_Scenario_4.1_3_SwervingSideVehicle_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.1_3_SwervingSideVehicle_TEMPLATE.xosc
@@ -102,7 +102,7 @@
                 <ConditionGroup>
                   <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
-                      <SimulationTimeCondition value="10000" rule="greaterThan" />
+                      <SimulationTimeCondition value="10000" rule="greaterOrEqual" />
                     </ByValueCondition>
                   </Condition>
                 </ConditionGroup>
@@ -112,9 +112,9 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="none">
               <ByValueCondition>
-                <SimulationTimeCondition value="0" rule="greaterThan" />
+                <SimulationTimeCondition value="0" rule="greaterOrEqual" />
               </ByValueCondition>
             </Condition>
           </ConditionGroup>
@@ -145,7 +145,7 @@
                 <ConditionGroup>
                   <Condition name="SwerveEventStart" delay="0" conditionEdge="rising">
                     <ByValueCondition>
-                      <SimulationTimeCondition value="5.0" rule="greaterThan" />
+                      <SimulationTimeCondition value="5.0" rule="greaterOrEqual" />
                     </ByValueCondition>
                   </Condition>
                 </ConditionGroup>
@@ -224,9 +224,9 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="SwerveActStart" delay="0" conditionEdge="rising">
+            <Condition name="SwerveActStart" delay="0" conditionEdge="none">
               <ByValueCondition>
-                <SimulationTimeCondition value="0.0" rule="greaterThan" />
+                <SimulationTimeCondition value="0.0" rule="greaterOrEqual" />
               </ByValueCondition>
             </Condition>
           </ConditionGroup>
@@ -237,7 +237,7 @@
       <ConditionGroup>
         <Condition name="End" delay="0" conditionEdge="rising">
           <ByValueCondition>
-            <SimulationTimeCondition value="$Duration" rule="greaterThan" />
+            <SimulationTimeCondition value="$Duration" rule="greaterOrEqual" />
           </ByValueCondition>
         </Condition>
       </ConditionGroup>

diff --git a/Scenarios/ALKS_Scenario_4.2_1_FullyBlockingTarget_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.2_1_FullyBlockingTarget_TEMPLATE.xosc
@@ -89,7 +89,7 @@
                 <ConditionGroup>
                   <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
-                      <SimulationTimeCondition value="10000" rule="greaterThan" />
+                      <SimulationTimeCondition value="10000" rule="greaterOrEqual" />
                     </ByValueCondition>
                   </Condition>
                 </ConditionGroup>
@@ -99,9 +99,9 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="none">
               <ByValueCondition>
-                <SimulationTimeCondition value="0" rule="greaterThan" />
+                <SimulationTimeCondition value="0" rule="greaterOrEqual" />
               </ByValueCondition>
             </Condition>
           </ConditionGroup>
@@ -112,7 +112,7 @@
       <ConditionGroup>
         <Condition name="End" delay="0" conditionEdge="rising">
           <ByValueCondition>
-            <SimulationTimeCondition value="$Duration" rule="greaterThan" />
+            <SimulationTimeCondition value="$Duration" rule="greaterOrEqual" />
           </ByValueCondition>
         </Condition>
       </ConditionGroup>

diff --git a/Scenarios/ALKS_Scenario_4.2_2_PartiallyBlockingTarget_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.2_2_PartiallyBlockingTarget_TEMPLATE.xosc
@@ -90,7 +90,7 @@
                 <ConditionGroup>
                   <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
-                      <SimulationTimeCondition value="10000" rule="greaterThan" />
+                      <SimulationTimeCondition value="10000" rule="greaterOrEqual" />
                     </ByValueCondition>
                   </Condition>
                 </ConditionGroup>
@@ -100,9 +100,9 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="none">
               <ByValueCondition>
-                <SimulationTimeCondition value="0" rule="greaterThan" />
+                <SimulationTimeCondition value="0" rule="greaterOrEqual" />
               </ByValueCondition>
             </Condition>
           </ConditionGroup>
@@ -113,7 +113,7 @@
       <ConditionGroup>
         <Condition name="End" delay="0" conditionEdge="rising">
           <ByValueCondition>
-            <SimulationTimeCondition value="$Duration" rule="greaterThan" />
+            <SimulationTimeCondition value="$Duration" rule="greaterOrEqual" />
           </ByValueCondition>
         </Condition>
       </ConditionGroup>

diff --git a/Scenarios/ALKS_Scenario_4.2_3_CrossingPedestrian_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.2_3_CrossingPedestrian_TEMPLATE.xosc
@@ -90,7 +90,7 @@
                 <ConditionGroup>
                   <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
-                      <SimulationTimeCondition value="10000" rule="greaterThan" />
+                      <SimulationTimeCondition value="10000" rule="greaterOrEqual" />
                     </ByValueCondition>
                   </Condition>
                 </ConditionGroup>
@@ -100,9 +100,9 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="none">
               <ByValueCondition>
-                <SimulationTimeCondition value="0" rule="greaterThan" />
+                <SimulationTimeCondition value="0" rule="greaterOrEqual" />
               </ByValueCondition>
             </Condition>
           </ConditionGroup>
@@ -170,9 +170,9 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="CrossActStart" delay="0" conditionEdge="rising">
+            <Condition name="CrossActStart" delay="0" conditionEdge="none">
               <ByValueCondition>
-                <SimulationTimeCondition value="0" rule="greaterThan" />
+                <SimulationTimeCondition value="0" rule="greaterOrEqual" />
               </ByValueCondition>
             </Condition>
           </ConditionGroup>
@@ -183,7 +183,7 @@
       <ConditionGroup>
         <Condition name="End" delay="0" conditionEdge="rising">
           <ByValueCondition>
-            <SimulationTimeCondition value="$Duration" rule="greaterThan" />
+            <SimulationTimeCondition value="$Duration" rule="greaterOrEqual" />
           </ByValueCondition>
         </Condition>
       </ConditionGroup>

diff --git a/Scenarios/ALKS_Scenario_4.2_4_MultipleBlockingTargets_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.2_4_MultipleBlockingTargets_TEMPLATE.xosc
@@ -102,7 +102,7 @@
                 <ConditionGroup>
                   <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
-                      <SimulationTimeCondition value="10000" rule="greaterThan" />
+                      <SimulationTimeCondition value="10000" rule="greaterOrEqual" />
                     </ByValueCondition>
                   </Condition>
                 </ConditionGroup>
@@ -112,9 +112,9 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="none">
               <ByValueCondition>
-                <SimulationTimeCondition value="0" rule="greaterThan" />
+                <SimulationTimeCondition value="0" rule="greaterOrEqual" />
               </ByValueCondition>
             </Condition>
           </ConditionGroup>
@@ -125,7 +125,7 @@
       <ConditionGroup>
         <Condition name="End" delay="0" conditionEdge="rising">
           <ByValueCondition>
-            <SimulationTimeCondition value="$Duration" rule="greaterThan" />
+            <SimulationTimeCondition value="$Duration" rule="greaterOrEqual" />
           </ByValueCondition>
         </Condition>
       </ConditionGroup>

diff --git a/Scenarios/ALKS_Scenario_4.3_1_FollowLeadVehicleComfortable_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.3_1_FollowLeadVehicleComfortable_TEMPLATE.xosc
@@ -102,7 +102,7 @@
                 <ConditionGroup>
                   <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
-                      <SimulationTimeCondition value="10000" rule="greaterThan" />
+                      <SimulationTimeCondition value="10000" rule="greaterOrEqual" />
                     </ByValueCondition>
                   </Condition>
                 </ConditionGroup>
@@ -112,9 +112,9 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="none">
               <ByValueCondition>
-                <SimulationTimeCondition value="0" rule="greaterThan" />
+                <SimulationTimeCondition value="0" rule="greaterOrEqual" />
               </ByValueCondition>
             </Condition>
           </ConditionGroup>
@@ -145,7 +145,7 @@
                 <ConditionGroup>
                   <Condition name="VaryingSpeedStartCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
-                      <SimulationTimeCondition value="10.0" rule="greaterThan" />
+                      <SimulationTimeCondition value="10.0" rule="greaterOrEqual" />
                     </ByValueCondition>
                   </Condition>
                 </ConditionGroup>
@@ -178,9 +178,9 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="VaryingSpeedActStart" delay="0" conditionEdge="rising">
+            <Condition name="VaryingSpeedActStart" delay="0" conditionEdge="none">
               <ByValueCondition>
-                <SimulationTimeCondition value="0.0" rule="greaterThan" />
+                <SimulationTimeCondition value="0.0" rule="greaterOrEqual" />
               </ByValueCondition>
             </Condition>
           </ConditionGroup>
@@ -191,7 +191,7 @@
       <ConditionGroup>
         <Condition name="End" delay="0" conditionEdge="rising">
           <ByValueCondition>
-            <SimulationTimeCondition value="$Duration" rule="greaterThan" />
+            <SimulationTimeCondition value="$Duration" rule="greaterOrEqual" />
           </ByValueCondition>
         </Condition>
       </ConditionGroup>

diff --git a/Scenarios/ALKS_Scenario_4.3_2_FollowLeadVehicleEmergencyBrake_TEMPLATE.xosc b/Scenarios/ALKS_Scenario_4.3_2_FollowLeadVehicleEmergencyBrake_TEMPLATE.xosc
@@ -100,7 +100,7 @@
                 <ConditionGroup>
                   <Condition name="ActivateALKSControllerEventCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
-                      <SimulationTimeCondition value="10000" rule="greaterThan" />
+                      <SimulationTimeCondition value="10000" rule="greaterOrEqual" />
                     </ByValueCondition>
                   </Condition>
                 </ConditionGroup>
@@ -110,9 +110,9 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="rising">
+            <Condition name="ActivateALKSControllerActCondition" delay="0" conditionEdge="none">
               <ByValueCondition>
-                <SimulationTimeCondition value="0" rule="greaterThan" />
+                <SimulationTimeCondition value="0" rule="greaterOrEqual" />
               </ByValueCondition>
             </Condition>
           </ConditionGroup>
@@ -143,7 +143,7 @@
                 <ConditionGroup>
                   <Condition name="BrakeStartCondition" delay="0" conditionEdge="rising">
                     <ByValueCondition>
-                      <SimulationTimeCondition value="10.0" rule="greaterThan" />
+                      <SimulationTimeCondition value="10.0" rule="greaterOrEqual" />
                     </ByValueCondition>
                   </Condition>
                 </ConditionGroup>
@@ -153,9 +153,9 @@
         </ManeuverGroup>
         <StartTrigger>
           <ConditionGroup>
-            <Condition name="BrakeActStart" delay="0" conditionEdge="rising">
+            <Condition name="BrakeActStart" delay="0" conditionEdge="none">
               <ByValueCondition>
-                <SimulationTimeCondition value="0.0" rule="greaterThan" />
+                <SimulationTimeCondition value="0.0" rule="greaterOrEqual" />
               </ByValueCondition>
             </Condition>
           </ConditionGroup>
@@ -166,7 +166,7 @@
       <ConditionGroup>
         <Condition name="End" delay="0" conditionEdge="rising">
           <ByValueCondition>
-            <SimulationTimeCondition value="$Duration" rule="greaterThan" />
+            <SimulationTimeCondition value="$Duration" rule="greaterOrEqual" />
           </ByValueCondition>
         </Condition>
       </ConditionGroup>