Skip to content

Commit

Permalink
patching expected results refs #21, #9663
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed May 7, 2024
1 parent 1d8a6a3 commit ebb676e
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 11 deletions.
33 changes: 29 additions & 4 deletions tests/sumo/meta/help/output.sumo
View file
@@ -1,4 +1,4 @@
Eclipse SUMO sumo Version v1_19_0+1803-069e576fb4d
Eclipse SUMO sumo Version v1_20_0+0026-b9eee10faaa
Copyright (C) 2001-2024 German Aerospace Center (DLR) and others; https://sumo.dlr.de
A microscopic, multi-modal traffic simulation.

Expand Down Expand Up @@ -176,6 +176,10 @@ Output Options:
--save-state.constraints Save rail signal constraints
--save-state.precision INT Write internal state values with the
given precision (default 2)
--pedestrian.jupedsim.wkt FILE The filename to output the JuPedSim
network as WKT
--pedestrian.jupedsim.wkt.geo Whether to output JuPedSim network as
WKT using geo-coordinates (lon/lat)

Time Options:
-b, --begin TIME Defines the begin time in seconds;
Expand Down Expand Up @@ -367,6 +371,20 @@ Processing Options:
--pedestrian.striping.walkingarea-detail INT Generate INT intermediate
points to smooth out lanes within the
walkingarea
--pedestrian.jupedsim.step-length TIME The update interval of the JuPedSim
simulation (in seconds)
--pedestrian.jupedsim.exit-tolerance FLOAT The distance to accept the
JuPedSim arrival point (in meters)
--pedestrian.jupedsim.model STR The submodel to use in JuPedSim
(currently only 'CollisionFreeSpeed')
--pedestrian.jupedsim.strength-neighbor-repulsion FLOAT The neighbor
repulsion strength of the JuPedSim model
--pedestrian.jupedsim.range-neighbor-repulsion FLOAT The neighbor repulsion
range of the JuPedSim model (in meters)
--pedestrian.jupedsim.strength-geometry-repulsion FLOAT The geometry
repulsion strength of the JuPedSim model
--pedestrian.jupedsim.range-geometry-repulsion FLOAT The geometry repulsion
range of the JuPedSim model (in meters)
--ride.stop-tolerance FLOAT Tolerance to apply when matching
pedestrian and vehicle positions on
boarding at individual stops
Expand Down Expand Up @@ -553,9 +571,12 @@ Battery Options:
deterministic using a fraction of 1000
--device.stationfinder.rescueTime TIME Time to wait for a rescue vehicle on
the road side when the battery is empty
--device.stationfinder.reserveFactor FLOAT Additional battery buffer for
unexpected traffic situation when
estimating the battery need
--device.stationfinder.rescueAction STR How to deal with a vehicle which has
to stop due to low battery: [none,
remove, tow]
--device.stationfinder.reserveFactor FLOAT Scale battery need with this
factor to account for unexpected traffic
situations
--device.stationfinder.emptyThreshold FLOAT Battery percentage to go into
rescue mode
--device.stationfinder.radius TIME Search radius in travel time seconds
Expand All @@ -567,6 +588,10 @@ Battery Options:
--device.stationfinder.waitForCharge TIME After this waiting time vehicle
searches for a new station when the
initial one is blocked
--device.stationfinder.saturatedChargeLevel FLOAT Target state of charge
after which the vehicle stops charging
--device.stationfinder.needToChargeLevel FLOAT State of charge the vehicle
begins searching for charging stations
--device.battery.probability FLOAT The probability for a vehicle to have a
'battery' device
--device.battery.explicit STR[] Assign a 'battery' device to named
Expand Down
14 changes: 13 additions & 1 deletion tests/sumo/meta/write_schema/cfg.sumo
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-04-12 11:15:26 by Eclipse SUMO sumo Version v1_19_0+1803-069e576fb4d
<!-- generated on 2024-05-07 18:41:39 by Eclipse SUMO sumo Version v1_20_0+0026-b9eee10faaa
-->

<xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
Expand Down Expand Up @@ -137,6 +137,8 @@
<xsd:element name="save-state.transportables" type="boolOptionType" minOccurs="0"/>
<xsd:element name="save-state.constraints" type="boolOptionType" minOccurs="0"/>
<xsd:element name="save-state.precision" type="intOptionType" minOccurs="0"/>
<xsd:element name="pedestrian.jupedsim.wkt" type="fileOptionType" minOccurs="0"/>
<xsd:element name="pedestrian.jupedsim.wkt.geo" type="boolOptionType" minOccurs="0"/>
</xsd:all>
</xsd:complexType>

Expand Down Expand Up @@ -217,6 +219,13 @@
<xsd:element name="pedestrian.striping.reserve-oncoming.max" type="floatOptionType" minOccurs="0"/>
<xsd:element name="pedestrian.striping.legacy-departposlat" type="boolOptionType" minOccurs="0"/>
<xsd:element name="pedestrian.striping.walkingarea-detail" type="intOptionType" minOccurs="0"/>
<xsd:element name="pedestrian.jupedsim.step-length" type="timeOptionType" minOccurs="0"/>
<xsd:element name="pedestrian.jupedsim.exit-tolerance" type="floatOptionType" minOccurs="0"/>
<xsd:element name="pedestrian.jupedsim.model" type="strOptionType" minOccurs="0"/>
<xsd:element name="pedestrian.jupedsim.strength-neighbor-repulsion" type="floatOptionType" minOccurs="0"/>
<xsd:element name="pedestrian.jupedsim.range-neighbor-repulsion" type="floatOptionType" minOccurs="0"/>
<xsd:element name="pedestrian.jupedsim.strength-geometry-repulsion" type="floatOptionType" minOccurs="0"/>
<xsd:element name="pedestrian.jupedsim.range-geometry-repulsion" type="floatOptionType" minOccurs="0"/>
<xsd:element name="ride.stop-tolerance" type="floatOptionType" minOccurs="0"/>
<xsd:element name="mapmatch.distance" type="floatOptionType" minOccurs="0"/>
<xsd:element name="mapmatch.junctions" type="boolOptionType" minOccurs="0"/>
Expand Down Expand Up @@ -329,13 +338,16 @@
<xsd:element name="device.stationfinder.explicit" type="strArrayOptionType" minOccurs="0"/>
<xsd:element name="device.stationfinder.deterministic" type="boolOptionType" minOccurs="0"/>
<xsd:element name="device.stationfinder.rescueTime" type="timeOptionType" minOccurs="0"/>
<xsd:element name="device.stationfinder.rescueAction" type="strOptionType" minOccurs="0"/>
<xsd:element name="device.stationfinder.reserveFactor" type="floatOptionType" minOccurs="0"/>
<xsd:element name="device.stationfinder.emptyThreshold" type="floatOptionType" minOccurs="0"/>
<xsd:element name="device.stationfinder.radius" type="timeOptionType" minOccurs="0"/>
<xsd:element name="device.stationfinder.repeat" type="timeOptionType" minOccurs="0"/>
<xsd:element name="device.stationfinder.maxChargePower" type="floatOptionType" minOccurs="0"/>
<xsd:element name="device.stationfinder.chargeType" type="strOptionType" minOccurs="0"/>
<xsd:element name="device.stationfinder.waitForCharge" type="timeOptionType" minOccurs="0"/>
<xsd:element name="device.stationfinder.saturatedChargeLevel" type="floatOptionType" minOccurs="0"/>
<xsd:element name="device.stationfinder.needToChargeLevel" type="floatOptionType" minOccurs="0"/>
<xsd:element name="device.battery.probability" type="floatOptionType" minOccurs="0"/>
<xsd:element name="device.battery.explicit" type="strArrayOptionType" minOccurs="0"/>
<xsd:element name="device.battery.deterministic" type="boolOptionType" minOccurs="0"/>
Expand Down
42 changes: 39 additions & 3 deletions tests/sumo/meta/write_template_commented_full/cfg.sumo
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-04-12 11:15:26 by Eclipse SUMO sumo Version v1_19_0+1803-069e576fb4d
<!-- generated on 2024-05-07 18:41:39 by Eclipse SUMO sumo Version v1_20_0+0026-b9eee10faaa
-->

