add GlrRuleGenerator for crosslinks with RHW and NWM

Author: memo33

src/main/resources/tileOrientationCache.txt

@@ -49,6 +49,10 @@
 0x51137580,(0,0)+(1,0)+(2,0)+(3,0)+(0,1)+(3,1)+(2,1)+(1,1)
 0x51137680,(0,0)+(1,0)+(2,0)+(3,0)+(0,1)+(3,1)+(2,1)+(1,1)
 0x51137780,(0,0)+(1,0)+(2,0)+(3,0)+(0,1)+(3,1)+(2,1)+(1,1)
+0x51137880,(0,0)+(1,0)+(2,0)+(3,0)+(0,1)+(3,1)+(2,1)+(1,1)
+0x51137889,(0,0)+(1,0)+(2,0)+(3,0)+(0,1)+(3,1)+(2,1)+(1,1)
+0x51137980,(0,0)+(1,0)+(2,0)+(3,0)+(0,1)+(3,1)+(2,1)+(1,1)
+0x51137989,(0,0)+(1,0)+(2,0)+(3,0)+(0,1)+(3,1)+(2,1)+(1,1)
 0x511384A5,(0,0)+(1,0)+(2,0)+(3,0)
 0x51139B89,(0,0)+(1,0)+(2,0)+(3,0)
 0x51149C00,(0,0)+(1,0)+(2,0)+(3,0)+(0,1)+(3,1)+(2,1)+(1,1)

src/main/scala/module/CompileAllMetarules.scala

@@ -40,6 +40,8 @@ object CompileAllMetarules {
     CompileRhwCode.start(tileOrientationCache = tileOrientationCache)
     LOGGER.info("compiling NWM metarule code")
     CompileNwmCode.start(tileOrientationCache = tileOrientationCache)
+    LOGGER.info("compiling GLR metarule code")
+    CompileGlrCode.start(tileOrientationCache = tileOrientationCache)
     LOGGER.info("compiling SAM metarule code")
     CompileSamCode.start(tileOrientationCache = tileOrientationCache)
     LOGGER.info("compiling Onslope metarule code")

src/main/scala/module/CrossingGenerator.scala

@@ -10,8 +10,9 @@ object CrossingGenerator {
     for {
       minor <- Network.values.iterator
       if minor != Subway && !isHrw(minor) && (main.isRhw || minor.isRhw ||
-         (main.isNwm && (minor.isRhw || minor.isNwm || minor.base.isEmpty)) ||
-         (main.isNwm && isSingleTile(main) && main.height == 0 && (minor == L1Dtr || minor == L2Dtr))
+         (main.isNwm && (minor.isRhw || minor.isNwm || minor.base.isEmpty || GlrNetworks.contains(minor))) ||
+         (main.isNwm && isSingleTile(main) && main.height == 0 && (minor == L1Dtr || minor == L2Dtr)) ||
+         GlrNetworks.contains(main) && (minor.isRhw || minor.isNwm /*|| minor == main*/)
          ) && intersectionAllowed(main, minor)
     } yield minor
   }

src/main/scala/module/GlrRuleGenerator.scala

@@ -0,0 +1,32 @@
+package com.sc4nam.module
+
+import io.github.memo33.metarules.meta._, syntax._
+import Network._, Flags._, Flag._, RotFlip._, Implicits._, group.SymGroup._
+import NetworkProperties._
+
+class GlrRuleGenerator(var context: RuleTransducer.Context) extends RuleGenerator with Curve45Generator with CrossingGenerator {
+
+  def start(): Unit = {
+    for (main <- GlrNetworks; base <- main.base) {
+      Rules += main~WE    | (base ~> main)~WE      // ortho
+      // Rules += main~WE    | (base ~> main)~WC      // ortho stub
+      Rules += main~SE~ES | (base ~> main)~WN~NW   // diagonal
+      // curves
+      // createCurve45Rules(main)
+      // createCurve90Rules(main)
+
+      // crossings (O×O, O×D, D×O, D×D)
+      for (minor <- CrossingGenerator.crossingNetworksOf(main)) {
+        createCrossingRules(main, minor)
+      }
+    }
+  }
+
+}
+
+// Compile individually with `sbt "runMain com.sc4nam.module.CompileGlrCode"`.
+object CompileGlrCode extends AbstractMain {
+  lazy val resolve: IdResolver = new MiscResolver orElse new RealRailwayResolver orElse new RhwResolver orElse new NwmResolver orElse new ViaductResolver
+  val generator = new GlrRuleGenerator(_)
+  lazy val file = new java.io.File("target/Sec10e_GlrMetaGenerated_MANAGED.txt")
+}

src/main/scala/module/MiscResolver.scala

@@ -531,13 +531,20 @@ class MiscResolver extends IdResolver {
       }
     }
 
+    // Lightrail crossings
+    add(0x08dd0300, Rail~ES & Lightrail~NS)
+    add(0x08dd0400, Rail~EW & Lightrail~NS)
+    add(0x08dd1400, Rail~NS & Lightrail~ES)
+    add(0x08dd1500, Rail~SW & Lightrail~ES)
+
     // GLR crossings
     for ((glr, offset) <- Seq(Glr1, Glr2, Glr3, Glr4).zip(Seq(0, 0x4000, 0x8000, 0xc000))) {
       add(0x5f880200 + offset, glr~(0,0,2,2))
       add(0x5f880500 + offset, glr~(0,13,0,2))
       add(0x5f880400 + offset, glr~(0,0,1,13))
       add(0x5f881100 + offset, glr~(2,2,2,2))
       add(0x5f881100 + offset, glr~NS & glr~WE)
+      add(0x5f881180 + offset, glr~NS & Lightrail~WE)
       add(0x5f881200 + offset, glr~(0,2,2,2))
       add(0x5f881200 + offset, glr~NS & glr~CE)
       // O×O

src/main/scala/module/NwmResolver.scala

@@ -43,6 +43,8 @@ object NwmResolver {
     Monorail      -> 0x0700,
     Glr1          -> 0x0800,
     Glr2          -> 0x0900,
+    Glr3          -> 0x0805,  // model-based
+    Glr4          -> 0x0905,  // model-based
     L2Hsr         -> 0x0A00,  // previously 0x1700, moved here to avoid DxO/DxD collision
     Str           -> 0x0F00,
 

src/main/scala/module/SanityChecker.scala

@@ -69,7 +69,10 @@ object SanityChecker {
 
   // Choose here the metarule-generated code that the handwritten RUL2 code
   // should be compared to.
-  val metaruleFiles = Set("Sec7h0_OnslopeMetaGenerated_MANAGED.txt")
+  val metaruleFiles = Set(
+    "Sec7h0_OnslopeMetaGenerated_MANAGED.txt",
+    // "Sec10e_GlrMetaGenerated_MANAGED.txt",
+  )
 
   def isMetaruleFile(path: Path): Boolean = {
     metaruleFiles.contains(path.getFileName().toString())