From 127e3c8f04a5b02a4e88adaeffa700490e75d5c3 Mon Sep 17 00:00:00 2001 From: breandan Date: Sun, 14 Apr 2024 14:45:49 -0400 Subject: [PATCH] consolidate criteria --- .../kotlin/ai/hypergraph/kaliningraph/parsing/JVMBarHillel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jvmMain/kotlin/ai/hypergraph/kaliningraph/parsing/JVMBarHillel.kt b/src/jvmMain/kotlin/ai/hypergraph/kaliningraph/parsing/JVMBarHillel.kt index a967c421..467db9c4 100644 --- a/src/jvmMain/kotlin/ai/hypergraph/kaliningraph/parsing/JVMBarHillel.kt +++ b/src/jvmMain/kotlin/ai/hypergraph/kaliningraph/parsing/JVMBarHillel.kt @@ -172,7 +172,7 @@ private fun CFG.jvmIntersectLevFSAP(fsa: FSA, parikhMap: ParikhMap): CFG { val ct = (fsa.validPairs * nonterminals.indices.toSet()).toList() val ct2 = Array(fsa.states.size) { Array(nonterminals.size) { Array(fsa.states.size) { false } } } - ct.filter { fsa.obeys(it.π1, it.π2, it.π3, parikhMap) } + ct.filter { lengthBoundsCache[it.π3].overlaps(fsa.SPLP(it.π1, it.π2)) && fsa.obeys(it.π1, it.π2, it.π3, parikhMap) } .forEach { ct2[it.π1.π1][it.π3][it.π2.π1] = true } val elimCounter = AtomicInteger(0) @@ -242,7 +242,7 @@ tailrec fun CFG.jvmElimVarUnitProds( fun CFG.jvmDropVestigialProductions(clock: TimeSource.Monotonic.ValueTimeMark): CFG { val start = clock.elapsedNow() val counter = AtomicInteger(0) - val nts: Set<Σᐩ> = ConcurrentSkipListSet<Σᐩ>().also { set -> asSequence().asStream().parallel().forEach { set.add(it.first) } } + val nts: Set<Σᐩ> = asSequence().asStream().parallel().map { it.first }.collect(Collectors.toSet()) val rw = asSequence().asStream().parallel() .filter { prod -> if (counter.incrementAndGet() % 10 == 0 && BH_TIMEOUT < clock.elapsedNow()) throw Exception("Timeout!")