fixing new parameter descriptions #21

eclipse-sumo · Feb 14, 2024 · 360d528 · 360d528
1 parent 67ebab1
commit 360d528
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/src/microsim/MSFrame.cpp b/src/microsim/MSFrame.cpp
@@ -550,20 +550,22 @@ MSFrame::fillOptions() {
     oc.doRegister("pedestrian.striping.walkingarea-detail", new Option_Integer(4));
     oc.addDescription("pedestrian.striping.walkingarea-detail", "Processing", TL("Generate INT intermediate points to smooth out lanes within the walkingarea"));
 
+#ifdef JPS_VERSION
     oc.doRegister("pedestrian.jupedsim.step-length", new Option_String("0.01", "TIME"));
     oc.addDescription("pedestrian.jupedsim.step-length", "Processing", TL("The update interval of the JuPedSim simulation (in seconds)"));
     oc.doRegister("pedestrian.jupedsim.exit-tolerance", new Option_Float(1.));
-    oc.addDescription("pedestrian.jupedsim.exit-tolerance", "Processing", TL("The distance to the destination point considered as arrival (in meters)"));
+    oc.addDescription("pedestrian.jupedsim.exit-tolerance", "Processing", TL("The distance to accept the JuPedSim arrival point (in meters)"));
     oc.doRegister("pedestrian.jupedsim.model", new Option_String("CollisionFreeSpeed"));
-    oc.addDescription("pedestrian.jupedsim.model", "Processing", TL("The submodel to use in jupedsim"));
+    oc.addDescription("pedestrian.jupedsim.model", "Processing", TL("The submodel to use in JuPedSim (currently only 'CollisionFreeSpeed')"));
     oc.doRegister("pedestrian.jupedsim.strength-neighbor-repulsion", new Option_Float(8.));
-    oc.addDescription("pedestrian.jupedsim.strength-neighbor-repulsion", "Processing", TL("The distance to the destination point considered as arrival (in meters)"));
+    oc.addDescription("pedestrian.jupedsim.strength-neighbor-repulsion", "Processing", TL("The neighbor repulsion strength of the JuPedSim model"));
     oc.doRegister("pedestrian.jupedsim.range-neighbor-repulsion", new Option_Float(.1));
-    oc.addDescription("pedestrian.jupedsim.range-neighbor-repulsion", "Processing", TL("The distance to the destination point considered as arrival (in meters)"));
+    oc.addDescription("pedestrian.jupedsim.range-neighbor-repulsion", "Processing", TL("The neighbor repulsion range of the JuPedSim model (in meters)"));
     oc.doRegister("pedestrian.jupedsim.strength-geometry-repulsion", new Option_Float(5.));
-    oc.addDescription("pedestrian.jupedsim.strength-geometry-repulsion", "Processing", TL("The distance to the destination point considered as arrival (in meters)"));
+    oc.addDescription("pedestrian.jupedsim.strength-geometry-repulsion", "Processing", TL("The geometry repulsion strength of the JuPedSim model"));
     oc.doRegister("pedestrian.jupedsim.range-geometry-repulsion", new Option_Float(.02));
-    oc.addDescription("pedestrian.jupedsim.range-geometry-repulsion", "Processing", TL("The distance to the destination point considered as arrival (in meters)"));
+    oc.addDescription("pedestrian.jupedsim.range-geometry-repulsion", "Processing", TL("The geometry repulsion range of the JuPedSim model (in meters)"));
+#endif
 
     oc.doRegister("ride.stop-tolerance", new Option_Float(10.));
     oc.addDescription("ride.stop-tolerance", "Processing", TL("Tolerance to apply when matching pedestrian and vehicle positions on boarding at individual stops"));

diff --git a/tests/sumo/config.sumo b/tests/sumo/config.sumo
@@ -108,6 +108,7 @@ output:Building Contraction Hierarchy{[->]}Simulation ended
 output:ms answering queries
 output:--python-script
 output:--osg-view{LINES 2}
+output:--pedestrian.jupedsim{LINES 2}
 output:movereminder-output{LINES 2}
 output:Simulation.*started with{REPLACE Simulation started with}
 calibrator_log:<!--{[->]}-->
@@ -190,6 +191,8 @@ cfg:<python-script
 cfg:embedded python
 cfg:osg-view
 cfg:OpenSceneGraph
+cfg:pedestrian.jupedsim
+cfg:JuPedSim
 cfg:^$
 weights:<!--{[->]}-->
 lanechanges:<!--{[->]}-->

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 2023-09-22 15:49:47 by Eclipse SUMO sumo Version v1_18_0+1749-26d8ef39b84
+<!-- generated on 2024-02-14 22:13:55 by Eclipse SUMO sumo Version v1_19_0+0829-67ebab13130
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
@@ -522,9 +522,24 @@
         <!-- The update interval of the JuPedSim simulation (in seconds) -->
         <pedestrian.jupedsim.step-length value="0.01" type="TIME"/>
 
-        <!-- The distance to the destination point considered as arrival (in meters) -->
+        <!-- The distance to the JuPedSim destination point considered as arrival (in meters) -->
         <pedestrian.jupedsim.exit-tolerance value="1" type="FLOAT"/>
 
+        <!-- The submodel to use in JuPedSim -->
+        <pedestrian.jupedsim.model value="CollisionFreeSpeed" type="STR"/>
+
+        <!-- The neighbor repulsion strength of the JuPedSim model -->
+        <pedestrian.jupedsim.strength-neighbor-repulsion value="8" type="FLOAT"/>
+
+        <!-- The neighbor repulsion range of the JuPedSim model (in meters) -->
+        <pedestrian.jupedsim.range-neighbor-repulsion value="0.1" type="FLOAT"/>
+
+        <!-- The geometry repulsion strength of the JuPedSim model -->
+        <pedestrian.jupedsim.strength-geometry-repulsion value="5" type="FLOAT"/>
+
+        <!-- The geometry repulsion range of the JuPedSim model (in meters) -->
+        <pedestrian.jupedsim.range-geometry-repulsion value="0.02" type="FLOAT"/>
+
         <!-- Tolerance to apply when matching pedestrian and vehicle positions on boarding at individual stops -->
         <ride.stop-tolerance value="10" type="FLOAT"/>