patching meta results refs #21, #14653

eclipse-sumo · Apr 3, 2024 · 2fa8180 · 2fa8180
1 parent e9b4970
commit 2fa8180
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 9 deletions.
diff --git a/tests/duarouter/meta/help/output.duarouter b/tests/duarouter/meta/help/output.duarouter
@@ -1,4 +1,4 @@
-Eclipse SUMO duarouter Version v1_17_0+2470-b55cba8942c
+Eclipse SUMO duarouter Version v1_19_0+1662-cc3005420e0
  Copyright (C) 2001-2024 German Aerospace Center (DLR) and others; https://sumo.dlr.de
 Shortest path router and DUE computer for the microscopic, multi-modal traffic
  simulation SUMO.
@@ -113,6 +113,9 @@ Processing Options:
   --weights.minor-penalty FLOAT       Apply the given time penalty when
                                        computing routing costs for minor-link
                                        internal lanes
+  --weights.tls-penalty FLOAT         Apply the given time penalty when
+                                       computing routing costs across a traffic
+                                       light
   --weights.random-factor FLOAT       Edge weights for routing are dynamically
                                        disturbed by a random factor drawn
                                        uniformly from [1,FLOAT)

diff --git a/tests/duarouter/meta/write_template_commented_full/cfg.duarouter b/tests/duarouter/meta/write_template_commented_full/cfg.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-09-01 10:46:22 by Eclipse SUMO duarouter Version v1_17_0+2470-b55cba8942c
+<!-- generated on 2024-04-03 13:22:49 by Eclipse SUMO duarouter Version v1_19_0+1662-cc3005420e0
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/duarouterConfiguration.xsd">
@@ -177,6 +177,9 @@
         <!-- Apply the given time penalty when computing routing costs for minor-link internal lanes -->
         <weights.minor-penalty value="1.5" type="FLOAT"/>
 
+        <!-- Apply the given time penalty when computing routing costs across a traffic light -->
+        <weights.tls-penalty value="0" type="FLOAT"/>
+
         <!-- Edge weights for routing are dynamically disturbed by a random factor drawn uniformly from [1,FLOAT) -->
         <weights.random-factor value="1" type="FLOAT"/>
 

diff --git a/tests/duarouter/meta/write_template_full/cfg.duarouter b/tests/duarouter/meta/write_template_full/cfg.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-09-01 10:46:22 by Eclipse SUMO duarouter Version v1_17_0+2470-b55cba8942c
+<!-- generated on 2024-04-03 13:22:49 by Eclipse SUMO duarouter Version v1_19_0+1662-cc3005420e0
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/duarouterConfiguration.xsd">
@@ -69,6 +69,7 @@
         <weights.interpolate value="false" synonymes="interpolate" type="BOOL" help="Interpolate edge weights at interval boundaries"/>
         <weights.expand value="false" synonymes="expand-weights" type="BOOL" help="Expand the end of the last loaded weight interval to infinity"/>
         <weights.minor-penalty value="1.5" type="FLOAT" help="Apply the given time penalty when computing routing costs for minor-link internal lanes"/>
+        <weights.tls-penalty value="0" type="FLOAT" help="Apply the given time penalty when computing routing costs across a traffic light"/>
         <weights.random-factor value="1" type="FLOAT" help="Edge weights for routing are dynamically disturbed by a random factor drawn uniformly from [1,FLOAT)"/>
         <weight-period value="3600" type="TIME" help="Aggregation period for the given weight files; triggers rebuilding of Contraction Hierarchy"/>
         <weights.priority-factor value="0" type="FLOAT" help="Consider edge priorities in addition to travel times, weighted by factor"/>

diff --git a/tests/jtrrouter/meta/help/output.jtrrouter b/tests/jtrrouter/meta/help/output.jtrrouter
@@ -1,4 +1,4 @@
-Eclipse SUMO jtrrouter Version v1_17_0+2470-b55cba8942c
+Eclipse SUMO jtrrouter Version v1_19_0+1662-cc3005420e0
  Copyright (C) 2001-2024 German Aerospace Center (DLR) and others; https://sumo.dlr.de
 Router for the microscopic, multi-modal traffic simulation SUMO based on
  junction turning ratios.
@@ -83,6 +83,8 @@ Processing Options:
                                     compare for additional restrictions
   --weights.minor-penalty FLOAT    Apply the given time penalty when computing
                                     routing costs for minor-link internal lanes
+  --weights.tls-penalty FLOAT      Apply the given time penalty when computing
+                                    routing costs across a traffic light
   --max-edges-factor FLOAT         Routes are cut off when the route edges to
                                     net edges ratio is larger than FLOAT
   -T, --turn-defaults STR[]        Use STR[] as default turn definition

diff --git a/tests/jtrrouter/meta/write_template_commented_full/cfg.jtrrouter b/tests/jtrrouter/meta/write_template_commented_full/cfg.jtrrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-09-01 10:47:11 by Eclipse SUMO jtrrouter Version v1_17_0+2470-b55cba8942c
+<!-- generated on 2024-04-03 13:22:50 by Eclipse SUMO jtrrouter Version v1_19_0+1662-cc3005420e0
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/jtrrouterConfiguration.xsd">
@@ -138,6 +138,9 @@
         <!-- Apply the given time penalty when computing routing costs for minor-link internal lanes -->
         <weights.minor-penalty value="1.5" type="FLOAT"/>
 
