Skip to content

Commit acd8314

Browse files
committed
Add rule to convert base Street short T intersections to SAM long T
1 parent ae1c5c9 commit acd8314

2 files changed

Lines changed: 43 additions & 0 deletions

File tree

Controller/RUL2/09_SAM/Sec9_SAM_MetaGenerated.txt

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1971,6 +1971,8 @@
19711971
0x5E583200,0,0,0x5F500200,0,1=0x5E583200,0,0,0x5E572200,0,1
19721972
0x5E572200,0,0,0x5F502500,3,0=0x5E572200,0,0,0x5E585200,3,0
19731973
0x5E572200,3,0,0x5F502500,1,1=0x5E572200,3,0,0x5E585200,1,1
1974+
0x5E572200,0,0,0x5F502500,0,1=0x5E572200,0,0,0x5E585200,0,1
1975+
0x5E572200,3,0,0x5F502500,2,0=0x5E572200,3,0,0x5E585200,2,0
19741976
0x5E585200,0,0,0x5F500200,0,1=0x5E585200,0,0,0x5E585280,0,0
19751977
0x5E585200,0,0,0x5F500200,1,0=0x5E585200,0,0,0x5E585280,0,0
19761978
0x5E585200,0,0,0x5E572200,0,1=0x5E585200,0,0,0x5E585280,0,0
@@ -2007,6 +2009,8 @@
20072009
0x5E58D200,0,0,0x5F500200,0,1=0x5E58D200,0,0,0x5E572200,0,1
20082010
0x5E572200,0,0,0x5F503800,3,0=0x5E572200,0,0,0x5E58F200,3,0
20092011
0x5E572200,3,0,0x5F503800,1,1=0x5E572200,3,0,0x5E58F200,1,1
2012+
0x5E572200,0,0,0x5F503800,0,1=0x5E572200,0,0,0x5E58F200,0,1
2013+
0x5E572200,3,0,0x5F503800,2,0=0x5E572200,3,0,0x5E58F200,2,0
20102014
0x5E58F200,0,0,0x5F500200,0,1=0x5E58F200,0,0,0x5E58F280,0,0
20112015
0x5E58F200,0,0,0x5F500200,1,0=0x5E58F200,0,0,0x5E58F280,0,0
20122016
0x5E58F200,0,0,0x5E572200,0,1=0x5E58F200,0,0,0x5E58F280,0,0
@@ -3425,6 +3429,8 @@
34253429
0x5E583300,0,0,0x5F500200,0,1=0x5E583300,0,0,0x5E572300,0,1
34263430
0x5E572300,0,0,0x5F502500,3,0=0x5E572300,0,0,0x5E585300,3,0
34273431
0x5E572300,3,0,0x5F502500,1,1=0x5E572300,3,0,0x5E585300,1,1
3432+
0x5E572300,0,0,0x5F502500,0,1=0x5E572300,0,0,0x5E585300,0,1
3433+
0x5E572300,3,0,0x5F502500,2,0=0x5E572300,3,0,0x5E585300,2,0
34283434
0x5E585300,0,0,0x5F500200,0,1=0x5E585300,0,0,0x5E585380,0,0
34293435
0x5E585300,0,0,0x5F500200,1,0=0x5E585300,0,0,0x5E585380,0,0
34303436
0x5E585300,0,0,0x5E572300,0,1=0x5E585300,0,0,0x5E585380,0,0
@@ -3461,6 +3467,8 @@
34613467
0x5E58D300,0,0,0x5F500200,0,1=0x5E58D300,0,0,0x5E572300,0,1
34623468
0x5E572300,0,0,0x5F503800,3,0=0x5E572300,0,0,0x5E58F300,3,0
34633469
0x5E572300,3,0,0x5F503800,1,1=0x5E572300,3,0,0x5E58F300,1,1
3470+
0x5E572300,0,0,0x5F503800,0,1=0x5E572300,0,0,0x5E58F300,0,1
3471+
0x5E572300,3,0,0x5F503800,2,0=0x5E572300,3,0,0x5E58F300,2,0
34643472
0x5E58F300,0,0,0x5F500200,0,1=0x5E58F300,0,0,0x5E58F380,0,0
34653473
0x5E58F300,0,0,0x5F500200,1,0=0x5E58F300,0,0,0x5E58F380,0,0
34663474
0x5E58F300,0,0,0x5E572300,0,1=0x5E58F300,0,0,0x5E58F380,0,0
@@ -4879,6 +4887,8 @@
48794887
0x5E583400,0,0,0x5F500200,0,1=0x5E583400,0,0,0x5E572400,0,1
48804888
0x5E572400,0,0,0x5F502500,3,0=0x5E572400,0,0,0x5E585400,3,0
48814889
0x5E572400,3,0,0x5F502500,1,1=0x5E572400,3,0,0x5E585400,1,1
4890+
0x5E572400,0,0,0x5F502500,0,1=0x5E572400,0,0,0x5E585400,0,1
4891+
0x5E572400,3,0,0x5F502500,2,0=0x5E572400,3,0,0x5E585400,2,0
48824892
0x5E585400,0,0,0x5F500200,0,1=0x5E585400,0,0,0x5E585480,0,0
48834893
0x5E585400,0,0,0x5F500200,1,0=0x5E585400,0,0,0x5E585480,0,0
48844894
0x5E585400,0,0,0x5E572400,0,1=0x5E585400,0,0,0x5E585480,0,0
@@ -4915,6 +4925,8 @@
49154925
0x5E58D400,0,0,0x5F500200,0,1=0x5E58D400,0,0,0x5E572400,0,1
49164926
0x5E572400,0,0,0x5F503800,3,0=0x5E572400,0,0,0x5E58F400,3,0
49174927
0x5E572400,3,0,0x5F503800,1,1=0x5E572400,3,0,0x5E58F400,1,1
4928+
0x5E572400,0,0,0x5F503800,0,1=0x5E572400,0,0,0x5E58F400,0,1
4929+
0x5E572400,3,0,0x5F503800,2,0=0x5E572400,3,0,0x5E58F400,2,0
49184930
0x5E58F400,0,0,0x5F500200,0,1=0x5E58F400,0,0,0x5E58F480,0,0
49194931
0x5E58F400,0,0,0x5F500200,1,0=0x5E58F400,0,0,0x5E58F480,0,0
49204932
0x5E58F400,0,0,0x5E572400,0,1=0x5E58F400,0,0,0x5E58F480,0,0
@@ -6333,6 +6345,8 @@
63336345
0x5E583500,0,0,0x5F500200,0,1=0x5E583500,0,0,0x5E572500,0,1
63346346
0x5E572500,0,0,0x5F502500,3,0=0x5E572500,0,0,0x5E585500,3,0
63356347
0x5E572500,3,0,0x5F502500,1,1=0x5E572500,3,0,0x5E585500,1,1
6348+
0x5E572500,0,0,0x5F502500,0,1=0x5E572500,0,0,0x5E585500,0,1
6349+
0x5E572500,3,0,0x5F502500,2,0=0x5E572500,3,0,0x5E585500,2,0
63366350
0x5E585500,0,0,0x5F500200,0,1=0x5E585500,0,0,0x5E585580,0,0
63376351
0x5E585500,0,0,0x5F500200,1,0=0x5E585500,0,0,0x5E585580,0,0
63386352
0x5E585500,0,0,0x5E572500,0,1=0x5E585500,0,0,0x5E585580,0,0
@@ -6369,6 +6383,8 @@
63696383
0x5E58D500,0,0,0x5F500200,0,1=0x5E58D500,0,0,0x5E572500,0,1
63706384
0x5E572500,0,0,0x5F503800,3,0=0x5E572500,0,0,0x5E58F500,3,0
63716385
0x5E572500,3,0,0x5F503800,1,1=0x5E572500,3,0,0x5E58F500,1,1
6386+
0x5E572500,0,0,0x5F503800,0,1=0x5E572500,0,0,0x5E58F500,0,1
6387+
0x5E572500,3,0,0x5F503800,2,0=0x5E572500,3,0,0x5E58F500,2,0
63726388
0x5E58F500,0,0,0x5F500200,0,1=0x5E58F500,0,0,0x5E58F580,0,0
63736389
0x5E58F500,0,0,0x5F500200,1,0=0x5E58F500,0,0,0x5E58F580,0,0
63746390
0x5E58F500,0,0,0x5E572500,0,1=0x5E58F500,0,0,0x5E58F580,0,0
@@ -7787,6 +7803,8 @@
77877803
0x5E583600,0,0,0x5F500200,0,1=0x5E583600,0,0,0x5E572600,0,1
77887804
0x5E572600,0,0,0x5F502500,3,0=0x5E572600,0,0,0x5E585600,3,0
77897805
0x5E572600,3,0,0x5F502500,1,1=0x5E572600,3,0,0x5E585600,1,1
7806+
0x5E572600,0,0,0x5F502500,0,1=0x5E572600,0,0,0x5E585600,0,1
7807+
0x5E572600,3,0,0x5F502500,2,0=0x5E572600,3,0,0x5E585600,2,0
77907808
0x5E585600,0,0,0x5F500200,0,1=0x5E585600,0,0,0x5E585680,0,0
77917809
0x5E585600,0,0,0x5F500200,1,0=0x5E585600,0,0,0x5E585680,0,0
77927810
0x5E585600,0,0,0x5E572600,0,1=0x5E585600,0,0,0x5E585680,0,0
@@ -7823,6 +7841,8 @@
78237841
0x5E58D600,0,0,0x5F500200,0,1=0x5E58D600,0,0,0x5E572600,0,1
78247842
0x5E572600,0,0,0x5F503800,3,0=0x5E572600,0,0,0x5E58F600,3,0
78257843
0x5E572600,3,0,0x5F503800,1,1=0x5E572600,3,0,0x5E58F600,1,1
7844+
0x5E572600,0,0,0x5F503800,0,1=0x5E572600,0,0,0x5E58F600,0,1
7845+
0x5E572600,3,0,0x5F503800,2,0=0x5E572600,3,0,0x5E58F600,2,0
78267846
0x5E58F600,0,0,0x5F500200,0,1=0x5E58F600,0,0,0x5E58F680,0,0
78277847
0x5E58F600,0,0,0x5F500200,1,0=0x5E58F600,0,0,0x5E58F680,0,0
78287848
0x5E58F600,0,0,0x5E572600,0,1=0x5E58F600,0,0,0x5E58F680,0,0
@@ -9241,6 +9261,8 @@
92419261
0x5E583700,0,0,0x5F500200,0,1=0x5E583700,0,0,0x5E572700,0,1
92429262
0x5E572700,0,0,0x5F502500,3,0=0x5E572700,0,0,0x5E585700,3,0
92439263
0x5E572700,3,0,0x5F502500,1,1=0x5E572700,3,0,0x5E585700,1,1
9264+
0x5E572700,0,0,0x5F502500,0,1=0x5E572700,0,0,0x5E585700,0,1
9265+
0x5E572700,3,0,0x5F502500,2,0=0x5E572700,3,0,0x5E585700,2,0
92449266
0x5E585700,0,0,0x5F500200,0,1=0x5E585700,0,0,0x5E585780,0,0
92459267
0x5E585700,0,0,0x5F500200,1,0=0x5E585700,0,0,0x5E585780,0,0
92469268
0x5E585700,0,0,0x5E572700,0,1=0x5E585700,0,0,0x5E585780,0,0
@@ -9277,6 +9299,8 @@
92779299
0x5E58D700,0,0,0x5F500200,0,1=0x5E58D700,0,0,0x5E572700,0,1
92789300
0x5E572700,0,0,0x5F503800,3,0=0x5E572700,0,0,0x5E58F700,3,0
92799301
0x5E572700,3,0,0x5F503800,1,1=0x5E572700,3,0,0x5E58F700,1,1
9302+
0x5E572700,0,0,0x5F503800,0,1=0x5E572700,0,0,0x5E58F700,0,1
9303+
0x5E572700,3,0,0x5F503800,2,0=0x5E572700,3,0,0x5E58F700,2,0
92809304
0x5E58F700,0,0,0x5F500200,0,1=0x5E58F700,0,0,0x5E58F780,0,0
92819305
0x5E58F700,0,0,0x5F500200,1,0=0x5E58F700,0,0,0x5E58F780,0,0
92829306
0x5E58F700,0,0,0x5E572700,0,1=0x5E58F700,0,0,0x5E58F780,0,0
@@ -10695,6 +10719,8 @@
1069510719
0x5E583800,0,0,0x5F500200,0,1=0x5E583800,0,0,0x5E572800,0,1
1069610720
0x5E572800,0,0,0x5F502500,3,0=0x5E572800,0,0,0x5E585800,3,0
1069710721
0x5E572800,3,0,0x5F502500,1,1=0x5E572800,3,0,0x5E585800,1,1
10722+
0x5E572800,0,0,0x5F502500,0,1=0x5E572800,0,0,0x5E585800,0,1
10723+
0x5E572800,3,0,0x5F502500,2,0=0x5E572800,3,0,0x5E585800,2,0
1069810724
0x5E585800,0,0,0x5F500200,0,1=0x5E585800,0,0,0x5E585880,0,0
1069910725
0x5E585800,0,0,0x5F500200,1,0=0x5E585800,0,0,0x5E585880,0,0
1070010726
0x5E585800,0,0,0x5E572800,0,1=0x5E585800,0,0,0x5E585880,0,0
@@ -10731,6 +10757,8 @@
1073110757
0x5E58D800,0,0,0x5F500200,0,1=0x5E58D800,0,0,0x5E572800,0,1
1073210758
0x5E572800,0,0,0x5F503800,3,0=0x5E572800,0,0,0x5E58F800,3,0
1073310759
0x5E572800,3,0,0x5F503800,1,1=0x5E572800,3,0,0x5E58F800,1,1
10760+
0x5E572800,0,0,0x5F503800,0,1=0x5E572800,0,0,0x5E58F800,0,1
10761+
0x5E572800,3,0,0x5F503800,2,0=0x5E572800,3,0,0x5E58F800,2,0
1073410762
0x5E58F800,0,0,0x5F500200,0,1=0x5E58F800,0,0,0x5E58F880,0,0
1073510763
0x5E58F800,0,0,0x5F500200,1,0=0x5E58F800,0,0,0x5E58F880,0,0
1073610764
0x5E58F800,0,0,0x5E572800,0,1=0x5E58F800,0,0,0x5E58F880,0,0
@@ -12149,6 +12177,8 @@
1214912177
0x5E583900,0,0,0x5F500200,0,1=0x5E583900,0,0,0x5E572900,0,1
1215012178
0x5E572900,0,0,0x5F502500,3,0=0x5E572900,0,0,0x5E585900,3,0
1215112179
0x5E572900,3,0,0x5F502500,1,1=0x5E572900,3,0,0x5E585900,1,1
12180+
0x5E572900,0,0,0x5F502500,0,1=0x5E572900,0,0,0x5E585900,0,1
12181+
0x5E572900,3,0,0x5F502500,2,0=0x5E572900,3,0,0x5E585900,2,0
1215212182
0x5E585900,0,0,0x5F500200,0,1=0x5E585900,0,0,0x5E585980,0,0
1215312183
0x5E585900,0,0,0x5F500200,1,0=0x5E585900,0,0,0x5E585980,0,0
1215412184
0x5E585900,0,0,0x5E572900,0,1=0x5E585900,0,0,0x5E585980,0,0
@@ -12185,6 +12215,8 @@
1218512215
0x5E58D900,0,0,0x5F500200,0,1=0x5E58D900,0,0,0x5E572900,0,1
1218612216
0x5E572900,0,0,0x5F503800,3,0=0x5E572900,0,0,0x5E58F900,3,0
1218712217
0x5E572900,3,0,0x5F503800,1,1=0x5E572900,3,0,0x5E58F900,1,1
12218+
0x5E572900,0,0,0x5F503800,0,1=0x5E572900,0,0,0x5E58F900,0,1
12219+
0x5E572900,3,0,0x5F503800,2,0=0x5E572900,3,0,0x5E58F900,2,0
1218812220
0x5E58F900,0,0,0x5F500200,0,1=0x5E58F900,0,0,0x5E58F980,0,0
1218912221
0x5E58F900,0,0,0x5F500200,1,0=0x5E58F900,0,0,0x5E58F980,0,0
1219012222
0x5E58F900,0,0,0x5E572900,0,1=0x5E58F900,0,0,0x5E58F980,0,0
@@ -13603,6 +13635,8 @@
1360313635
0x5E583A00,0,0,0x5F500200,0,1=0x5E583A00,0,0,0x5E572A00,0,1
1360413636
0x5E572A00,0,0,0x5F502500,3,0=0x5E572A00,0,0,0x5E585A00,3,0
1360513637
0x5E572A00,3,0,0x5F502500,1,1=0x5E572A00,3,0,0x5E585A00,1,1
13638+
0x5E572A00,0,0,0x5F502500,0,1=0x5E572A00,0,0,0x5E585A00,0,1
13639+
0x5E572A00,3,0,0x5F502500,2,0=0x5E572A00,3,0,0x5E585A00,2,0
1360613640
0x5E585A00,0,0,0x5F500200,0,1=0x5E585A00,0,0,0x5E585A80,0,0
1360713641
0x5E585A00,0,0,0x5F500200,1,0=0x5E585A00,0,0,0x5E585A80,0,0
1360813642
0x5E585A00,0,0,0x5E572A00,0,1=0x5E585A00,0,0,0x5E585A80,0,0
@@ -13639,6 +13673,8 @@
1363913673
0x5E58DA00,0,0,0x5F500200,0,1=0x5E58DA00,0,0,0x5E572A00,0,1
1364013674
0x5E572A00,0,0,0x5F503800,3,0=0x5E572A00,0,0,0x5E58FA00,3,0
1364113675
0x5E572A00,3,0,0x5F503800,1,1=0x5E572A00,3,0,0x5E58FA00,1,1
13676+
0x5E572A00,0,0,0x5F503800,0,1=0x5E572A00,0,0,0x5E58FA00,0,1
13677+
0x5E572A00,3,0,0x5F503800,2,0=0x5E572A00,3,0,0x5E58FA00,2,0
1364213678
0x5E58FA00,0,0,0x5F500200,0,1=0x5E58FA00,0,0,0x5E58FA80,0,0
1364313679
0x5E58FA00,0,0,0x5F500200,1,0=0x5E58FA00,0,0,0x5E58FA80,0,0
1364413680
0x5E58FA00,0,0,0x5E572A00,0,1=0x5E58FA00,0,0,0x5E58FA80,0,0
@@ -15057,6 +15093,8 @@
1505715093
0x5E583B00,0,0,0x5F500200,0,1=0x5E583B00,0,0,0x5E572B00,0,1
1505815094
0x5E572B00,0,0,0x5F502500,3,0=0x5E572B00,0,0,0x5E585B00,3,0
1505915095
0x5E572B00,3,0,0x5F502500,1,1=0x5E572B00,3,0,0x5E585B00,1,1
15096+
0x5E572B00,0,0,0x5F502500,0,1=0x5E572B00,0,0,0x5E585B00,0,1
15097+
0x5E572B00,3,0,0x5F502500,2,0=0x5E572B00,3,0,0x5E585B00,2,0
1506015098
0x5E585B00,0,0,0x5F500200,0,1=0x5E585B00,0,0,0x5E585B80,0,0
1506115099
0x5E585B00,0,0,0x5F500200,1,0=0x5E585B00,0,0,0x5E585B80,0,0
1506215100
0x5E585B00,0,0,0x5E572B00,0,1=0x5E585B00,0,0,0x5E585B80,0,0
@@ -15093,6 +15131,8 @@
1509315131
0x5E58DB00,0,0,0x5F500200,0,1=0x5E58DB00,0,0,0x5E572B00,0,1
1509415132
0x5E572B00,0,0,0x5F503800,3,0=0x5E572B00,0,0,0x5E58FB00,3,0
1509515133
0x5E572B00,3,0,0x5F503800,1,1=0x5E572B00,3,0,0x5E58FB00,1,1
15134+
0x5E572B00,0,0,0x5F503800,0,1=0x5E572B00,0,0,0x5E58FB00,0,1
15135+
0x5E572B00,3,0,0x5F503800,2,0=0x5E572B00,3,0,0x5E58FB00,2,0
1509615136
0x5E58FB00,0,0,0x5F500200,0,1=0x5E58FB00,0,0,0x5E58FB80,0,0
1509715137
0x5E58FB00,0,0,0x5F500200,1,0=0x5E58FB00,0,0,0x5E58FB80,0,0
1509815138
0x5E58FB00,0,0,0x5E572B00,0,1=0x5E58FB00,0,0,0x5E58FB80,0,0

src/main/scala/module/SamRuleGenerator.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -804,6 +804,9 @@ class SamRuleGenerator(var context: RuleTransducer.Context) extends RuleGenerato
804804
// DxD T (sam thru)
805805
Rules += sam~ES | (Street ~> sam)~NW & minor~CNE // DxD Thru T 1
806806
// Rules += sam~ES | (Street ~> sam)~NW & minor~CEN // Eventual DxD Thru T 2 (pending base T-thru tile)
807+
Rules += sam~ES | (Street ~> sam)~NW & minor~CWS // Temp DxD Thru T 2 (works with DxD Thru T 1-2 Alt)
808+
809+
// Rules += sam~ES & minor~CEN | (Street ~> sam)~NW & minor~CSW // Eventual DxD Thru T 1-2 (pending base T-thru tile)
807810
Rules += sam~ES & minor~CEN | Street~NW | % | sam~NW & minor~CSW // DxD Thru T 1-2 Alt
808811
Rules += sam~ES & minor~CEN | sam~NW | % | sam~NW & minor~CSW // DxD Thru T 1-2 Alt
809812
Rules += sam~NE & minor~CSE | (Street ~> sam)~WS & minor~CWN // DxD Thru T 2-1

0 commit comments

Comments
 (0)