Skip to content

Commit c2164b1

Browse files
memo33memo33
committed
disable orthogonal/diagonal GLR metarules
The handwritten GLR code frequently switches between 1,0 and 3,0 orientations for orthogonal GLR, so this change may aid compatibility with metarules.
1 parent f237dca commit c2164b1

6 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎Controller/RUL2/10_GLR/Sec10a_GLR1.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55
;;
66
;;
77
;straight GLR - 0x08031500 > 0x5f880000
8+
0x5f880000,1,0,0x08031500,1,0=0x5f880000,1,0,0x5f880000,1,0
89
0x5f880000,1,0,0x08031500,3,0=0x5f880000,1,0,0x5f880000,1,0
910
0x5f880000,3,0,0x08031500,1,0=0x5f880000,3,0,0x5f880000,1,0
11+
0x5f880000,3,0,0x08031500,3,0=0x5f880000,3,0,0x5f880000,1,0
1012
;
1113
;
1214
;diagonal GLR - 0x08001A00 > 0x5f880600
15+
0x5f880600,2,0,0x08001A00,2,0=0x5f880600,2,0,0x5f880600,0,0
16+
0x5f880600,1,0,0x08001A00,1,0=0x5f880600,1,0,0x5f880600,3,0
1317
;
1418
;
1519
;end caps

‎Controller/RUL2/10_GLR/Sec10b_GLR2.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
;;
66
;;
77
;straight GLR - 0x08031500 > 0x5f884000
8+
0x5f884000,1,0,0x08031500,1,0=0x5f884000,1,0,0x5f884000,1,0
89
0x5f884000,1,0,0x08031500,3,0=0x5f884000,1,0,0x5f884000,1,0
910
0x5f884000,3,0,0x08031500,1,0=0x5f884000,3,0,0x5f884000,1,0
11+
0x5f884000,3,0,0x08031500,3,0=0x5f884000,3,0,0x5f884000,1,0
1012
;
1113
0x5f884000,1,0,0x5f880000,1,0=0x5f884000,1,0,0x5f884000,1,0
1214
0x5f884000,1,0,0x5f880000,3,0=0x5f884000,1,0,0x5f884000,1,0
@@ -15,6 +17,8 @@
1517
;
1618
;
1719
;diagonal GLR - 0x08001A00 > 0x5f884600
20+
0x5f884600,2,0,0x08001A00,2,0=0x5f884600,2,0,0x5f884600,0,0
21+
0x5f884600,1,0,0x08001A00,1,0=0x5f884600,1,0,0x5f884600,3,0
1822
;
1923
0x5f884600,2,0,0x5f880600,0,0=0x5f884600,2,0,0x5f884600,0,0
2024
0x5f884600,1,0,0x5f880600,3,0=0x5f884600,1,0,0x5f884600,3,0

‎Controller/RUL2/10_GLR/Sec10c_GLR3.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
;;
66
;;
77
;straight GLR - 0x08031500 > 0x5f888000
8+
0x5f888000,1,0,0x08031500,1,0=0x5f888000,1,0,0x5f888000,1,0
89
0x5f888000,1,0,0x08031500,3,0=0x5f888000,1,0,0x5f888000,1,0
910
0x5f888000,3,0,0x08031500,1,0=0x5f888000,3,0,0x5f888000,1,0
11+
0x5f888000,3,0,0x08031500,3,0=0x5f888000,3,0,0x5f888000,1,0
1012
;
1113
0x5f888000,1,0,0x5f880000,1,0=0x5f888000,1,0,0x5f888000,1,0
1214
0x5f888000,1,0,0x5f880000,3,0=0x5f888000,1,0,0x5f888000,1,0
@@ -15,6 +17,8 @@
1517
;
1618
;
1719
;diagonal GLR - 0x08001A00 > 0x5f888600
20+
0x5f888600,2,0,0x08001A00,2,0=0x5f888600,2,0,0x5f888600,0,0
21+
0x5f888600,1,0,0x08001A00,1,0=0x5f888600,1,0,0x5f888600,3,0
1822
;
1923
0x5f888600,2,0,0x5f880600,0,0=0x5f888600,2,0,0x5f888600,0,0
2024
0x5f888600,1,0,0x5f880600,3,0=0x5f888600,1,0,0x5f888600,3,0

‎Controller/RUL2/10_GLR/Sec10d_GLR4.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
;;
66
;;
77
;straight GLR - 0x08031500 > 0x5f88c000
8+
0x5f88c000,1,0,0x08031500,1,0=0x5f88c000,1,0,0x5f88c000,1,0
89
0x5f88c000,1,0,0x08031500,3,0=0x5f88c000,1,0,0x5f88c000,1,0
910
0x5f88c000,3,0,0x08031500,1,0=0x5f88c000,3,0,0x5f88c000,1,0
11+
0x5f88c000,3,0,0x08031500,3,0=0x5f88c000,3,0,0x5f88c000,1,0
1012
;
1113
0x5f88c000,1,0,0x5f880000,1,0=0x5f88c000,1,0,0x5f88c000,1,0
1214
0x5f88c000,1,0,0x5f880000,3,0=0x5f88c000,1,0,0x5f88c000,1,0
@@ -15,6 +17,8 @@
1517
;
1618
;
1719
;diagonal GLR - 0x08001A00 > 0x5f88c600
20+
0x5f88c600,2,0,0x08001A00,2,0=0x5f88c600,2,0,0x5f88c600,0,0
21+
0x5f88c600,1,0,0x08001A00,1,0=0x5f88c600,1,0,0x5f88c600,3,0
1822
;
1923
0x5f88c600,2,0,0x5f880600,0,0=0x5f88c600,2,0,0x5f88c600,0,0
2024
0x5f88c600,1,0,0x5f880600,3,0=0x5f88c600,1,0,0x5f88c600,3,0

