feat: custom order

borgoat · May 5, 2022 · 001f90a · 001f90a
1 parent 4c49b71
commit 001f90a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/main/kotlin/com/github/borgoat/markovaldo/MarkovChain.kt b/src/main/kotlin/com/github/borgoat/markovaldo/MarkovChain.kt
@@ -19,8 +19,7 @@ class MarkovChain(
 
   fun nextToken(tokenSequence: List<Token>): Token? = edges[tokenSequence.takeLast(order)]?.next()
 
-  class Builder(val scanner: Scanner = Scanner()) {
-    var order = 3
+  class Builder(val scanner: Scanner = Scanner(), val order: Int = 3) {
     val probs = mutableMapOf<List<Token>, MutableMap<Token, AtomicLong>>()
 
     fun add(text: CharSequence) {

diff --git a/src/main/kotlin/com/github/borgoat/markovaldo/Token.kt b/src/main/kotlin/com/github/borgoat/markovaldo/Token.kt
@@ -7,8 +7,8 @@ data class StringToken(val string: String) : Token() {
     val skipSpaceBefore = noSpaceBefore.matches(string)
 
     companion object {
-        private val noSpaceAfter = "^([\"]+|\\-\\-)\$".toRegex()
-        private val noSpaceBefore = "^[\\.!?,:\\-]+\$".toRegex()
+        private val noSpaceAfter = "^([\"\']+|\\-\\-)\$".toRegex()
+        private val noSpaceBefore = "^[\"\'\\.!?,:\\-]+\$".toRegex()
     }
 }