report more solving stats

Author: breandan

src/commonMain/kotlin/ai/hypergraph/kaliningraph/CommonUtils.kt

@@ -133,14 +133,14 @@ class KBitSet(val n: Int) {
   constructor(n: Int, v: Collection<Int>) : this(n) { v.forEach { set(it) } }
   // Each element of 'data' holds 64 bits, covering up to n bits total.
   private val data = LongArray((n + 63) ushr 6)
-  var set = mutableSetOf<Int>()
-  var modified = false
+//  var set = mutableSetOf<Int>()
+//  var modified = false
 
   fun set(index: Int) {
-    modified = true
+//    modified = true
+//    set += index
     val word = index ushr 6
     val bit  = index and 63
-    set += index
     data[word] = data[word] or (1L shl bit)
   }
 

src/commonMain/kotlin/ai/hypergraph/kaliningraph/parsing/SetValiant.kt

@@ -77,25 +77,25 @@ fun CFG.isValid(str: List<Σᐩ>): Bln =
     dp[0][str.size][bindex[START_SYMBOL]]
   }
 
-fun CFG.isValidAlt(str: List<Σᐩ>): Bln =
-  if (str.size == 1) checkUnitWord(str.first()).isNotEmpty()
-  else {
-    val dp = Array(str.size + 1) { Array(str.size + 1) { KBitSet(nonterminals.size) } }
-    str.map {
-      if (it == "_" || tmMap[it] == null) (0..<nonterminals.size).toList()
-      else tmToVidx[tmMap[it]!!] }.forEachIndexed { i, it -> it.forEach { vidx -> dp[i][i+1].set(vidx) } }
-
-    for (dist: Int in 0 until dp.size) {
-      for (iP: Int in 0 until dp.size - dist) {
-        val p = iP
-        val q = iP + dist
-        val appq = p..q
-        for (r in appq) for (lt in dp[p][r].set) for (rt in dp[r][q].set)
-          bimap.R2LHSI[lt][rt].forEach { dp[p][q].set(it) }
-      }
-    }
-    dp[0][str.size][bindex[START_SYMBOL]]
-  }
+//fun CFG.isValidAlt(str: List<Σᐩ>): Bln =
+//  if (str.size == 1) checkUnitWord(str.first()).isNotEmpty()
+//  else {
+//    val dp = Array(str.size + 1) { Array(str.size + 1) { KBitSet(nonterminals.size) } }
+//    str.map {
+//      if (it == "_" || tmMap[it] == null) (0..<nonterminals.size).toList()
+//      else tmToVidx[tmMap[it]!!] }.forEachIndexed { i, it -> it.forEach { vidx -> dp[i][i+1].set(vidx) } }
+//
+//    for (dist: Int in 0 until dp.size) {
+//      for (iP: Int in 0 until dp.size - dist) {
+//        val p = iP
+//        val q = iP + dist
+//        val appq = p..q
+//        for (r in appq) for (lt in dp[p][r].set) for (rt in dp[r][q].set)
+//          bimap.R2LHSI[lt][rt].forEach { dp[p][q].set(it) }
+//      }
+//    }
+//    dp[0][str.size][bindex[START_SYMBOL]]
+//  }
 
 fun CFG.corner(str: Σᐩ) =
  solveFixedpoint(str.tokenizeByWhitespace())[0].last().map { it.root }.toSet()

src/commonTest/kotlin/ai/hypergraph/kaliningraph/parsing/SetValiantTest.kt

@@ -417,6 +417,7 @@ class SetValiantTest {
   @Test
   fun testUTMRepresentationEquivalence() {
     with(vanillaS2PCFG) {
+      println("SIZE: ${nonterminals.size}")
       val str = "NAME = NAME ( NAME , NUMBER ) . NAME ( ) NEWLINE NAME = NAME . NAME NEWLINE NAME = STRING . NAME ( NAME for NAME in NAME if NAME . NAME ( ) ) NEWLINE NAME ( NAME ) NEWLINE".tokenizeByWhitespace()
 //  with("""P -> ( P ) | P P | ε""".parseCFG()) {
 //    val str = "( ( ) ( ) ) ( ) ( ( ( ) ) ( ) ) ( ( ( ) ) ) ( ) ( ) ( ) ( ( ) ( ) ) ( ) ( ( ) ( ) ) ( ) ( ( ) ( ) ) ( )".tokenizeByWhitespace()