<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
Expand Down Expand Up @@ -303,6 +303,12 @@
<!-- Write internal state values with the given precision (default 2) -->
<save-state.precision value="2" type="INT"/>

<!-- The filename to output the JuPedSim network as WKT -->
<pedestrian.jupedsim.wkt value="" type="FILE"/>

<!-- Whether to output JuPedSim network as WKT using geo-coordinates (lon/lat) -->
<pedestrian.jupedsim.wkt.geo value="false" type="BOOL"/>

</output>

<time>
Expand Down Expand Up @@ -519,6 +525,27 @@
<!-- Generate INT intermediate points to smooth out lanes within the walkingarea -->
<pedestrian.striping.walkingarea-detail value="4" type="INT"/>

<!-- The update interval of the JuPedSim simulation (in seconds) -->
<pedestrian.jupedsim.step-length value="0.01" type="TIME"/>

<!-- The distance to accept the JuPedSim arrival point (in meters) -->
<pedestrian.jupedsim.exit-tolerance value="1" type="FLOAT"/>

<!-- The submodel to use in JuPedSim (currently only &apos;CollisionFreeSpeed&apos;) -->
<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"/>

Expand Down Expand Up @@ -795,7 +822,10 @@
<!-- Time to wait for a rescue vehicle on the road side when the battery is empty -->
<device.stationfinder.rescueTime value="1800" type="TIME"/>

<!-- Additional battery buffer for unexpected traffic situation when estimating the battery need -->
<!-- How to deal with a vehicle which has to stop due to low battery: [none, remove, tow] -->
<device.stationfinder.rescueAction value="remove" type="STR"/>

<!-- Scale battery need with this factor to account for unexpected traffic situations -->
<device.stationfinder.reserveFactor value="1.1" type="FLOAT"/>

<!-- Battery percentage to go into rescue mode -->
Expand All @@ -808,14 +838,20 @@
<device.stationfinder.repeat value="60" type="TIME"/>

<!-- The maximum charging speed of the vehicle battery -->
<device.stationfinder.maxChargePower value="1000" type="FLOAT"/>
<device.stationfinder.maxChargePower value="100000" type="FLOAT"/>

<!-- Type of energy transfer -->
<device.stationfinder.chargeType value="charging" type="STR"/>

<!-- After this waiting time vehicle searches for a new station when the initial one is blocked -->
<device.stationfinder.waitForCharge value="600" type="TIME"/>

<!-- Target state of charge after which the vehicle stops charging -->
<device.stationfinder.saturatedChargeLevel value="80" type="FLOAT"/>

<!-- State of charge the vehicle begins searching for charging stations -->
<device.stationfinder.needToChargeLevel value="40" type="FLOAT"/>

<!-- The probability for a vehicle to have a &apos;battery&apos; device -->
<device.battery.probability value="-1" type="FLOAT"/>

Expand Down
18 changes: 15 additions & 3 deletions tests/sumo/meta/write_template_full/cfg.sumo
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-04-12 11:15:26 by Eclipse SUMO sumo Version v1_19_0+1803-069e576fb4d
<!-- generated on 2024-05-07 18:41:39 by Eclipse SUMO sumo Version v1_20_0+0026-b9eee10faaa
-->

<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
Expand Down Expand Up @@ -109,6 +109,8 @@
<save-state.transportables value="false" type="BOOL" help="Save person and container states (experimental)"/>
<save-state.constraints value="false" type="BOOL" help="Save rail signal constraints"/>
<save-state.precision value="2" type="INT" help="Write internal state values with the given precision (default 2)"/>
<pedestrian.jupedsim.wkt value="" type="FILE" help="The filename to output the JuPedSim network as WKT"/>
<pedestrian.jupedsim.wkt.geo value="false" type="BOOL" help="Whether to output JuPedSim network as WKT using geo-coordinates (lon/lat)"/>
</output>

