Skip to content

Commit

Permalink
patching expected results refs #21, #15822
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Dec 1, 2024
1 parent 10b61b1 commit e43546b
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 45 deletions.
48 changes: 24 additions & 24 deletions tests/complex/state/rail/save_rail_signal2/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
Loading net-file from 'net.net.xml' ... done (7ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading done.
Simulation version v1_21_0+0407-08724d0e971 started with time: 0.00.
Simulation version v1_21_0+1093-f807130dc4a started with time: 0.00.
Simulation ended at time: 54.00.
Reason: All vehicles have left the simulation.
Loading net-file from 'net.net.xml' ... done (0ms).
Loading state from 'state.xml' ... done (15ms).
Loading net-file from 'net.net.xml' ... done (11ms).
Loading state from 'state.xml' ... done (10ms).
Loading done.
Simulation version v1_21_0+0407-08724d0e971 started with time: 20.00.
Simulation version v1_21_0+1093-f807130dc4a started with time: 20.00.
Simulation ended at time: 54.00.
Reason: All vehicles have left the simulation.
< <entry id="train" time="9.00" reason="1"/>
> <exit id="train" time="31.00" reason="9"/>
< <exit id="train" time="31.00" reason="9"/>
< <entry id="train" time="9.00" reason="junction"/>
> <exit id="train" time="31.00" reason="arrived"/>
< <exit id="train" time="31.00" reason="arrived"/>
> </driveWay>
< </driveWay>
> <subDriveWay id="A.0.0">
< <subDriveWay id="A.0.0">
> <exit id="train" time="25.00" reason="1"/>
< <entry id="train" time="9.00" reason="1"/>
> <exit id="train" time="25.00" reason="junction"/>
< <entry id="train" time="9.00" reason="junction"/>
> </subDriveWay>
< <exit id="train" time="25.00" reason="1"/>
< <exit id="train" time="25.00" reason="junction"/>
> </link>
< </subDriveWay>
> </railSignal>
Expand All @@ -30,20 +30,20 @@ Reason: All vehicles have left the simulation.
< <railSignal id="B">
> <driveWay id="B.0">
< <link linkIndex="0" from="-d2_0" to=":B_0_0">
> <entry id="train2" time="26.00" reason="1"/>
> <entry id="train2" time="26.00" reason="junction"/>
< <driveWay id="B.0">
> <exit id="train2" time="53.00" reason="9"/>
< <entry id="train2" time="26.00" reason="1"/>
> <exit id="train2" time="53.00" reason="arrived"/>
< <entry id="train2" time="26.00" reason="junction"/>
> </driveWay>
< <exit id="train2" time="53.00" reason="9"/>
< <exit id="train2" time="53.00" reason="arrived"/>
> <subDriveWay id="B.0.0">
< </driveWay>
> <entry id="train2" time="26.00" reason="1"/>
> <entry id="train2" time="26.00" reason="junction"/>
< <subDriveWay id="B.0.0">
> <exit id="train2" time="45.00" reason="1"/>
< <entry id="train2" time="26.00" reason="1"/>
> <exit id="train2" time="45.00" reason="junction"/>
< <entry id="train2" time="26.00" reason="junction"/>
> </subDriveWay>
< <exit id="train2" time="45.00" reason="1"/>
< <exit id="train2" time="45.00" reason="junction"/>
> </link>
< </subDriveWay>
> </railSignal>
Expand All @@ -52,20 +52,20 @@ Reason: All vehicles have left the simulation.
< </railSignal>
> <driveWay id="gneJ7.d0">
< <departJunction id="gneJ7">
> <exit id="train2" time="30.00" reason="1"/>
> <exit id="train2" time="30.00" reason="junction"/>
< <driveWay id="gneJ7.d0">
> </driveWay>
< <entry id="train2" time="1.00" reason="0"/>
< <entry id="train2" time="1.00" reason="departed"/>
> </departJunction>
< <exit id="train2" time="30.00" reason="1"/>
< <exit id="train2" time="30.00" reason="junction"/>
> <departJunction id="gneJ0">
< </driveWay>
> <driveWay id="gneJ0.d0"/>
< <departJunction id="gneJ0">
> </railsignal-vehicle-output>
< <driveWay id="gneJ0.d0">
< <entry id="train" time="0.00" reason="0"/>
< <exit id="train" time="10.00" reason="1"/>
< <entry id="train" time="0.00" reason="departed"/>
< <exit id="train" time="10.00" reason="junction"/>
< </driveWay>
< </departJunction>
< </railsignal-vehicle-output>
26 changes: 13 additions & 13 deletions tests/complex/state/rail/save_rail_signal2/railsignalvehs.complex
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 2024-10-17 10:50:05 by Eclipse SUMO sumo Version v1_21_0+0407-08724d0e971
<!-- generated on 2024-12-01 22:22:38 by Eclipse SUMO sumo Version v1_21_0+1093-f807130dc4a
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<input>
Expand Down Expand Up @@ -32,37 +32,37 @@
<railSignal id="A">
<link linkIndex="0" from="a_0" to=":A_2_0">
<driveWay id="A.0">
<entry id="train" time="9.00" reason="1"/>
<exit id="train" time="31.00" reason="9"/>
<entry id="train" time="9.00" reason="junction"/>
<exit id="train" time="31.00" reason="arrived"/>
</driveWay>
<subDriveWay id="A.0.0">
<entry id="train" time="9.00" reason="1"/>
<exit id="train" time="25.00" reason="1"/>
<entry id="train" time="9.00" reason="junction"/>
<exit id="train" time="25.00" reason="junction"/>
</subDriveWay>
</link>
</railSignal>
<railSignal id="B">
<link linkIndex="0" from="-d2_0" to=":B_0_0">
<driveWay id="B.0">
<entry id="train2" time="26.00" reason="1"/>
<exit id="train2" time="53.00" reason="9"/>
<entry id="train2" time="26.00" reason="junction"/>
<exit id="train2" time="53.00" reason="arrived"/>
</driveWay>
<subDriveWay id="B.0.0">
<entry id="train2" time="26.00" reason="1"/>
<exit id="train2" time="45.00" reason="1"/>
<entry id="train2" time="26.00" reason="junction"/>
<exit id="train2" time="45.00" reason="junction"/>
</subDriveWay>
</link>
</railSignal>
<departJunction id="gneJ7">
<driveWay id="gneJ7.d0">
<entry id="train2" time="1.00" reason="0"/>
<exit id="train2" time="30.00" reason="1"/>
<entry id="train2" time="1.00" reason="departed"/>
<exit id="train2" time="30.00" reason="junction"/>
</driveWay>
</departJunction>
<departJunction id="gneJ0">
<driveWay id="gneJ0.d0">
<entry id="train" time="0.00" reason="0"/>
<exit id="train" time="10.00" reason="1"/>
<entry id="train" time="0.00" reason="departed"/>
<exit id="train" time="10.00" reason="junction"/>
</driveWay>
</departJunction>
</railsignal-vehicle-output>
16 changes: 8 additions & 8 deletions tests/complex/state/rail/save_rail_signal2/railsignalvehs2.complex
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 2024-10-17 10:50:05 by Eclipse SUMO sumo Version v1_21_0+0407-08724d0e971
<!-- generated on 2024-12-01 22:22:38 by Eclipse SUMO sumo Version v1_21_0+1093-f807130dc4a
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<input>
Expand Down Expand Up @@ -31,28 +31,28 @@
<railSignal id="A">
<link linkIndex="0" from="a_0" to=":A_2_0">
<driveWay id="A.0">
<exit id="train" time="31.00" reason="9"/>
<exit id="train" time="31.00" reason="arrived"/>
</driveWay>
<subDriveWay id="A.0.0">
<exit id="train" time="25.00" reason="1"/>
<exit id="train" time="25.00" reason="junction"/>
</subDriveWay>
</link>
</railSignal>
<railSignal id="B">
<link linkIndex="0" from="-d2_0" to=":B_0_0">
<driveWay id="B.0">
<entry id="train2" time="26.00" reason="1"/>
<exit id="train2" time="53.00" reason="9"/>
<entry id="train2" time="26.00" reason="junction"/>
<exit id="train2" time="53.00" reason="arrived"/>
</driveWay>
<subDriveWay id="B.0.0">
<entry id="train2" time="26.00" reason="1"/>
<exit id="train2" time="45.00" reason="1"/>
<entry id="train2" time="26.00" reason="junction"/>
<exit id="train2" time="45.00" reason="junction"/>
</subDriveWay>
</link>
</railSignal>
<departJunction id="gneJ7">
<driveWay id="gneJ7.d0">
<exit id="train2" time="30.00" reason="1"/>
<exit id="train2" time="30.00" reason="junction"/>
</driveWay>
</departJunction>
<departJunction id="gneJ0">
Expand Down

0 comments on commit e43546b

Please sign in to comment.