moved to Kotlin multiplatform
This commit is contained in:
@@ -1,12 +1,14 @@
|
||||
package net.woggioni.klevtree
|
||||
|
||||
import net.woggioni.jwo.TreeNodeVisitor
|
||||
import net.woggioni.klevtree.tree.TreeNodeVisitor
|
||||
import kotlin.math.min
|
||||
|
||||
|
||||
sealed class DistanceCalculator {
|
||||
abstract fun compute(keyChecker : Trie.Keychecker<Char>,
|
||||
stack: List<TreeNodeVisitor.StackContext<LevNode, Unit>>,
|
||||
wordkey: String,
|
||||
worstCase : Int) : TreeNodeVisitor.VisitOutcome
|
||||
stack: List<TreeNodeVisitor.StackContext<LevNode, Unit>>,
|
||||
wordkey: String,
|
||||
worstCase : Int) : TreeNodeVisitor.VisitOutcome
|
||||
|
||||
object LevenshteinDistanceCalculator : DistanceCalculator() {
|
||||
override fun compute(keyChecker : Trie.Keychecker<Char>,
|
||||
@@ -21,7 +23,7 @@ sealed class DistanceCalculator {
|
||||
if(keyChecker.check(wordkey[i - 1], currentStackElement.node.key)) {
|
||||
currentRow[i] = previousRow[i - 1]
|
||||
} else {
|
||||
currentRow[i] = Math.min(Math.min(currentRow[i - 1], previousRow[i -1]), previousRow[i]) + 1
|
||||
currentRow[i] = min(min(currentRow[i - 1], previousRow[i -1]), previousRow[i]) + 1
|
||||
}
|
||||
}
|
||||
return if(worstCase >= 0 && worstCase <= currentRow.minOrNull()!!) {
|
||||
@@ -45,13 +47,13 @@ sealed class DistanceCalculator {
|
||||
if (keyChecker.check(wordkey[i - 1], cse.node.key)) {
|
||||
crow[i] = prow[i - 1]
|
||||
} else {
|
||||
crow[i] = Math.min(Math.min(crow[i - 1], prow[i - 1]), prow[i]) + 1
|
||||
crow[i] = min(min(crow[i - 1], prow[i - 1]), prow[i]) + 1
|
||||
}
|
||||
if (stack.size > 2 && i > 1 && keyChecker.check(wordkey[i - 2], cse.node.key)
|
||||
&& keyChecker.check(wordkey[i - 1], pse.node.key)) {
|
||||
val ppse = stack[stack.size - 3]
|
||||
val pprow: IntArray = ppse.node.payload!!
|
||||
crow[i] = Math.min(crow[i], pprow[i - 2] + 1)
|
||||
crow[i] = min(crow[i], pprow[i - 2] + 1)
|
||||
}
|
||||
}
|
||||
return if(worstCase >= 0 && worstCase <= prow.minOrNull()!!) {
|
@@ -1,9 +1,9 @@
|
||||
package net.woggioni.klevtree
|
||||
|
||||
import net.woggioni.jwo.TreeNodeVisitor
|
||||
import net.woggioni.jwo.TreeWalker
|
||||
import net.woggioni.klevtree.node.CharNode
|
||||
import net.woggioni.klevtree.node.TrieNode
|
||||
import net.woggioni.klevtree.tree.TreeNodeVisitor
|
||||
import net.woggioni.klevtree.tree.TreeWalker
|
||||
|
||||
internal typealias LevNode = TrieNode<Char, IntArray>
|
||||
|
||||
@@ -41,7 +41,8 @@ class LevTrie : CharTrie<IntArray>() {
|
||||
}
|
||||
|
||||
fun fuzzySearch(word : String, maxResult: Int) : List<Pair<String, Int>> {
|
||||
val result = sortedSetOf<Pair<String, Int>>(compareBy({ it.second }, { it.first }))
|
||||
val comparator : Comparator<Pair<String, Int>> = compareBy({ it.second }, { it.first })
|
||||
val result = mutableListOf<Pair<String, Int>>()
|
||||
val requiredSize = word.length + 1
|
||||
val visitor = object: TreeNodeVisitor<LevNode, Unit> {
|
||||
override fun visitPre(stack: List<TreeNodeVisitor.StackContext<LevNode, Unit>>): TreeNodeVisitor.VisitOutcome {
|
||||
@@ -64,6 +65,7 @@ class LevTrie : CharTrie<IntArray>() {
|
||||
val candidate = sb.toString()
|
||||
val distance = stack[stack.size - 2].node.payload!![word.length]
|
||||
result.add(candidate to distance)
|
||||
result.sortWith(comparator)
|
||||
if(result.size > maxResult) {
|
||||
result.remove(result.last())
|
||||
}
|
@@ -1,8 +1,8 @@
|
||||
package net.woggioni.klevtree
|
||||
|
||||
import net.woggioni.jwo.TreeNodeVisitor
|
||||
import net.woggioni.jwo.TreeWalker
|
||||
import net.woggioni.klevtree.node.TrieNode
|
||||
import net.woggioni.klevtree.tree.TreeNodeVisitor
|
||||
import net.woggioni.klevtree.tree.TreeWalker
|
||||
|
||||
abstract class Trie<T : TrieNode<KEY, PAYLOAD>, KEY, PAYLOAD> {
|
||||
|
@@ -1,6 +1,6 @@
|
||||
package net.woggioni.klevtree.node
|
||||
|
||||
import net.woggioni.jwo.TreeNodeVisitor
|
||||
import net.woggioni.klevtree.tree.TreeNodeVisitor
|
||||
|
||||
|
||||
open class TrieNode<T, PAYLOAD>(val key : T?) : TreeNodeVisitor.TreeNode<TrieNode<T, PAYLOAD>> {
|
@@ -0,0 +1,64 @@
|
||||
package net.woggioni.klevtree.tree
|
||||
|
||||
/**
|
||||
* This interface must be implemented by the user of [TreeWalker] and its methods will be called by
|
||||
* [TreeWalker.walk]. The methods will receive as an input a list of [StackContext]
|
||||
* instances each one correspond to a node in the tree, each node is preceded in the list
|
||||
* by its parents in the tree. Each instance has a method, [StackContext.context]
|
||||
* to set a custom object that can be used in the [.visitPre] method and the method
|
||||
* [StackContext.context] that can be used in the [.visitPost] method to retrieve
|
||||
* the same instance. This is to provide support for algorithms that require both pre-order and post-order logic.
|
||||
* The last element of the list corresponds to the node currently being traversed.
|
||||
* @param <T> the type of the context object used
|
||||
</T> */
|
||||
interface TreeNodeVisitor<NODE : TreeNodeVisitor.TreeNode<NODE>, T> {
|
||||
interface TreeNode<NODE : TreeNode<NODE>> {
|
||||
fun children(): Iterator<NODE>?
|
||||
}
|
||||
|
||||
/**
|
||||
* This interface exposes the methods that are visible to the user of
|
||||
* [TreeWalker], it allows to
|
||||
* set/get a custom object in the current stack context or to get the current link's Aci
|
||||
* @param <T> the type of the context object used
|
||||
</T> */
|
||||
interface StackContext<NODE : TreeNode<*>?, T> {
|
||||
/**
|
||||
* @return the current user object
|
||||
*/
|
||||
/**
|
||||
* @param ctx the user object to set for this stack level
|
||||
*/
|
||||
var context: T?
|
||||
|
||||
/**
|
||||
* @return the current TreeNode
|
||||
*/
|
||||
val node: NODE
|
||||
}
|
||||
|
||||
enum class VisitOutcome {
|
||||
CONTINUE,
|
||||
SKIP,
|
||||
EARLY_EXIT
|
||||
}
|
||||
|
||||
/**
|
||||
* This method will be called for each link using
|
||||
* [a Depth-first pre-oder algorithm](https://en.wikipedia.org/wiki/Tree_traversal#Pre-order_(NLR))
|
||||
* @param stack is a list of [StackContext] instances corresponding to the full path from the root to the
|
||||
* current node in the tree
|
||||
* @return a boolean that will be used to decide whether to traverse the subtree rooted in the current link or not
|
||||
*/
|
||||
fun visitPre(stack: List<StackContext<NODE, T>>): VisitOutcome {
|
||||
return VisitOutcome.CONTINUE
|
||||
}
|
||||
|
||||
/**
|
||||
* This method will be called for each node using
|
||||
* [a Depth-first post-oder algorithm](https://en.wikipedia.org/wiki/Tree_traversal#Post-order_(LRN))
|
||||
* @param stack is a list of [StackContext] instances corresponding to the full path from the root to the
|
||||
* current node in the tree
|
||||
*/
|
||||
fun visitPost(stack: List<StackContext<NODE, T>>) {}
|
||||
}
|
@@ -0,0 +1,48 @@
|
||||
package net.woggioni.klevtree.tree
|
||||
|
||||
|
||||
class TreeWalker<NODE : TreeNodeVisitor.TreeNode<NODE>, T>(
|
||||
private val visitor: TreeNodeVisitor<NODE, T>
|
||||
) {
|
||||
|
||||
private class StackElement<NODE : TreeNodeVisitor.TreeNode<NODE>, T>(override val node: NODE) :
|
||||
TreeNodeVisitor.StackContext<NODE, T> {
|
||||
override var context: T? = null
|
||||
var childrenIterator: Iterator<NODE>? = null
|
||||
}
|
||||
|
||||
/**
|
||||
* This methods does the actual job of traversing the tree calling the methods of the provided
|
||||
* [TreeNodeVisitor] instance
|
||||
* @param root the root node of the tree
|
||||
*/
|
||||
fun walk(root: NODE) {
|
||||
val stack: MutableList<StackElement<NODE, T>> = mutableListOf()
|
||||
val rootStackElement = StackElement<NODE, T>(root)
|
||||
stack.add(rootStackElement)
|
||||
val publicStack: List<TreeNodeVisitor.StackContext<NODE, T>> = stack
|
||||
when (visitor.visitPre(publicStack)) {
|
||||
TreeNodeVisitor.VisitOutcome.CONTINUE -> rootStackElement.childrenIterator = root.children()
|
||||
TreeNodeVisitor.VisitOutcome.SKIP -> rootStackElement.childrenIterator = null
|
||||
TreeNodeVisitor.VisitOutcome.EARLY_EXIT -> return
|
||||
}
|
||||
while (stack.isNotEmpty()) {
|
||||
val lastElement: StackElement<NODE, T> = stack.last()
|
||||
val childrenIterator = lastElement.childrenIterator
|
||||
if (childrenIterator != null && childrenIterator.hasNext()) {
|
||||
val childNode = childrenIterator.next()
|
||||
val childStackElement = StackElement<NODE, T>(childNode)
|
||||
stack.add(childStackElement)
|
||||
when (visitor.visitPre(publicStack)) {
|
||||
TreeNodeVisitor.VisitOutcome.CONTINUE -> childStackElement.childrenIterator = childNode.children()
|
||||
TreeNodeVisitor.VisitOutcome.SKIP -> childStackElement.childrenIterator = null
|
||||
TreeNodeVisitor.VisitOutcome.EARLY_EXIT -> return
|
||||
}
|
||||
} else {
|
||||
visitor.visitPost(publicStack)
|
||||
stack.removeLast()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -1,7 +1,11 @@
|
||||
package net.woggioni.klevtree
|
||||
|
||||
import org.junit.jupiter.api.Assertions
|
||||
import org.junit.jupiter.api.Test
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertNotNull
|
||||
import kotlin.test.assertNull
|
||||
import kotlin.test.assertTrue
|
||||
|
||||
|
||||
class LevtreeTest {
|
||||
|
||||
@@ -13,23 +17,23 @@ class LevtreeTest {
|
||||
val word = "dailies"
|
||||
run {
|
||||
val pair = tree.add(word)
|
||||
Assertions.assertTrue(pair.first)
|
||||
assertTrue(pair.first)
|
||||
val node = tree.search(word)
|
||||
Assertions.assertNotNull(node)
|
||||
Assertions.assertEquals(
|
||||
assertNotNull(node)
|
||||
assertEquals(
|
||||
word,
|
||||
node!!.linealDescendant().fold(StringBuilder(), StringBuilder::append).toString()
|
||||
node.linealDescendant().fold(StringBuilder(), StringBuilder::append).toString()
|
||||
)
|
||||
val result = tree.fuzzySearch(word, 5)
|
||||
Assertions.assertEquals(1, result.size)
|
||||
Assertions.assertEquals(word to 0, result[0])
|
||||
assertEquals(1, result.size)
|
||||
assertEquals(word to 0, result[0])
|
||||
}
|
||||
run {
|
||||
tree.remove(word)
|
||||
val node = tree.search(word)
|
||||
Assertions.assertNull(node)
|
||||
assertNull(node)
|
||||
val result = tree.fuzzySearch(word, 5)
|
||||
Assertions.assertEquals(0, result.size)
|
||||
assertEquals(0, result.size)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,21 +67,21 @@ class LevtreeTest {
|
||||
run {
|
||||
val word = "fired"
|
||||
val result = tree.fuzzySearch(word, 4)
|
||||
Assertions.assertEquals(4, result.size)
|
||||
Assertions.assertEquals("tired" to 1, result[0])
|
||||
assertEquals(4, result.size)
|
||||
assertEquals("tired" to 1, result[0])
|
||||
}
|
||||
run {
|
||||
val word = "tierd"
|
||||
val result = tree.fuzzySearch(word, 4)
|
||||
Assertions.assertEquals(4, result.size)
|
||||
Assertions.assertEquals("tired" to 2, result[0])
|
||||
assertEquals(4, result.size)
|
||||
assertEquals("tired" to 2, result[0])
|
||||
}
|
||||
run {
|
||||
val word = "tierd"
|
||||
tree.remove("tired")
|
||||
val result = tree.fuzzySearch(word, 4)
|
||||
Assertions.assertEquals(4, result.size)
|
||||
Assertions.assertEquals("trail" to 4, result[0])
|
||||
assertEquals(4, result.size)
|
||||
assertEquals("trail" to 4, result[0])
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,22 +93,22 @@ class LevtreeTest {
|
||||
run {
|
||||
val word = "fired"
|
||||
val result = tree.fuzzySearch(word, 4)
|
||||
Assertions.assertEquals(4, result.size)
|
||||
Assertions.assertEquals("tired" to 1, result[0])
|
||||
assertEquals(4, result.size)
|
||||
assertEquals("tired" to 1, result[0])
|
||||
}
|
||||
run {
|
||||
val word = "capitvate"
|
||||
val result = tree.fuzzySearch(word, 4)
|
||||
Assertions.assertEquals(4, result.size)
|
||||
Assertions.assertEquals("captivate" to 1, result[0])
|
||||
Assertions.assertEquals("captivity" to 3, result[1])
|
||||
assertEquals(4, result.size)
|
||||
assertEquals("captivate" to 1, result[0])
|
||||
assertEquals("captivity" to 3, result[1])
|
||||
}
|
||||
run {
|
||||
tree.remove("captivate")
|
||||
val word = "capitvate"
|
||||
val result = tree.fuzzySearch(word, 4)
|
||||
Assertions.assertEquals(4, result.size)
|
||||
Assertions.assertEquals("captivity" to 3, result[0])
|
||||
assertEquals(4, result.size)
|
||||
assertEquals("captivity" to 3, result[0])
|
||||
}
|
||||
}
|
||||
}
|
@@ -1,4 +1,4 @@
|
||||
module net.woggioni.klevtree {
|
||||
requires net.woggioni.jwo;
|
||||
requires kotlin.stdlib;
|
||||
exports net.woggioni.klevtree;
|
||||
}
|
@@ -1,17 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Configuration status="WARN">
|
||||
<Appenders>
|
||||
<Console name="Console" target="SYSTEM_ERR">
|
||||
<PatternLayout pattern="%d{HH:mm:ss,SSS} %highlight{[%p]} (%t) %c: %m%n"/>
|
||||
<Filters>
|
||||
<ThresholdFilter level="ERROR" onMatch="ACCEPT" />
|
||||
</Filters>
|
||||
</Console>
|
||||
</Appenders>
|
||||
|
||||
<Loggers>
|
||||
<Root level="ALL">
|
||||
<AppenderRef ref="Console"/>
|
||||
</Root>
|
||||
</Loggers>
|
||||
</Configuration>
|
Reference in New Issue
Block a user