<time>
Expand Down Expand Up @@ -185,6 +187,13 @@
<pedestrian.striping.reserve-oncoming.max value="1.28" type="FLOAT" help="Maximum width in m to reserve for oncoming pedestrians"/>
<pedestrian.striping.legacy-departposlat value="false" type="BOOL" help="Interpret departPosLat for walks in legacy style"/>
<pedestrian.striping.walkingarea-detail value="4" type="INT" help="Generate INT intermediate points to smooth out lanes within the walkingarea"/>
<pedestrian.jupedsim.step-length value="0.01" type="TIME" help="The update interval of the JuPedSim simulation (in seconds)"/>
<pedestrian.jupedsim.exit-tolerance value="1" type="FLOAT" help="The distance to accept the JuPedSim arrival point (in meters)"/>
<pedestrian.jupedsim.model value="CollisionFreeSpeed" type="STR" help="The submodel to use in JuPedSim (currently only &apos;CollisionFreeSpeed&apos;)"/>
<pedestrian.jupedsim.strength-neighbor-repulsion value="8" type="FLOAT" help="The neighbor repulsion strength of the JuPedSim model"/>
<pedestrian.jupedsim.range-neighbor-repulsion value="0.1" type="FLOAT" help="The neighbor repulsion range of the JuPedSim model (in meters)"/>
<pedestrian.jupedsim.strength-geometry-repulsion value="5" type="FLOAT" help="The geometry repulsion strength of the JuPedSim model"/>
<pedestrian.jupedsim.range-geometry-repulsion value="0.02" type="FLOAT" help="The geometry repulsion range of the JuPedSim model (in meters)"/>
<ride.stop-tolerance value="10" type="FLOAT" help="Tolerance to apply when matching pedestrian and vehicle positions on boarding at individual stops"/>
<mapmatch.distance value="100" type="FLOAT" help="Maximum distance when mapping input coordinates (fromXY etc.) to the road network"/>
<mapmatch.junctions value="false" type="BOOL" help="Match positions to junctions instead of edges"/>
Expand Down Expand Up @@ -287,13 +296,16 @@
<device.stationfinder.explicit value="" synonymes="device.stationfinder.knownveh" type="STR[]" help="Assign a &apos;stationfinder&apos; device to named vehicles"/>
<device.stationfinder.deterministic value="false" type="BOOL" help="The &apos;stationfinder&apos; devices are set deterministic using a fraction of 1000"/>
<device.stationfinder.rescueTime value="1800" type="TIME" help="Time to wait for a rescue vehicle on the road side when the battery is empty"/>
<device.stationfinder.reserveFactor value="1.1" type="FLOAT" help="Additional battery buffer for unexpected traffic situation when estimating the battery need"/>
<device.stationfinder.rescueAction value="remove" type="STR" help="How to deal with a vehicle which has to stop due to low battery: [none, remove, tow]"/>
<device.stationfinder.reserveFactor value="1.1" type="FLOAT" help="Scale battery need with this factor to account for unexpected traffic situations"/>
<device.stationfinder.emptyThreshold value="5" type="FLOAT" help="Battery percentage to go into rescue mode"/>
<device.stationfinder.radius value="180" type="TIME" help="Search radius in travel time seconds"/>
<device.stationfinder.repeat value="60" type="TIME" help="When to trigger a new search if no station has been found"/>
<device.stationfinder.maxChargePower value="1000" type="FLOAT" help="The maximum charging speed of the vehicle battery"/>
<device.stationfinder.maxChargePower value="100000" type="FLOAT" help="The maximum charging speed of the vehicle battery"/>
<device.stationfinder.chargeType value="charging" type="STR" help="Type of energy transfer"/>
<device.stationfinder.waitForCharge value="600" type="TIME" help="After this waiting time vehicle searches for a new station when the initial one is blocked"/>
<device.stationfinder.saturatedChargeLevel value="80" type="FLOAT" help="Target state of charge after which the vehicle stops charging"/>
<device.stationfinder.needToChargeLevel value="40" type="FLOAT" help="State of charge the vehicle begins searching for charging stations"/>
<device.battery.probability value="-1" type="FLOAT" help="The probability for a vehicle to have a &apos;battery&apos; device"/>
<device.battery.explicit value="" synonymes="device.battery.knownveh" type="STR[]" help="Assign a &apos;battery&apos; device to named vehicles"/>
<device.battery.deterministic value="false" type="BOOL" help="The &apos;battery&apos; devices are set deterministic using a fraction of 1000"/>
Expand Down

0 comments on commit ebb676e

Please sign in to comment.