fix tests

breandan · Oct 15, 2023 · 6a8d320 · 6a8d320
1 parent 453b249
commit 6a8d320
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/commonMain/kotlin/ai/hypergraph/kaliningraph/parsing/Normalization.kt b/src/commonMain/kotlin/ai/hypergraph/kaliningraph/parsing/Normalization.kt
@@ -204,7 +204,7 @@ fun CFG.reachSym(from: Σᐩ = START_SYMBOL): Set<Σᐩ> {
 fun CFG.reachableSymbols(from: Σᐩ = START_SYMBOL): Set<Σᐩ> =
   reachability.getOrPut(from) { depGraph.transitiveClosure(setOf(from)) }
 
-fun CFG.genSym(from: Set<Σᐩ> = terminals): Set<Σᐩ> {
+fun CFG.genSym(from: Set<Σᐩ> = terminalUnitProductions.map { it.LHS }.toSet()): Set<Σᐩ> {
   val allGenerating: MutableSet<Σᐩ> = mutableSetOf()
   val nextGenerating = from.toMutableSet()
 
@@ -221,7 +221,7 @@ fun CFG.genSym(from: Set<Σᐩ> = terminals): Set<Σᐩ> {
 
 // All symbols that are either terminals or generate terminals
 fun CFG.generatingSymbols(
-  from: Set<Σᐩ> = terminals,
+  from: Set<Σᐩ> = terminalUnitProductions.map { it.LHS }.toSet(),
   revGraph: LabeledGraph = revDepGraph
 ): Set<Σᐩ> = revGraph.transitiveClosure(from)
 

diff --git a/src/commonTest/kotlin/ai/hypergraph/kaliningraph/parsing/BarHillelTest.kt b/src/commonTest/kotlin/ai/hypergraph/kaliningraph/parsing/BarHillelTest.kt
@@ -192,9 +192,12 @@ class BarHillelTest {
   @Test
   fun testPythonBarHillel() {
     val gram = SetValiantTest.seq2parsePythonCFG.noEpsilonOrNonterminalStubs
-    gram.intersectLevFSA(makeLevFSA("NUMBER + NEWLINE", 2, gram.terminals))
+    val intGram = gram.intersectLevFSA(makeLevFSA("NUMBER + NEWLINE", 2, gram.terminals))
       .also { println("LEV ∩ CFG grammar:\n${it.pretty}") }
-      .enumSeq(List(5) { "_" }.joinToString(" "))
+    val clock = TimeSource.Monotonic.markNow()
+
+    intGram.enumSeq(List(5) { "_" }.joinToString(" "))
       .onEach { println(it) }.toList()
+    println("Enumerative solver took ${clock.elapsedNow().inWholeMilliseconds}ms")
   }
 }