update test results; refs eclipse-sumo#6157 eclipse-sumo#21

XFXZ · Oct 17, 2019 · 19fccf8 · 19fccf8
1 parent 2367019
commit 19fccf8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/tests/sumo/meta/help/output.sumo b/tests/sumo/meta/help/output.sumo
@@ -1,4 +1,4 @@
-Eclipse SUMO Version v1_3_1+0470-4a6b08f445
+Eclipse SUMO Version v1_3_1+0627-87c998ba19
  Copyright (C) 2001-2019 German Aerospace Center (DLR) and others; https://sumo.dlr.de
 A microscopic, multi-modal traffic simulation.
 
@@ -424,6 +424,11 @@ ToC Device Options:
                                          triggered TOR is not answered in time.
   --device.toc.mrmKeepRight            If true, the vehicle tries to change to
                                          the right during an MRM.
+  --device.toc.mrmSafeSpot STR         If set, the vehicle tries to reach the
+                                         given named stopping place during an
+                                         MRM.
+  --device.toc.mrmSafeSpotDuration FLOAT  Duration the vehicle stays at the
+                                         safe spot after an MRM.
   --device.toc.maxPreparationAccel FLOAT  Maximal acceleration that may be
                                          applied during the ToC preparation
                                          phase.

diff --git a/tests/sumo/meta/write_template_commented_full/cfg.sumo b/tests/sumo/meta/write_template_commented_full/cfg.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Wed Oct 16 13:31:56 2019 by Eclipse SUMO Version v1_3_1+0470-4a6b08f445
+<!-- generated on Thu Oct 17 16:37:15 2019 by Eclipse SUMO Version v1_3_1+0627-87c998ba19
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
@@ -597,6 +597,12 @@
         <!-- If true, the vehicle tries to change to the right during an MRM. -->
         <device.toc.mrmKeepRight value="false" type="BOOL"/>
 
+        <!-- If set, the vehicle tries to reach the given named stopping place during an MRM. -->
+        <device.toc.mrmSafeSpot value="" type="STR"/>
+
+        <!-- Duration the vehicle stays at the safe spot after an MRM. -->
+        <device.toc.mrmSafeSpotDuration value="60" type="FLOAT"/>
+
         <!-- Maximal acceleration that may be applied during the ToC preparation phase. -->
         <device.toc.maxPreparationAccel value="0" type="FLOAT"/>
 

diff --git a/tests/sumo/meta/write_template_full/cfg.sumo b/tests/sumo/meta/write_template_full/cfg.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Wed Oct 16 13:31:56 2019 by Eclipse SUMO Version v1_3_1+0470-4a6b08f445
+<!-- generated on Thu Oct 17 16:37:14 2019 by Eclipse SUMO Version v1_3_1+0627-87c998ba19
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
@@ -227,6 +227,8 @@
         <device.toc.dynamicToCThreshold value="0" type="FLOAT" help="Time, which the vehicle requires to have ahead to continue in automated mode. The default value of 0 indicates no dynamic triggering of ToCs."/>
         <device.toc.dynamicMRMProbability value="0.05" type="FLOAT" help="Probability that a dynamically triggered TOR is not answered in time."/>
         <device.toc.mrmKeepRight value="false" type="BOOL" help="If true, the vehicle tries to change to the right during an MRM."/>
+        <device.toc.mrmSafeSpot value="" type="STR" help="If set, the vehicle tries to reach the given named stopping place during an MRM."/>
+        <device.toc.mrmSafeSpotDuration value="60" type="FLOAT" help="Duration the vehicle stays at the safe spot after an MRM."/>
         <device.toc.maxPreparationAccel value="0" type="FLOAT" help="Maximal acceleration that may be applied during the ToC preparation phase."/>
         <device.toc.ogNewTimeHeadway value="-1" type="FLOAT" help="Timegap for ToC preparation phase."/>
         <device.toc.ogNewSpaceHeadway value="-1" type="FLOAT" help="Additional spacing for ToC preparation phase."/>