Skip to content

fix driveside detection of files in conflicting overrides check #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jflann merged 7 commits into from
Jan 14, 2025
Merged

fix driveside detection of files in conflicting overrides check #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8e7a78d
fix driveside detection of files for conflicting overrides check
memo33 Jan 8, 2025
9c3ec47
rerun conflicting-overrides checker (after RHD/LHD fix)
memo33 Jan 8, 2025
d341e15
update conflict checker to keep track of driveside-dependent conflicts
memo33 Jan 9, 2025
b30ede1
fix incorrect RHW-3 T intersections (direction of RHW-3)
memo33 Jan 9, 2025
eeb7822
rerun conflicting overrides checker (resolves driveside-dependent con…
memo33 Jan 9, 2025
52337f2
further RHW-3 T fixes
memo33 Jan 9, 2025
f149b81
make loading of RHD/LHD rules more robust against duplicates or confl…
memo33 Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_A1_Branch_RHD.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,10 +858,10 @@
;Long
;----Other Base Crossings----
;MIS Y-Split (D0)
0x57860380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override
0x57860380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override
0x57860300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override
0x57860300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override
0x57860380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1
0x57860380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0
0x57860300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1
0x57860300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0
;Stability
;REVERSE
0x57860380,1,1,0x57602400,3,0=0x57860380,1,1,0x5702D000,1,1
Expand Down Expand Up @@ -1789,10 +1789,10 @@
;Long
;----Other Base Crossings----
;MIS Y-Split (D0)
0x57860399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override
0x57860399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override
0x57860319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override
0x57860319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override
0x57860399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1
0x57860399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0
0x57860319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1
0x57860319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0
;Stability
;REVERSE
0x57860399,1,1,0x57602400,3,0=0x57860399,1,1,0x5712D000,1,1
Expand Down Expand Up @@ -2753,10 +2753,10 @@
;Long
;----Other Base Crossings----
;MIS Y-Split (D0)
0x578603A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override
0x578603A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override
0x57860329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override
0x57860329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override
0x578603A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1
0x578603A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0
0x57860329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1
0x57860329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0
;Stability
;REVERSE
0x578603A9,1,1,0x57602400,3,0=0x578603A9,1,1,0x5722D000,1,1
Expand Down Expand Up @@ -3748,10 +3748,10 @@
;Long
;----Other Base Crossings----
;MIS Y-Split (D0)
0x578603B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override
0x578603B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override
0x57860339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override
0x57860339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override
0x578603B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1
0x578603B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0
0x57860339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1
0x57860339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0
;Stability
;REVERSE
0x578603B9,1,1,0x57602400,3,0=0x578603B9,1,1,0x5732D000,1,1
Expand Down Expand Up @@ -4747,10 +4747,10 @@
;Long
;----Other Base Crossings----
;MIS Y-Split (D0)
0x578603C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override
0x578603C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override
0x57860349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override
0x57860349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override
0x578603C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1
0x578603C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0
0x57860349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1
0x57860349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0
;Stability
;REVERSE
0x578603C9,1,1,0x57602400,3,0=0x578603C9,1,1,0x5742D000,1,1
Expand Down
48 changes: 24 additions & 24 deletions Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_A3_Branch_RHD.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
;RHW-8S Type A3 Branch Continuation Adjacency Code
;RHD Version
0x57460880,1,1,0x57000000,1,0=0x57460880,1,1,0x57040000,1,0; conflicting-override
0x57460880,1,1,0x57000000,3,0=0x57460880,1,1,0x57040000,1,0; conflicting-override
0x57460800,3,0,0x57000000,1,0=0x57460800,3,0,0x57040000,3,0; conflicting-override
0x57460800,3,0,0x57000000,3,0=0x57460800,3,0,0x57040000,3,0; conflicting-override
0x57460880,1,1,0x57000000,1,1=0x57460880,1,1,0x57040000,1,0; conflicting-override
0x57460880,1,1,0x57000000,3,1=0x57460880,1,1,0x57040000,1,0; conflicting-override
0x57460800,3,0,0x57000000,1,1=0x57460800,3,0,0x57040000,3,0; conflicting-override
0x57460800,3,0,0x57000000,3,1=0x57460800,3,0,0x57040000,3,0; conflicting-override
0x57460880,1,1,0x57000000,1,0=0x57460880,1,1,0x57040000,1,0
0x57460880,1,1,0x57000000,3,0=0x57460880,1,1,0x57040000,1,0
0x57460800,3,0,0x57000000,1,0=0x57460800,3,0,0x57040000,3,0
0x57460800,3,0,0x57000000,3,0=0x57460800,3,0,0x57040000,3,0
0x57460880,1,1,0x57000000,1,1=0x57460880,1,1,0x57040000,1,0
0x57460880,1,1,0x57000000,3,1=0x57460880,1,1,0x57040000,1,0
0x57460800,3,0,0x57000000,1,1=0x57460800,3,0,0x57040000,3,0
0x57460800,3,0,0x57000000,3,1=0x57460800,3,0,0x57040000,3,0
0x57460880,1,1,0x57000100,1,0=0x57460880,1,1,0x57040100,1,0
0x57460800,3,0,0x57000100,1,0=0x57460800,3,0,0x57040100,3,1
0x57460880,1,1,0x57000400,3,0=0x57460880,1,1,0x57040B00,3,0
Expand Down Expand Up @@ -348,14 +348,14 @@
0x57460880,1,1,0x5700FA00,3,0=0x57460880,1,1,0x5704FA00,1,0
0x57460800,3,0,0x5700FA00,1,0=0x57460800,3,0,0x5704FA00,3,0
0x57460800,3,0,0x5700FA00,3,0=0x57460800,3,0,0x5704FA00,3,0
0x57460899,1,1,0x57000000,1,0=0x57460899,1,1,0x57140000,1,0; conflicting-override
0x57460899,1,1,0x57000000,3,0=0x57460899,1,1,0x57140000,1,0; conflicting-override
0x57460819,3,0,0x57000000,1,0=0x57460819,3,0,0x57140000,3,0; conflicting-override
0x57460819,3,0,0x57000000,3,0=0x57460819,3,0,0x57140000,3,0; conflicting-override
0x57460899,1,1,0x57000000,1,1=0x57460899,1,1,0x57140000,1,0; conflicting-override
0x57460899,1,1,0x57000000,3,1=0x57460899,1,1,0x57140000,1,0; conflicting-override
0x57460819,3,0,0x57000000,1,1=0x57460819,3,0,0x57140000,3,0; conflicting-override
0x57460819,3,0,0x57000000,3,1=0x57460819,3,0,0x57140000,3,0; conflicting-override
0x57460899,1,1,0x57000000,1,0=0x57460899,1,1,0x57140000,1,0
0x57460899,1,1,0x57000000,3,0=0x57460899,1,1,0x57140000,1,0
0x57460819,3,0,0x57000000,1,0=0x57460819,3,0,0x57140000,3,0
0x57460819,3,0,0x57000000,3,0=0x57460819,3,0,0x57140000,3,0
0x57460899,1,1,0x57000000,1,1=0x57460899,1,1,0x57140000,1,0
0x57460899,1,1,0x57000000,3,1=0x57460899,1,1,0x57140000,1,0
0x57460819,3,0,0x57000000,1,1=0x57460819,3,0,0x57140000,3,0
0x57460819,3,0,0x57000000,3,1=0x57460819,3,0,0x57140000,3,0
0x57460899,1,1,0x57000100,1,0=0x57460899,1,1,0x57140100,1,0
0x57460819,3,0,0x57000100,1,0=0x57460819,3,0,0x57140100,3,1
0x57460899,1,1,0x57000400,3,0=0x57460899,1,1,0x57140B00,3,0
Expand Down Expand Up @@ -914,14 +914,14 @@
0x574608A9,1,1,0x5E600B00,3,0=0x574608A9,1,1,0x5E600B29,3,0
0x57460829,3,0,0x5E600B00,1,0=0x57460829,3,0,0x5E600B29,1,0
0x57460829,3,0,0x5E600B00,3,0=0x57460829,3,0,0x5E600B29,3,0
0x574608A9,1,1,0x57000000,1,0=0x574608A9,1,1,0x57240000,1,0; conflicting-override
0x574608A9,1,1,0x57000000,3,0=0x574608A9,1,1,0x57240000,1,0; conflicting-override
0x57460829,3,0,0x57000000,1,0=0x57460829,3,0,0x57240000,3,0; conflicting-override
0x57460829,3,0,0x57000000,3,0=0x57460829,3,0,0x57240000,3,0; conflicting-override
0x574608A9,1,1,0x57000000,1,1=0x574608A9,1,1,0x57240000,1,0; conflicting-override
0x574608A9,1,1,0x57000000,3,1=0x574608A9,1,1,0x57240000,1,0; conflicting-override
0x57460829,3,0,0x57000000,1,1=0x57460829,3,0,0x57240000,3,0; conflicting-override
0x57460829,3,0,0x57000000,3,1=0x57460829,3,0,0x57240000,3,0; conflicting-override
0x574608A9,1,1,0x57000000,1,0=0x574608A9,1,1,0x57240000,1,0
0x574608A9,1,1,0x57000000,3,0=0x574608A9,1,1,0x57240000,1,0
0x57460829,3,0,0x57000000,1,0=0x57460829,3,0,0x57240000,3,0
0x57460829,3,0,0x57000000,3,0=0x57460829,3,0,0x57240000,3,0
0x574608A9,1,1,0x57000000,1,1=0x574608A9,1,1,0x57240000,1,0
0x574608A9,1,1,0x57000000,3,1=0x574608A9,1,1,0x57240000,1,0
0x57460829,3,0,0x57000000,1,1=0x57460829,3,0,0x57240000,3,0
0x57460829,3,0,0x57000000,3,1=0x57460829,3,0,0x57240000,3,0
0x574608A9,1,1,0x57000100,1,0=0x574608A9,1,1,0x57240100,1,0
0x57460829,3,0,0x57000100,1,0=0x57460829,3,0,0x57240100,3,1
0x574608A9,1,1,0x57000400,3,0=0x574608A9,1,1,0x57240B00,3,0
Expand Down
40 changes: 20 additions & 20 deletions Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_D1_Branch_RHD.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,10 +858,10 @@
;Long
;----Other Base Crossings----
;MIS Y-Split (D0)
0x57863380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override
0x57863380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override
0x57863300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override
0x57863300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override
0x57863380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1
0x57863380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0
0x57863300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1
0x57863300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0
;Stability
;REVERSE
0x57863380,1,1,0x57602400,3,0=0x57863380,1,1,0x5702D000,1,1
Expand Down Expand Up @@ -1789,10 +1789,10 @@
;Long
;----Other Base Crossings----
;MIS Y-Split (D0)
0x57863399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override
0x57863399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override
0x57863319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override
0x57863319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override
0x57863399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1
0x57863399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0
0x57863319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1
0x57863319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0
;Stability
;REVERSE
0x57863399,1,1,0x57602400,3,0=0x57863399,1,1,0x5712D000,1,1
Expand Down Expand Up @@ -2753,10 +2753,10 @@
;Long
;----Other Base Crossings----
;MIS Y-Split (D0)
0x578633A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override
0x578633A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override
0x57863329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override
0x57863329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override
0x578633A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1
0x578633A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0
0x57863329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1
0x57863329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0
;Stability
;REVERSE
0x578633A9,1,1,0x57602400,3,0=0x578633A9,1,1,0x5722D000,1,1
Expand Down Expand Up @@ -3748,10 +3748,10 @@
;Long
;----Other Base Crossings----
;MIS Y-Split (D0)
0x578633B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override
0x578633B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override
0x57863339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override
0x57863339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override
0x578633B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1
0x578633B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0
0x57863339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1
0x57863339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0
;Stability
;REVERSE
0x578633B9,1,1,0x57602400,3,0=0x578633B9,1,1,0x5732D000,1,1
Expand Down Expand Up @@ -4747,10 +4747,10 @@
;Long
;----Other Base Crossings----
;MIS Y-Split (D0)
0x578633C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override
0x578633C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override
0x57863349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override
0x57863349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override
0x578633C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1
0x578633C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0
0x57863349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1
0x57863349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0
;Stability
;REVERSE
0x578633C9,1,1,0x57602400,3,0=0x578633C9,1,1,0x5742D000,1,1
Expand Down
48 changes: 24 additions & 24 deletions Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_D3_Branch_RHD.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
;RHW-8S Type D3 Branch Continuation Adjacency Code
;RHD Version
0x57463880,1,1,0x57000000,1,0=0x57463880,1,1,0x57040000,1,0; conflicting-override
0x57463880,1,1,0x57000000,3,0=0x57463880,1,1,0x57040000,1,0; conflicting-override
0x57463800,3,0,0x57000000,1,0=0x57463800,3,0,0x57040000,3,0; conflicting-override
0x57463800,3,0,0x57000000,3,0=0x57463800,3,0,0x57040000,3,0; conflicting-override
0x57463880,1,1,0x57000000,1,1=0x57463880,1,1,0x57040000,1,0; conflicting-override
0x57463880,1,1,0x57000000,3,1=0x57463880,1,1,0x57040000,1,0; conflicting-override
0x57463800,3,0,0x57000000,1,1=0x57463800,3,0,0x57040000,3,0; conflicting-override
0x57463800,3,0,0x57000000,3,1=0x57463800,3,0,0x57040000,3,0; conflicting-override
0x57463880,1,1,0x57000000,1,0=0x57463880,1,1,0x57040000,1,0
0x57463880,1,1,0x57000000,3,0=0x57463880,1,1,0x57040000,1,0
0x57463800,3,0,0x57000000,1,0=0x57463800,3,0,0x57040000,3,0
0x57463800,3,0,0x57000000,3,0=0x57463800,3,0,0x57040000,3,0
0x57463880,1,1,0x57000000,1,1=0x57463880,1,1,0x57040000,1,0
0x57463880,1,1,0x57000000,3,1=0x57463880,1,1,0x57040000,1,0
0x57463800,3,0,0x57000000,1,1=0x57463800,3,0,0x57040000,3,0
0x57463800,3,0,0x57000000,3,1=0x57463800,3,0,0x57040000,3,0
0x57463880,1,1,0x57000100,1,0=0x57463880,1,1,0x57040100,1,0
0x57463800,3,0,0x57000100,1,0=0x57463800,3,0,0x57040100,3,1
0x57463880,1,1,0x57000400,3,0=0x57463880,1,1,0x57040B00,3,0
Expand Down Expand Up @@ -348,14 +348,14 @@
0x57463880,1,1,0x5700FA00,3,0=0x57463880,1,1,0x5704FA00,1,0
0x57463800,3,0,0x5700FA00,1,0=0x57463800,3,0,0x5704FA00,3,0
0x57463800,3,0,0x5700FA00,3,0=0x57463800,3,0,0x5704FA00,3,0
0x57463899,1,1,0x57000000,1,0=0x57463899,1,1,0x57140000,1,0; conflicting-override
0x57463899,1,1,0x57000000,3,0=0x57463899,1,1,0x57140000,1,0; conflicting-override
0x57463819,3,0,0x57000000,1,0=0x57463819,3,0,0x57140000,3,0; conflicting-override
0x57463819,3,0,0x57000000,3,0=0x57463819,3,0,0x57140000,3,0; conflicting-override
0x57463899,1,1,0x57000000,1,1=0x57463899,1,1,0x57140000,1,0; conflicting-override
0x57463899,1,1,0x57000000,3,1=0x57463899,1,1,0x57140000,1,0; conflicting-override
0x57463819,3,0,0x57000000,1,1=0x57463819,3,0,0x57140000,3,0; conflicting-override
0x57463819,3,0,0x57000000,3,1=0x57463819,3,0,0x57140000,3,0; conflicting-override
0x57463899,1,1,0x57000000,1,0=0x57463899,1,1,0x57140000,1,0
0x57463899,1,1,0x57000000,3,0=0x57463899,1,1,0x57140000,1,0
0x57463819,3,0,0x57000000,1,0=0x57463819,3,0,0x57140000,3,0
0x57463819,3,0,0x57000000,3,0=0x57463819,3,0,0x57140000,3,0
0x57463899,1,1,0x57000000,1,1=0x57463899,1,1,0x57140000,1,0
0x57463899,1,1,0x57000000,3,1=0x57463899,1,1,0x57140000,1,0
0x57463819,3,0,0x57000000,1,1=0x57463819,3,0,0x57140000,3,0
0x57463819,3,0,0x57000000,3,1=0x57463819,3,0,0x57140000,3,0
0x57463899,1,1,0x57000100,1,0=0x57463899,1,1,0x57140100,1,0
0x57463819,3,0,0x57000100,1,0=0x57463819,3,0,0x57140100,3,1
0x57463899,1,1,0x57000400,3,0=0x57463899,1,1,0x57140B00,3,0
Expand Down Expand Up @@ -914,14 +914,14 @@
0x574638A9,1,1,0x5E600B00,3,0=0x574638A9,1,1,0x5E600B29,3,0
0x57463829,3,0,0x5E600B00,1,0=0x57463829,3,0,0x5E600B29,1,0
0x57463829,3,0,0x5E600B00,3,0=0x57463829,3,0,0x5E600B29,3,0
0x574638A9,1,1,0x57000000,1,0=0x574638A9,1,1,0x57240000,1,0; conflicting-override
0x574638A9,1,1,0x57000000,3,0=0x574638A9,1,1,0x57240000,1,0; conflicting-override
0x57463829,3,0,0x57000000,1,0=0x57463829,3,0,0x57240000,3,0; conflicting-override
0x57463829,3,0,0x57000000,3,0=0x57463829,3,0,0x57240000,3,0; conflicting-override
0x574638A9,1,1,0x57000000,1,1=0x574638A9,1,1,0x57240000,1,0; conflicting-override
0x574638A9,1,1,0x57000000,3,1=0x574638A9,1,1,0x57240000,1,0; conflicting-override
0x57463829,3,0,0x57000000,1,1=0x57463829,3,0,0x57240000,3,0; conflicting-override
0x57463829,3,0,0x57000000,3,1=0x57463829,3,0,0x57240000,3,0; conflicting-override
0x574638A9,1,1,0x57000000,1,0=0x574638A9,1,1,0x57240000,1,0
0x574638A9,1,1,0x57000000,3,0=0x574638A9,1,1,0x57240000,1,0
0x57463829,3,0,0x57000000,1,0=0x57463829,3,0,0x57240000,3,0
0x57463829,3,0,0x57000000,3,0=0x57463829,3,0,0x57240000,3,0
0x574638A9,1,1,0x57000000,1,1=0x574638A9,1,1,0x57240000,1,0
0x574638A9,1,1,0x57000000,3,1=0x574638A9,1,1,0x57240000,1,0
0x57463829,3,0,0x57000000,1,1=0x57463829,3,0,0x57240000,3,0
0x57463829,3,0,0x57000000,3,1=0x57463829,3,0,0x57240000,3,0
0x574638A9,1,1,0x57000100,1,0=0x574638A9,1,1,0x57240100,1,0
0x57463829,3,0,0x57000100,1,0=0x57463829,3,0,0x57240100,3,1
0x574638A9,1,1,0x57000400,3,0=0x574638A9,1,1,0x57240B00,3,0
Expand Down
20 changes: 10 additions & 10 deletions Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_E1_Branch_RHD.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,8 +836,8 @@
;02 to R3
0x57864500,2,0,0x57906800,1,0=0x57864500,2,0,0x57926800,1,0
0x57864580,0,1,0x57906800,3,1=0x57864580,0,1,0x57926800,3,1
0x57864E00,2,0,0x57906800,1,0=0x57864500,2,0,0x57926880,1,0; conflicting-override
0x57864E80,0,1,0x57906800,3,1=0x57864580,0,1,0x57926880,3,1; conflicting-override
0x57864E00,2,0,0x57906800,1,0=0x57864500,2,0,0x57926880,1,0
0x57864E80,0,1,0x57906800,3,1=0x57864580,0,1,0x57926880,3,1
;02 to R4
0x57864E80,0,1,0x57907b00,2,0=0x57864E80,0,1,0x57927b00,2,0
0x57864E00,2,0,0x57907b00,0,1=0x57864E00,2,0,0x57927b00,0,1
Expand Down Expand Up @@ -1723,8 +1723,8 @@
;02 to R3
0x57864519,2,0,0x57906800,1,0=0x57864519,2,0,0x57926815,1,0
0x57864599,0,1,0x57906800,3,1=0x57864599,0,1,0x57926815,3,1
0x57864E19,2,0,0x57906800,1,0=0x57864519,2,0,0x57926895,1,0; conflicting-override
0x57864E99,0,1,0x57906800,3,1=0x57864599,0,1,0x57926895,3,1; conflicting-override
0x57864E19,2,0,0x57906800,1,0=0x57864519,2,0,0x57926895,1,0
0x57864E99,0,1,0x57906800,3,1=0x57864599,0,1,0x57926895,3,1
;02 to R4
0x57864E99,0,1,0x57907b00,2,0=0x57864E99,0,1,0x57927b15,2,0
0x57864E19,2,0,0x57907b00,0,1=0x57864E19,2,0,0x57927b15,0,1
Expand Down Expand Up @@ -2590,8 +2590,8 @@
;02 to R3
0x57864529,2,0,0x57906800,1,0=0x57864529,2,0,0x57926825,1,0
0x578645A9,0,1,0x57906800,3,1=0x578645A9,0,1,0x57926825,3,1
0x57864E29,2,0,0x57906800,1,0=0x57864529,2,0,0x579268A5,1,0; conflicting-override
0x57864EA9,0,1,0x57906800,3,1=0x578645A9,0,1,0x579268A5,3,1; conflicting-override
0x57864E29,2,0,0x57906800,1,0=0x57864529,2,0,0x579268A5,1,0
0x57864EA9,0,1,0x57906800,3,1=0x578645A9,0,1,0x579268A5,3,1
;02 to R4
0x57864EA9,0,1,0x57907b00,2,0=0x57864EA9,0,1,0x57927b25,2,0
0x57864E29,2,0,0x57907b00,0,1=0x57864E29,2,0,0x57927b25,0,1
Expand Down Expand Up @@ -3488,8 +3488,8 @@
;02 to R3
0x57864539,2,0,0x57906800,1,0=0x57864539,2,0,0x57926835,1,0
0x578645B9,0,1,0x57906800,3,1=0x578645B9,0,1,0x57926835,3,1
0x57864E39,2,0,0x57906800,1,0=0x57864539,2,0,0x579268B5,1,0; conflicting-override
0x57864EB9,0,1,0x57906800,3,1=0x578645B9,0,1,0x579268B5,3,1; conflicting-override
0x57864E39,2,0,0x57906800,1,0=0x57864539,2,0,0x579268B5,1,0
0x57864EB9,0,1,0x57906800,3,1=0x578645B9,0,1,0x579268B5,3,1
;02 to R4
0x57864EB9,0,1,0x57907b00,2,0=0x57864EB9,0,1,0x57927b35,2,0
0x57864E39,2,0,0x57907b00,0,1=0x57864E39,2,0,0x57927b35,0,1
Expand Down Expand Up @@ -4386,8 +4386,8 @@
;02 to R3
0x57864549,2,0,0x57906800,1,0=0x57864549,2,0,0x57926845,1,0
0x578645C9,0,1,0x57906800,3,1=0x578645C9,0,1,0x57926845,3,1
0x57864E49,2,0,0x57906800,1,0=0x57864549,2,0,0x579268C5,1,0; conflicting-override
0x57864EC9,0,1,0x57906800,3,1=0x578645C9,0,1,0x579268C5,3,1; conflicting-override
0x57864E49,2,0,0x57906800,1,0=0x57864549,2,0,0x579268C5,1,0
0x57864EC9,0,1,0x57906800,3,1=0x578645C9,0,1,0x579268C5,3,1
;02 to R4
0x57864EC9,0,1,0x57907b00,2,0=0x57864EC9,0,1,0x57927b45,2,0
0x57864E49,2,0,0x57907b00,0,1=0x57864E49,2,0,0x57927b45,0,1
Expand Down
Loading