Making openGap params accessbile via setParameters in ToC device (#14583

) * Add og-parameters to setParameter-function #14582 * adding tests for og-params in ToC device #21 #14582 * fix for new test #21 #14582
eclipse-sumo · Mar 22, 2024 · 7041ee3 · 7041ee3
1 parent d9b7d4b
commit 7041ee3
Show file tree

Hide file tree

Showing 22 changed files with 10,589 additions and 3 deletions.
diff --git a/src/microsim/devices/MSDevice_ToC.cpp b/src/microsim/devices/MSDevice_ToC.cpp
@@ -976,6 +976,22 @@ MSDevice_ToC::setParameter(const std::string& key, const std::string& value) {
         } else {
             myMaxPreparationAccel = newValue;
         }
+    } else if (key == "ogNewTimeHeadway") {
+        const double newValue = StringUtils::toDouble(value);
+        myOpenGapParams.newTimeHeadway = newValue;
+        myOpenGapParams.active = true;
+    } else if (key == "ogNewSpaceHeadway") {
+        const double newValue = StringUtils::toDouble(value);
+        myOpenGapParams.newSpaceHeadway = newValue;
+        myOpenGapParams.active = true;
+    } else if (key == "ogChangeRate") {
+        const double newValue = StringUtils::toDouble(value);
+        myOpenGapParams.changeRate = newValue;
+        myOpenGapParams.active = true;
+    } else if (key == "ogMaxDecel") {
+        const double newValue = StringUtils::toDouble(value);
+        myOpenGapParams.maxDecel = newValue;
+        myOpenGapParams.active = true;
     } else {
         throw InvalidArgument("Parameter '" + key + "' is not supported for device of type '" + deviceName() + "'");
     }

diff --git a/tests/complex/sumo/ToCDevice/CF_situation4/errors.complex b/tests/complex/sumo/ToCDevice/CF_situation4/errors.complex
diff --git a/tests/complex/sumo/ToCDevice/CF_situation4/fcd.complex b/tests/complex/sumo/ToCDevice/CF_situation4/fcd.complex
diff --git a/tests/complex/sumo/ToCDevice/CF_situation4/input_routes.rou.xml b/tests/complex/sumo/ToCDevice/CF_situation4/input_routes.rou.xml
@@ -0,0 +1,25 @@
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+    <vType id="automated" sigma="0." speedFactor="1"/>
+    <vType id="manual" sigma="0.5" speedFactor="normc(0.8,0.1,0.5,1.5)" guiShape="passenger/van" />
+    <vehicle id="leader" type="automated" depart="0" departPos="last" departLane="0">
+        <route edges="1/1to2/1 2/1to3/1 3/1to4/1 4/1to5/1 5/1to6/1"/>
+    </vehicle>
+    <vehicle id="ToC_veh" type="automated" depart="0" departPos="last" departLane="0">
+        <route edges="1/1to2/1 2/1to3/1 3/1to4/1 4/1to5/1 5/1to6/1"/>
+        <param key="has.toc.device" value="true"/>
+        <param key="device.toc.manualType" value="manual"/>
+        <param key="device.toc.automatedType" value="automated"/>
+        <param key="device.toc.responseTime" value="50.0"/>
+        <param key="device.toc.recoveryRate" value="0.1"/>
+        <param key="device.toc.initialAwareness" value="0.25"/>
+        <param key="device.toc.mrmDecel" value="3.0"/>  
+        <param key="device.toc.ogNewSpaceHeadway" value="10"/>
+        <param key="device.toc.ogNewTimeHeadway" value="5"/>
+        <param key="device.toc.ogChangeRate" value="1.0"/>
+        <param key="device.toc.ogMaxDecel" value="1.0"/>              
+        <param key="device.toc.file" value="tocs.xml"/>
+    </vehicle>
+    <vehicle id="follower" type="automated" depart="0" departPos="last" departLane="0">
+        <route edges="1/1to2/1 2/1to3/1 3/1to4/1 4/1to5/1 5/1to6/1"/>
+    </vehicle>
+</routes>
diff --git a/tests/complex/sumo/ToCDevice/CF_situation4/options.complex b/tests/complex/sumo/ToCDevice/CF_situation4/options.complex
@@ -0,0 +1 @@
+tests/complex/sumo/ToCDevice/CF_situation4/runner.py