natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor optimization of term trie.

This commit is contained in:
Fedor Isakov 2020-08-01 15:12:44 +02:00
parent 3bf644f766
commit a003211a2c
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
reactor/Core/src/jetbrains/mps/logic/reactor/util/ArrayListStack.kt
View File

@ -16,6 +16,9 @@
package jetbrains.mps.logic.reactor.util
import java.util.*
import kotlin.collections.ArrayList
/**
* @author Fedor Isakov
*/
@ -24,4 +27,4 @@ fun <T> ArrayList<T>.push (element: T): Unit { add(element) }
fun <T> ArrayList<T>.pop (): T = removeAt(size - 1)
fun <T> ArrayList<T>.peek (): T = last()
fun <T> ArrayList<T>.peek (): T = get(size - 1)

26
reactor/Core/src/jetbrains/mps/logic/reactor/util/ClassicTermTrie.kt
View File

@ -76,41 +76,43 @@ class ClassicTermTrie<T> : TermTrie<T> {
val seen = IdentityHashMap<Term, Term>()
val nodeStack = arrayListOf(root)
val termStack = arrayListOf(matchTerm)
val argPool = arrayListOf<Term>()
while (!termStack.isEmpty()) {
val node = nodeStack.peek()
val term = termStack.pop()
// dereferece the term only if it hasn't been dereferenced before
val deref = deref(term).let { dt -> seen[dt]?.run { term } ?: dt.apply { seen[dt] = term } }
val arguments = deref.arguments().toList()
for(i in 1..arguments.size) {
termStack.push(arguments[arguments.size - i])
argPool.addAll(deref.arguments())
for(i in 1..argPool.size) {
termStack.push(argPool[argPool.size - i])
}
val nextNode = node.nextOrDefault(symbolOrWildcard(deref)) { sym -> PathNode(sym, arguments.size) }
val nextNode = node.nextOrDefault(symbolOrWildcard(deref)) { sym -> PathNode(sym, argPool.size) }
nodeStack.push(nextNode)
argPool.clear()
}
val head = nodeStack.pop()
head.addValue(value)
nodeStack.reverse()
nodeStack.fold(head) { nextNode, node -> node.putNext(nextNode) }
nodeStack.foldRight(head) { node, nextNode -> node.putNext(nextNode) }
}
private fun removeValue(matchTerm: Term, value: T) {
val seen = IdentityHashMap<Term, Term>()
val nodeStack = arrayListOf(root)
val termStack = arrayListOf(matchTerm)
val argPool = arrayListOf<Term>()
while (!termStack.isEmpty()) {
val node = nodeStack.peek()
val term = termStack.removeAt(termStack.size - 1)
val term = termStack.pop()
// dereferece the term only if it hasn't been dereferenced before
val deref = deref(term).let { dt -> seen[dt]?.run { term } ?: dt.apply { seen[dt] = term } }
val arguments = deref.arguments().toList()
for(i in 1..arguments.size) {
termStack.add(arguments[arguments.size - i])
argPool.addAll(deref.arguments())
for(i in 1..argPool.size) {
termStack.push(argPool[argPool.size - i])
}
argPool.clear()
val nextNode = node.next(symbolOrWildcard(deref))
if (nextNode == null) {
@ -251,7 +253,7 @@ class ClassicTermTrie<T> : TermTrie<T> {
val term = ArrayList<PathNode<T>>()
val edge = ArrayList<PathNode<T>>()
val stack = ArrayList<Pair<PathNode<T>, Int>>()
val stack = arrayListOf<Pair<PathNode<T>, Int>>()
for (n in allNext()) {
stack.push(n to 0)
}