speed up traversing of suffix tree

suhininalex · Jul 7, 2017 · 8d6bddd · 8d6bddd
1 parent f27ce87
commit 8d6bddd
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/src/main/com/suhininalex/clones/core/CloneIndexer.kt b/src/main/com/suhininalex/clones/core/CloneIndexer.kt
@@ -12,6 +12,7 @@ import com.suhininalex.suffixtree.Node
 import com.suhininalex.suffixtree.SuffixTree
 import java.util.*
 import java.util.concurrent.locks.ReentrantReadWriteLock
+import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
 import kotlin.concurrent.read
 import kotlin.concurrent.write
@@ -57,16 +58,27 @@ object CloneIndexer {
                 .filterSubClassClones()
     }
 
-    fun getAllCloneClasses(): Sequence<TreeCloneClass>  = rwLock.read {
+    fun getAllCloneClasses(): List<TreeCloneClass>  = rwLock.read {
         tree.getAllCloneClasses(PluginSettings.minCloneLength)
     }
 
 }
 
-fun SuffixTree<SourceToken>.getAllCloneClasses(minTokenLength: Int): Sequence<TreeCloneClass> =
-     root.depthFirstTraverse { it.edges.asSequence().mapNotNull { it.terminal }}
-             .map(::TreeCloneClass)
-             .filter { it.length > minTokenLength }
+fun Node.visitChildren(visit: (Node) -> Unit) {
+    visit(this)
+    this.edges.mapNotNull { it.terminal }.forEach { it.visitChildren(visit) }
+}
+
+fun SuffixTree<SourceToken>.getAllCloneClasses(minTokenLength: Int): List<TreeCloneClass> {
+    val clones = ArrayList<TreeCloneClass>()
+    root.visitChildren {
+        val cloneClass = TreeCloneClass(it)
+        if (cloneClass.length > minTokenLength) {
+            clones.add(cloneClass)
+        }
+    }
+    return clones
+}
 
 fun SuffixTree<SourceToken>.getAllSequenceClasses(id: Long, minTokenLength: Int): Sequence<TreeCloneClass>  {
     val classes = LinkedList<TreeCloneClass>()

diff --git a/src/main/com/suhininalex/clones/core/postprocessing/ProcessingFlow.kt b/src/main/com/suhininalex/clones/core/postprocessing/ProcessingFlow.kt
@@ -22,7 +22,7 @@ val beforeFiltering = PluginLabels.getLabel("progressbar-filtering-before-filter
 
 fun CloneIndexer.getAllFilteredClones(): Promise<List<CloneClass>, Exception> =
     task {
-        ProgressManager.getInstance().backgroundTask(beforeFiltering){ getAllCloneClasses().toList().notLongestSequenceFilter() }.get()
+        ProgressManager.getInstance().backgroundTask(beforeFiltering){ getAllCloneClasses().notLongestSequenceFilter() }.get()
     }.thenApply {
         withProgressBar(subClassFiltering).filterSubClassClones().get().validClonesFilter()
     }.thenApply {

diff --git a/src/main/com/suhininalex/clones/ide/CloneFinderIndex.kt b/src/main/com/suhininalex/clones/ide/CloneFinderIndex.kt
@@ -2,6 +2,7 @@ package com.suhininalex.clones.ide;
 
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.GeneratedSourcesFilter
+import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiManager
 import com.intellij.psi.search.EverythingGlobalScope

diff --git a/src/test/com/suhininalex/clones/ExtractSiblingClonesTest.kt b/src/test/com/suhininalex/clones/ExtractSiblingClonesTest.kt
@@ -9,7 +9,7 @@ import com.suhininalex.clones.core.utils.tokenSequence
 class ExtractSiblingClonesTest : FolderProjectTest("testdata/sphinx4-java/") {
 
     val clones
-        get() = CloneIndexer.getAllCloneClasses().toList().filterSubClassClones()
+        get() = CloneIndexer.getAllCloneClasses().filterSubClassClones()
 
     fun testNotAloneDuplicate() {
         val problems = clones.splitSiblingClones().mergeCloneClasses().filter { ! checkCountInvariant(it) }

diff --git a/src/test/com/suhininalex/clones/TreeClonesTest.kt b/src/test/com/suhininalex/clones/TreeClonesTest.kt
@@ -9,7 +9,7 @@ import com.suhininalex.clones.core.utils.tokenSequence
 class TreeClonesTest : FolderProjectTest("testdata/sphinx4-java/") {
 
     val clones
-        get() = CloneIndexer.getAllCloneClasses().toList().filterSubClassClones().toList()
+        get() = CloneIndexer.getAllCloneClasses().filterSubClassClones().toList()
 
     fun testNotAloneDuplicate() {
         assertTrue(clones.all(::checkCountInvariant))