+        <!-- Apply the given time penalty when computing routing costs across a traffic light -->
+        <weights.tls-penalty value="0" type="FLOAT"/>
+
         <!-- Routes are cut off when the route edges to net edges ratio is larger than FLOAT -->
         <max-edges-factor value="2" type="FLOAT"/>
 

diff --git a/tests/jtrrouter/meta/write_template_full/cfg.jtrrouter b/tests/jtrrouter/meta/write_template_full/cfg.jtrrouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-09-01 10:47:11 by Eclipse SUMO jtrrouter Version v1_17_0+2470-b55cba8942c
+<!-- generated on 2024-04-03 13:22:50 by Eclipse SUMO jtrrouter Version v1_19_0+1662-cc3005420e0
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/jtrrouterConfiguration.xsd">
@@ -56,6 +56,7 @@
         <routing-threads value="0" type="INT" help="The number of parallel execution threads used for routing"/>
         <restriction-params value="" type="STR[]" help="Comma separated list of param keys to compare for additional restrictions"/>
         <weights.minor-penalty value="1.5" type="FLOAT" help="Apply the given time penalty when computing routing costs for minor-link internal lanes"/>
+        <weights.tls-penalty value="0" type="FLOAT" help="Apply the given time penalty when computing routing costs across a traffic light"/>
         <max-edges-factor value="2" type="FLOAT" help="Routes are cut off when the route edges to net edges ratio is larger than FLOAT"/>
         <turn-defaults value="30,50,20" synonymes="T" type="STR[]" help="Use STR[] as default turn definition"/>
         <sink-edges value="" synonymes="sinks" type="STR[]" help="Use STR[] as list of sink edges"/>

diff --git a/tests/marouter/meta/help/output.marouter b/tests/marouter/meta/help/output.marouter
@@ -1,4 +1,4 @@
-Eclipse SUMO marouter Version v1_17_0+2470-b55cba8942c
+Eclipse SUMO marouter Version v1_19_0+1662-cc3005420e0
  Copyright (C) 2001-2024 German Aerospace Center (DLR) and others; https://sumo.dlr.de
 Import O/D-matrices for macroscopic traffic assignment to generate SUMO routes.
 
@@ -90,6 +90,9 @@ Processing Options:
   --weights.minor-penalty FLOAT      Apply the given time penalty when
                                       computing routing costs for minor-link
                                       internal lanes
+  --weights.tls-penalty FLOAT        Apply the given time penalty when
+                                      computing routing costs across a traffic
+                                      light
   --aggregation-interval TIME        Defines the time interval when aggregating
                                       single vehicle input; Defaults to one hour
   --capacities.default               Ignore edge priorities when calculating

diff --git a/tests/marouter/meta/write_template_commented_full/cfg.marouter b/tests/marouter/meta/write_template_commented_full/cfg.marouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-09-01 10:47:17 by Eclipse SUMO marouter Version v1_17_0+2470-b55cba8942c
+<!-- generated on 2024-04-03 13:22:50 by Eclipse SUMO marouter Version v1_19_0+1662-cc3005420e0
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/marouterConfiguration.xsd">
@@ -150,6 +150,9 @@
         <!-- Apply the given time penalty when computing routing costs for minor-link internal lanes -->
         <weights.minor-penalty value="1.5" type="FLOAT"/>
 
+        <!-- Apply the given time penalty when computing routing costs across a traffic light -->
+        <weights.tls-penalty value="0" type="FLOAT"/>
+
         <!-- Defines the time interval when aggregating single vehicle input; Defaults to one hour -->
         <aggregation-interval value="3600" type="TIME"/>
 

diff --git a/tests/marouter/meta/write_template_full/cfg.marouter b/tests/marouter/meta/write_template_full/cfg.marouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-09-01 10:47:17 by Eclipse SUMO marouter Version v1_17_0+2470-b55cba8942c
+<!-- generated on 2024-04-03 13:22:50 by Eclipse SUMO marouter Version v1_19_0+1662-cc3005420e0
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/marouterConfiguration.xsd">
@@ -60,6 +60,7 @@
         <weights.interpolate value="false" synonymes="interpolate" type="BOOL" help="Interpolate edge weights at interval boundaries"/>
         <weights.expand value="false" synonymes="expand-weights" type="BOOL" help="Expand the end of the last loaded weight interval to infinity"/>
         <weights.minor-penalty value="1.5" type="FLOAT" help="Apply the given time penalty when computing routing costs for minor-link internal lanes"/>
+        <weights.tls-penalty value="0" type="FLOAT" help="Apply the given time penalty when computing routing costs across a traffic light"/>
         <aggregation-interval value="3600" type="TIME" help="Defines the time interval when aggregating single vehicle input; Defaults to one hour"/>
         <capacities.default value="false" type="BOOL" help="Ignore edge priorities when calculating capacities and restraints"/>
         <weights.priority-factor value="0" type="FLOAT" help="Consider edge priorities in addition to travel times, weighted by factor"/>