‎Controller/RUL2/10_GLR/Sec10e_GlrMetaGenerated_MANAGED.txt‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
;This file was generated automatically. DO NOT EDIT!
2-
0x5F880000,1,0,0x08031500,1,0=0x5F880000,1,0,0x5F880000,1,0
3-
0x5F880000,3,0,0x08031500,3,0=0x5F880000,3,0,0x5F880000,3,0
4-
0x5F880600,2,0,0x08001A00,2,0=0x5F880600,2,0,0x5F880600,0,0
5-
0x5F880600,1,0,0x08001A00,1,0=0x5F880600,1,0,0x5F880600,3,0
62
0x5F880000,1,0,0x57001720,0,0=0x5F880000,1,0,0x57001700,0,0
73
0x5F880000,1,0,0x57001720,2,0=0x5F880000,1,0,0x57001700,2,0
84
0x5F880000,3,0,0x57001720,0,0=0x5F880000,3,0,0x57001700,0,0
@@ -1930,10 +1926,6 @@
19301926
0x51225880,2,0,0x51215680,0,0=0x51225880,2,0,0x51215880,0,0
19311927
0x51227880,2,0,0x51217680,0,0=0x51227880,2,0,0x51217880,0,0
19321928
0x51228880,2,0,0x51218680,0,0=0x51228880,2,0,0x51218880,0,0
1933-
0x5F884000,1,0,0x08031500,1,0=0x5F884000,1,0,0x5F884000,1,0
1934-
0x5F884000,3,0,0x08031500,3,0=0x5F884000,3,0,0x5F884000,3,0
1935-
0x5F884600,2,0,0x08001A00,2,0=0x5F884600,2,0,0x5F884600,0,0
1936-
0x5F884600,1,0,0x08001A00,1,0=0x5F884600,1,0,0x5F884600,3,0
19371929
0x5F884000,1,0,0x57001720,0,0=0x5F884000,1,0,0x57001800,0,0
19381930
0x5F884000,1,0,0x57001720,2,0=0x5F884000,1,0,0x57001800,2,0
19391931
0x5F884000,3,0,0x57001720,0,0=0x5F884000,3,0,0x57001800,0,0
@@ -3861,10 +3853,6 @@
38613853
0x51225980,2,0,0x51215680,0,0=0x51225980,2,0,0x51215980,0,0
38623854
0x51227980,2,0,0x51217680,0,0=0x51227980,2,0,0x51217980,0,0
38633855
0x51228980,2,0,0x51218680,0,0=0x51228980,2,0,0x51218980,0,0
3864-
0x5F888000,1,0,0x08031500,1,0=0x5F888000,1,0,0x5F888000,1,0
3865-
0x5F888000,3,0,0x08031500,3,0=0x5F888000,3,0,0x5F888000,3,0
3866-
0x5F888600,2,0,0x08001A00,2,0=0x5F888600,2,0,0x5F888600,0,0
3867-
0x5F888600,1,0,0x08001A00,1,0=0x5F888600,1,0,0x5F888600,3,0
38683856
0x5F888000,1,0,0x57001720,0,0=0x5F888000,1,0,0x57001705,0,0
38693857
0x5F888000,1,0,0x57001720,2,0=0x5F888000,1,0,0x57001705,2,0
38703858
0x5F888000,3,0,0x57001720,0,0=0x5F888000,3,0,0x57001705,0,0
@@ -5792,10 +5780,6 @@
57925780
0x51225889,2,0,0x51215680,0,0=0x51225889,2,0,0x51215889,0,0
57935781
0x51227889,2,0,0x51217680,0,0=0x51227889,2,0,0x51217889,0,0
57945782
0x51228889,2,0,0x51218680,0,0=0x51228889,2,0,0x51218889,0,0
5795-
0x5F88C000,1,0,0x08031500,1,0=0x5F88C000,1,0,0x5F88C000,1,0
5796-
0x5F88C000,3,0,0x08031500,3,0=0x5F88C000,3,0,0x5F88C000,3,0
5797-
0x5F88C600,2,0,0x08001A00,2,0=0x5F88C600,2,0,0x5F88C600,0,0
5798-
0x5F88C600,1,0,0x08001A00,1,0=0x5F88C600,1,0,0x5F88C600,3,0
57995783
0x5F88C000,1,0,0x57001720,0,0=0x5F88C000,1,0,0x57001805,0,0
58005784
0x5F88C000,1,0,0x57001720,2,0=0x5F88C000,1,0,0x57001805,2,0
58015785
0x5F88C000,3,0,0x57001720,0,0=0x5F88C000,3,0,0x57001805,0,0

‎src/main/scala/module/GlrRuleGenerator.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ class GlrRuleGenerator(var context: RuleTransducer.Context) extends RuleGenerato
88

99
def start(): Unit = {
1010
for (main <- GlrNetworks; base <- main.base) {
11-
Rules += main~WE | (base ~> main)~WE // ortho
11+
// Rules += main~WE | (base ~> main)~WE // ortho
1212
// Rules += main~WE | (base ~> main)~WC // ortho stub
13-
Rules += main~SE~ES | (base ~> main)~WN~NW // diagonal
13+
// Rules += main~SE~ES | (base ~> main)~WN~NW // diagonal
1414
// curves
1515
// createCurve45Rules(main)
1616
// createCurve90Rules(main)

0 commit comments

Comments
 (0)