Skip to content

Commit

Permalink
patching expected results. refs #21, #5309
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Mar 16, 2019
1 parent e8df84c commit 06744b9
Show file tree
Hide file tree
Showing 6 changed files with 177 additions and 227 deletions.
20 changes: 10 additions & 10 deletions tests/traci/set_variable/Vehicle/ChangeLane/PassingJunction/net_state.traci
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Mon Oct 1 12:44:23 2018 by Eclipse SUMO Version UNKNOWN
<!-- generated on Sat Mar 16 17:32:04 2019 by Eclipse SUMO Version v1_1_0+0435-678c69824b
This data file and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
Expand Down Expand Up @@ -28,7 +28,7 @@ SPDX-License-Identifier: EPL-2.0
</report>
<traci_server>
<remote-port value="56255"/>
<remote-port value="52097"/>
</traci_server>
</configuration>
Expand Down Expand Up @@ -389,35 +389,35 @@ SPDX-License-Identifier: EPL-2.0
</timestep>
<timestep time="43.00">
<edge id="4fi">
<lane id="4fi_0">
<lane id="4fi_0"/>
<lane id="4fi_1">
<vehicle id="veh0" pos="167.46" speed="33.29"/>
</lane>
<lane id="4fi_1"/>
</edge>
</timestep>
<timestep time="44.00">
<edge id="4fi">
<lane id="4fi_0">
<lane id="4fi_0"/>
<lane id="4fi_1">
<vehicle id="veh0" pos="200.79" speed="33.33"/>
</lane>
<lane id="4fi_1"/>
</edge>
</timestep>
<timestep time="45.00">
<edge id="4fi">
<lane id="4fi_0">
<lane id="4fi_0"/>
<lane id="4fi_1">
<vehicle id="veh0" pos="234.12" speed="33.33"/>
</lane>
<lane id="4fi_1"/>
</edge>
</timestep>
<timestep time="46.00">
<edge id="4si">
<lane id="4si_0"/>
<lane id="4si_1">
<lane id="4si_1"/>
<lane id="4si_2">
<vehicle id="veh0" pos="15.46" speed="33.33"/>
</lane>
<lane id="4si_2"/>
</edge>
</timestep>
<timestep time="47.00">
Expand Down
73 changes: 37 additions & 36 deletions tests/traci/set_variable/Vehicle/ChangeLane/hold/net_state.traci
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Fri Mar 7 09:56:51 2014 by SUMO sumo Version dev-SVN-r15863
<!-- generated on Sat Mar 16 17:32:04 2019 by Eclipse SUMO Version v1_1_0+0435-678c69824b
This data file and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
Expand All @@ -14,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
</input>
<output>
<write-license value="true"/>
<netstate-dump value="netstate_dump.xml"/>
</output>
Expand All @@ -23,7 +24,7 @@ SPDX-License-Identifier: EPL-2.0
</report>
<traci_server>
<remote-port value="8810"/>
<remote-port value="34985"/>
</traci_server>
</configuration>
Expand Down Expand Up @@ -281,154 +282,154 @@ SPDX-License-Identifier: EPL-2.0
<timestep time="31.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="0.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="32.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="10.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="33.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="20.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="34.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="30.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="35.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="40.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="36.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="50.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="37.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="60.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="38.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="70.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="39.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="80.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="40.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="90.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="41.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="100.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="42.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="110.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="43.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="120.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="44.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="130.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="45.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="140.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="46.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="150.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
<timestep time="47.00">
<edge id="1si">
<lane id="1si_0"/>
<lane id="1si_1">
<lane id="1si_1"/>
<lane id="1si_2">
<vehicle id="veh0" pos="160.41" speed="10.00"/>
</lane>
<lane id="1si_2"/>
</edge>
</timestep>
</netstate>

0 comments on commit 06744b9

Please sign in to comment.