From f6e289e8223cf10480c88dcc1231b6c970697960 Mon Sep 17 00:00:00 2001 From: T45K Date: Sat, 30 Jan 2021 22:21:34 +0900 Subject: [PATCH 1/5] change package name --- build.gradle.kts | 4 +-- .../ac/osaka_u/sdl}/nil/NILConfig.kt | 2 +- .../t45k => jp/ac/osaka_u/sdl}/nil/NILMain.kt | 26 +++++++++---------- .../ac/osaka_u/sdl}/nil/entity/CodeBlock.kt | 2 +- .../sdl}/nil/entity/HuntSzymanskiLCS.kt | 2 +- .../osaka_u/sdl}/nil/entity/InvertedIndex.kt | 2 +- .../ac/osaka_u/sdl}/nil/entity/LCS.kt | 2 +- .../ac/osaka_u/sdl}/nil/entity/NGram.kt | 2 +- .../ac/osaka_u/sdl}/nil/entity/NaiveLCS.kt | 2 +- .../osaka_u/sdl}/nil/entity/TokenSequence.kt | 2 +- .../nil/presenter/logger/LoggerWrapper.kt | 2 +- .../presenter/logger/LoggerWrapperFactory.kt | 2 +- .../nil/presenter/logger/MFLoggerWrapper.kt | 10 +++---- .../presenter/logger/NormalLoggerWrapper.kt | 2 +- .../sdl}/nil/presenter/output/BCEFormat.kt | 2 +- .../osaka_u/sdl}/nil/presenter/output/CSV.kt | 2 +- .../sdl}/nil/presenter/output/Format.kt | 6 ++--- .../nil/presenter/output/FormatFactory.kt | 4 +-- .../usecase/cloneDetection/CloneDetection.kt | 8 +++--- .../nil/usecase/cloneDetection/Filtration.kt | 4 +-- .../cloneDetection/LCSBasedVerification.kt | 6 ++--- .../nil/usecase/cloneDetection/Location.kt | 6 ++--- .../cloneDetection/NGramBasedFiltration.kt | 4 +-- .../cloneDetection/NGramBasedLocation.kt | 8 +++--- .../usecase/cloneDetection/Verification.kt | 4 +-- .../sdl}/nil/usecase/preprocess/JavaParser.kt | 8 +++--- .../nil/usecase/preprocess/JavaPreprocess.kt | 6 ++--- .../sdl}/nil/usecase/preprocess/Preprocess.kt | 10 +++---- .../nil/usecase/preprocess/SymbolSeparator.kt | 4 +-- .../osaka_u/sdl}/nil/util/LexicalAnalyzer.kt | 2 +- .../osaka_u/sdl}/nil/util/ProgressMonitor.kt | 2 +- .../ac/osaka_u/sdl}/nil/util/RxExtention.kt | 2 +- .../ac/osaka_u/sdl}/nil/util/Timer.kt | 2 +- .../ac/osaka_u/sdl}/nil/NILConfigTest.kt | 2 +- .../ac/osaka_u/sdl}/nil/NILMainTest.kt | 2 +- .../ac/osaka_u/sdl}/nil/util/TimerKtTest.kt | 2 +- 36 files changed, 79 insertions(+), 79 deletions(-) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/NILConfig.kt (99%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/NILMain.kt (75%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/entity/CodeBlock.kt (87%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/entity/HuntSzymanskiLCS.kt (96%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/entity/InvertedIndex.kt (96%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/entity/LCS.kt (81%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/entity/NGram.kt (92%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/entity/NaiveLCS.kt (95%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/entity/TokenSequence.kt (87%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/presenter/logger/LoggerWrapper.kt (83%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/presenter/logger/LoggerWrapperFactory.kt (87%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/presenter/logger/MFLoggerWrapper.kt (72%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/presenter/logger/NormalLoggerWrapper.kt (94%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/presenter/output/BCEFormat.kt (93%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/presenter/output/CSV.kt (85%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/presenter/output/Format.kt (83%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/presenter/output/FormatFactory.kt (82%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/usecase/cloneDetection/CloneDetection.kt (77%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/usecase/cloneDetection/Filtration.kt (52%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/usecase/cloneDetection/LCSBasedVerification.kt (72%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/usecase/cloneDetection/Location.kt (50%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/usecase/cloneDetection/NGramBasedFiltration.kt (76%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/usecase/cloneDetection/NGramBasedLocation.kt (71%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/usecase/cloneDetection/Verification.kt (52%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/usecase/preprocess/JavaParser.kt (94%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/usecase/preprocess/JavaPreprocess.kt (81%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/usecase/preprocess/Preprocess.kt (80%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/usecase/preprocess/SymbolSeparator.kt (90%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/util/LexicalAnalyzer.kt (95%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/util/ProgressMonitor.kt (95%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/util/RxExtention.kt (88%) rename src/main/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/util/Timer.kt (94%) rename src/test/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/NILConfigTest.kt (92%) rename src/test/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/NILMainTest.kt (96%) rename src/test/kotlin/{io/github/t45k => jp/ac/osaka_u/sdl}/nil/util/TimerKtTest.kt (89%) diff --git a/build.gradle.kts b/build.gradle.kts index 3061059..a5c1566 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -45,11 +45,11 @@ dependencies { application { // Define the main class for the application. - mainClassName = "io.github.t45k.nil.NILMainKt" + mainClassName = "jp.ac.osaka_u.sdl.nil.NILMainKt" } val jar by tasks.getting(Jar::class) { manifest { - attributes["Main-Class"] = "io.github.t45k.nil.NILMainKt" + attributes["Main-Class"] = "jp.ac.osaka_u.sdl.nil.NILMainKt" } } diff --git a/src/main/kotlin/io/github/t45k/nil/NILConfig.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt similarity index 99% rename from src/main/kotlin/io/github/t45k/nil/NILConfig.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt index 44da0cd..2a87012 100644 --- a/src/main/kotlin/io/github/t45k/nil/NILConfig.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil +package jp.ac.osaka_u.sdl.nil import java.io.File diff --git a/src/main/kotlin/io/github/t45k/nil/NILMain.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILMain.kt similarity index 75% rename from src/main/kotlin/io/github/t45k/nil/NILMain.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILMain.kt index 1875cd6..7a7168b 100644 --- a/src/main/kotlin/io/github/t45k/nil/NILMain.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILMain.kt @@ -1,19 +1,19 @@ -package io.github.t45k.nil +package jp.ac.osaka_u.sdl.nil -import io.github.t45k.nil.entity.HuntSzymanskiLCS -import io.github.t45k.nil.entity.InvertedIndex -import io.github.t45k.nil.entity.TokenSequence -import io.github.t45k.nil.presenter.logger.LoggerWrapperFactory -import io.github.t45k.nil.presenter.output.FormatFactory -import io.github.t45k.nil.usecase.cloneDetection.CloneDetection -import io.github.t45k.nil.usecase.cloneDetection.NGramBasedFiltration -import io.github.t45k.nil.usecase.preprocess.JavaPreprocess -import io.github.t45k.nil.usecase.cloneDetection.NGramBasedLocation -import io.github.t45k.nil.usecase.cloneDetection.LCSBasedVerification -import io.github.t45k.nil.util.parallelIfSpecified -import io.github.t45k.nil.util.toTime import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.schedulers.Schedulers +import jp.ac.osaka_u.sdl.nil.entity.HuntSzymanskiLCS +import jp.ac.osaka_u.sdl.nil.entity.InvertedIndex +import jp.ac.osaka_u.sdl.nil.entity.TokenSequence +import jp.ac.osaka_u.sdl.nil.presenter.logger.LoggerWrapperFactory +import jp.ac.osaka_u.sdl.nil.presenter.output.FormatFactory +import jp.ac.osaka_u.sdl.nil.usecase.cloneDetection.CloneDetection +import jp.ac.osaka_u.sdl.nil.usecase.cloneDetection.LCSBasedVerification +import jp.ac.osaka_u.sdl.nil.usecase.cloneDetection.NGramBasedFiltration +import jp.ac.osaka_u.sdl.nil.usecase.cloneDetection.NGramBasedLocation +import jp.ac.osaka_u.sdl.nil.usecase.preprocess.JavaPreprocess +import jp.ac.osaka_u.sdl.nil.util.parallelIfSpecified +import jp.ac.osaka_u.sdl.nil.util.toTime import java.io.File class NILMain(private val config: NILConfig) { diff --git a/src/main/kotlin/io/github/t45k/nil/entity/CodeBlock.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/CodeBlock.kt similarity index 87% rename from src/main/kotlin/io/github/t45k/nil/entity/CodeBlock.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/CodeBlock.kt index af27145..7549ea7 100644 --- a/src/main/kotlin/io/github/t45k/nil/entity/CodeBlock.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/CodeBlock.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.entity +package jp.ac.osaka_u.sdl.nil.entity /** * Code block is a single function. diff --git a/src/main/kotlin/io/github/t45k/nil/entity/HuntSzymanskiLCS.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/HuntSzymanskiLCS.kt similarity index 96% rename from src/main/kotlin/io/github/t45k/nil/entity/HuntSzymanskiLCS.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/HuntSzymanskiLCS.kt index 922b18d..ba0de59 100644 --- a/src/main/kotlin/io/github/t45k/nil/entity/HuntSzymanskiLCS.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/HuntSzymanskiLCS.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.entity +package jp.ac.osaka_u.sdl.nil.entity /** * Time complexity is O(N log (N)). diff --git a/src/main/kotlin/io/github/t45k/nil/entity/InvertedIndex.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/InvertedIndex.kt similarity index 96% rename from src/main/kotlin/io/github/t45k/nil/entity/InvertedIndex.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/InvertedIndex.kt index 60bd0b5..94d1368 100644 --- a/src/main/kotlin/io/github/t45k/nil/entity/InvertedIndex.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/InvertedIndex.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.entity +package jp.ac.osaka_u.sdl.nil.entity import kotlin.math.min diff --git a/src/main/kotlin/io/github/t45k/nil/entity/LCS.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/LCS.kt similarity index 81% rename from src/main/kotlin/io/github/t45k/nil/entity/LCS.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/LCS.kt index 56acddb..2326f6f 100644 --- a/src/main/kotlin/io/github/t45k/nil/entity/LCS.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/LCS.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.entity +package jp.ac.osaka_u.sdl.nil.entity interface LCS { /** diff --git a/src/main/kotlin/io/github/t45k/nil/entity/NGram.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/NGram.kt similarity index 92% rename from src/main/kotlin/io/github/t45k/nil/entity/NGram.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/NGram.kt index 9deb3aa..943eb3f 100644 --- a/src/main/kotlin/io/github/t45k/nil/entity/NGram.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/NGram.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.entity +package jp.ac.osaka_u.sdl.nil.entity /** * NGram is a hash value of N-gram diff --git a/src/main/kotlin/io/github/t45k/nil/entity/NaiveLCS.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/NaiveLCS.kt similarity index 95% rename from src/main/kotlin/io/github/t45k/nil/entity/NaiveLCS.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/NaiveLCS.kt index af34d2a..f4dab79 100644 --- a/src/main/kotlin/io/github/t45k/nil/entity/NaiveLCS.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/NaiveLCS.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.entity +package jp.ac.osaka_u.sdl.nil.entity import kotlin.math.max diff --git a/src/main/kotlin/io/github/t45k/nil/entity/TokenSequence.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/TokenSequence.kt similarity index 87% rename from src/main/kotlin/io/github/t45k/nil/entity/TokenSequence.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/TokenSequence.kt index b698ea4..a62a274 100644 --- a/src/main/kotlin/io/github/t45k/nil/entity/TokenSequence.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/entity/TokenSequence.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.entity +package jp.ac.osaka_u.sdl.nil.entity /** * TokenSequence is a list of each token's hash value. diff --git a/src/main/kotlin/io/github/t45k/nil/presenter/logger/LoggerWrapper.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/logger/LoggerWrapper.kt similarity index 83% rename from src/main/kotlin/io/github/t45k/nil/presenter/logger/LoggerWrapper.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/logger/LoggerWrapper.kt index 2169a2f..a5380f2 100644 --- a/src/main/kotlin/io/github/t45k/nil/presenter/logger/LoggerWrapper.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/logger/LoggerWrapper.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.presenter.logger +package jp.ac.osaka_u.sdl.nil.presenter.logger interface LoggerWrapper { fun infoStart() diff --git a/src/main/kotlin/io/github/t45k/nil/presenter/logger/LoggerWrapperFactory.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/logger/LoggerWrapperFactory.kt similarity index 87% rename from src/main/kotlin/io/github/t45k/nil/presenter/logger/LoggerWrapperFactory.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/logger/LoggerWrapperFactory.kt index 2cc7b84..3cbf114 100644 --- a/src/main/kotlin/io/github/t45k/nil/presenter/logger/LoggerWrapperFactory.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/logger/LoggerWrapperFactory.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.presenter.logger +package jp.ac.osaka_u.sdl.nil.presenter.logger class LoggerWrapperFactory { companion object { diff --git a/src/main/kotlin/io/github/t45k/nil/presenter/logger/MFLoggerWrapper.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/logger/MFLoggerWrapper.kt similarity index 72% rename from src/main/kotlin/io/github/t45k/nil/presenter/logger/MFLoggerWrapper.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/logger/MFLoggerWrapper.kt index 4b5fd19..4bc8a03 100644 --- a/src/main/kotlin/io/github/t45k/nil/presenter/logger/MFLoggerWrapper.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/logger/MFLoggerWrapper.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.presenter.logger +package jp.ac.osaka_u.sdl.nil.presenter.logger /** * This class is for Mutation Framework (https://github.com/jeffsvajlenko/MutationInjectionFramework). @@ -6,10 +6,10 @@ package io.github.t45k.nil.presenter.logger * the tools' standard output must be only their output file name. */ class MFLoggerWrapper(private val outputFileName: String) : LoggerWrapper { - override fun infoStart() {} // NOP - override fun infoPreprocessCompletion(size: Int) {} // NOP - override fun infoInvertedIndexCreationCompletion(partition: Int) {} // NOP - override fun infoCloneDetectionCompletion(partition: Int) {} // NOP + override fun infoStart() {} /* no-op */ + override fun infoPreprocessCompletion(size: Int) {} /* no-op */ + override fun infoInvertedIndexCreationCompletion(partition: Int) {} /* no-op */ + override fun infoCloneDetectionCompletion(partition: Int) {} /* no-op */ override fun infoEnd(time: String) = print(outputFileName) } diff --git a/src/main/kotlin/io/github/t45k/nil/presenter/logger/NormalLoggerWrapper.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/logger/NormalLoggerWrapper.kt similarity index 94% rename from src/main/kotlin/io/github/t45k/nil/presenter/logger/NormalLoggerWrapper.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/logger/NormalLoggerWrapper.kt index 741c1b1..ed81fc7 100644 --- a/src/main/kotlin/io/github/t45k/nil/presenter/logger/NormalLoggerWrapper.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/logger/NormalLoggerWrapper.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.presenter.logger +package jp.ac.osaka_u.sdl.nil.presenter.logger import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/src/main/kotlin/io/github/t45k/nil/presenter/output/BCEFormat.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/output/BCEFormat.kt similarity index 93% rename from src/main/kotlin/io/github/t45k/nil/presenter/output/BCEFormat.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/output/BCEFormat.kt index cdc3178..68f6bcc 100644 --- a/src/main/kotlin/io/github/t45k/nil/presenter/output/BCEFormat.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/output/BCEFormat.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.presenter.output +package jp.ac.osaka_u.sdl.nil.presenter.output import java.io.File diff --git a/src/main/kotlin/io/github/t45k/nil/presenter/output/CSV.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/output/CSV.kt similarity index 85% rename from src/main/kotlin/io/github/t45k/nil/presenter/output/CSV.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/output/CSV.kt index e2ad89b..eec4566 100644 --- a/src/main/kotlin/io/github/t45k/nil/presenter/output/CSV.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/output/CSV.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.presenter.output +package jp.ac.osaka_u.sdl.nil.presenter.output /** * NIL's standard output format is "/path/to/file1,start_line1,end_line1,/path/to/file2,start_line2,end_line2", diff --git a/src/main/kotlin/io/github/t45k/nil/presenter/output/Format.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/output/Format.kt similarity index 83% rename from src/main/kotlin/io/github/t45k/nil/presenter/output/Format.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/output/Format.kt index 3b63156..5cf3d4f 100644 --- a/src/main/kotlin/io/github/t45k/nil/presenter/output/Format.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/output/Format.kt @@ -1,7 +1,7 @@ -package io.github.t45k.nil.presenter.output +package jp.ac.osaka_u.sdl.nil.presenter.output -import io.github.t45k.nil.NILMain -import io.github.t45k.nil.NILMain.Companion.CODE_BLOCK_FILE_NAME +import jp.ac.osaka_u.sdl.nil.NILMain +import jp.ac.osaka_u.sdl.nil.NILMain.Companion.CODE_BLOCK_FILE_NAME import java.io.File abstract class Format { diff --git a/src/main/kotlin/io/github/t45k/nil/presenter/output/FormatFactory.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/output/FormatFactory.kt similarity index 82% rename from src/main/kotlin/io/github/t45k/nil/presenter/output/FormatFactory.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/output/FormatFactory.kt index 4ba3671..d8a3a98 100644 --- a/src/main/kotlin/io/github/t45k/nil/presenter/output/FormatFactory.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/presenter/output/FormatFactory.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.presenter.output +package jp.ac.osaka_u.sdl.nil.presenter.output class FormatFactory { companion object { @@ -9,4 +9,4 @@ class FormatFactory { CSV() } } -} \ No newline at end of file +} diff --git a/src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/CloneDetection.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/CloneDetection.kt similarity index 77% rename from src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/CloneDetection.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/CloneDetection.kt index db5c50e..b12f39f 100644 --- a/src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/CloneDetection.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/CloneDetection.kt @@ -1,9 +1,9 @@ -package io.github.t45k.nil.usecase.cloneDetection +package jp.ac.osaka_u.sdl.nil.usecase.cloneDetection -import io.github.t45k.nil.entity.Id -import io.github.t45k.nil.entity.TokenSequence -import io.github.t45k.nil.entity.toNgrams import io.reactivex.rxjava3.core.Flowable +import jp.ac.osaka_u.sdl.nil.entity.Id +import jp.ac.osaka_u.sdl.nil.entity.TokenSequence +import jp.ac.osaka_u.sdl.nil.entity.toNgrams class CloneDetection( private val locatingPhase: Location, diff --git a/src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/Filtration.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/Filtration.kt similarity index 52% rename from src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/Filtration.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/Filtration.kt index 5071fb5..962e7e1 100644 --- a/src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/Filtration.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/Filtration.kt @@ -1,6 +1,6 @@ -package io.github.t45k.nil.usecase.cloneDetection +package jp.ac.osaka_u.sdl.nil.usecase.cloneDetection -import io.github.t45k.nil.entity.NGramInfo +import jp.ac.osaka_u.sdl.nil.entity.NGramInfo interface Filtration { fun filter(nGramSize: Int, cloneCandidate: Map.Entry): Boolean diff --git a/src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/LCSBasedVerification.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/LCSBasedVerification.kt similarity index 72% rename from src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/LCSBasedVerification.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/LCSBasedVerification.kt index f9acca9..96446a0 100644 --- a/src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/LCSBasedVerification.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/LCSBasedVerification.kt @@ -1,7 +1,7 @@ -package io.github.t45k.nil.usecase.cloneDetection +package jp.ac.osaka_u.sdl.nil.usecase.cloneDetection -import io.github.t45k.nil.entity.LCS -import io.github.t45k.nil.entity.TokenSequence +import jp.ac.osaka_u.sdl.nil.entity.LCS +import jp.ac.osaka_u.sdl.nil.entity.TokenSequence import kotlin.math.min class LCSBasedVerification(private val lcs: LCS, private val threshold: Int) : Verification { diff --git a/src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/Location.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/Location.kt similarity index 50% rename from src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/Location.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/Location.kt index 804bd06..5bde864 100644 --- a/src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/Location.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/Location.kt @@ -1,8 +1,8 @@ -package io.github.t45k.nil.usecase.cloneDetection +package jp.ac.osaka_u.sdl.nil.usecase.cloneDetection -import io.github.t45k.nil.entity.NGramInfo -import io.github.t45k.nil.entity.NGrams import io.reactivex.rxjava3.core.Flowable +import jp.ac.osaka_u.sdl.nil.entity.NGramInfo +import jp.ac.osaka_u.sdl.nil.entity.NGrams interface Location { fun locate(nGrams: NGrams, index: Int): Flowable> diff --git a/src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/NGramBasedFiltration.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/NGramBasedFiltration.kt similarity index 76% rename from src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/NGramBasedFiltration.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/NGramBasedFiltration.kt index 0623625..5bdff41 100644 --- a/src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/NGramBasedFiltration.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/NGramBasedFiltration.kt @@ -1,6 +1,6 @@ -package io.github.t45k.nil.usecase.cloneDetection +package jp.ac.osaka_u.sdl.nil.usecase.cloneDetection -import io.github.t45k.nil.entity.NGramInfo +import jp.ac.osaka_u.sdl.nil.entity.NGramInfo import kotlin.math.min class NGramBasedFiltration(private val threshold: Int) : Filtration { diff --git a/src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/NGramBasedLocation.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/NGramBasedLocation.kt similarity index 71% rename from src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/NGramBasedLocation.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/NGramBasedLocation.kt index 7b49141..4934cf8 100644 --- a/src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/NGramBasedLocation.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/NGramBasedLocation.kt @@ -1,10 +1,10 @@ -package io.github.t45k.nil.usecase.cloneDetection +package jp.ac.osaka_u.sdl.nil.usecase.cloneDetection -import io.github.t45k.nil.entity.InvertedIndex -import io.github.t45k.nil.entity.NGramInfo -import io.github.t45k.nil.entity.NGrams import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.kotlin.toFlowable +import jp.ac.osaka_u.sdl.nil.entity.InvertedIndex +import jp.ac.osaka_u.sdl.nil.entity.NGramInfo +import jp.ac.osaka_u.sdl.nil.entity.NGrams class NGramBasedLocation(private val invertedIndex: InvertedIndex) : Location { override fun locate(nGrams: NGrams, index: Int): Flowable> = diff --git a/src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/Verification.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/Verification.kt similarity index 52% rename from src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/Verification.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/Verification.kt index 76b813f..275b7c0 100644 --- a/src/main/kotlin/io/github/t45k/nil/usecase/cloneDetection/Verification.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/cloneDetection/Verification.kt @@ -1,6 +1,6 @@ -package io.github.t45k.nil.usecase.cloneDetection +package jp.ac.osaka_u.sdl.nil.usecase.cloneDetection -import io.github.t45k.nil.entity.TokenSequence +import jp.ac.osaka_u.sdl.nil.entity.TokenSequence interface Verification { fun verify(tokenSequence1: TokenSequence, tokenSequence2: TokenSequence): Boolean diff --git a/src/main/kotlin/io/github/t45k/nil/usecase/preprocess/JavaParser.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/JavaParser.kt similarity index 94% rename from src/main/kotlin/io/github/t45k/nil/usecase/preprocess/JavaParser.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/JavaParser.kt index e2b9739..86ebaf9 100644 --- a/src/main/kotlin/io/github/t45k/nil/usecase/preprocess/JavaParser.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/JavaParser.kt @@ -1,11 +1,11 @@ -package io.github.t45k.nil.usecase.preprocess +package jp.ac.osaka_u.sdl.nil.usecase.preprocess -import io.github.t45k.nil.NILConfig -import io.github.t45k.nil.entity.CodeBlock -import io.github.t45k.nil.util.LexicalAnalyzer import io.reactivex.rxjava3.core.BackpressureStrategy import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Observable +import jp.ac.osaka_u.sdl.nil.NILConfig +import jp.ac.osaka_u.sdl.nil.entity.CodeBlock +import jp.ac.osaka_u.sdl.nil.util.LexicalAnalyzer import org.eclipse.core.runtime.NullProgressMonitor import org.eclipse.jdt.core.JavaCore import org.eclipse.jdt.core.dom.AST.JLS14 diff --git a/src/main/kotlin/io/github/t45k/nil/usecase/preprocess/JavaPreprocess.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/JavaPreprocess.kt similarity index 81% rename from src/main/kotlin/io/github/t45k/nil/usecase/preprocess/JavaPreprocess.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/JavaPreprocess.kt index d99ff67..8044ab6 100644 --- a/src/main/kotlin/io/github/t45k/nil/usecase/preprocess/JavaPreprocess.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/JavaPreprocess.kt @@ -1,9 +1,9 @@ -package io.github.t45k.nil.usecase.preprocess +package jp.ac.osaka_u.sdl.nil.usecase.preprocess -import io.github.t45k.nil.NILConfig -import io.github.t45k.nil.entity.CodeBlock import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.kotlin.toFlowable +import jp.ac.osaka_u.sdl.nil.NILConfig +import jp.ac.osaka_u.sdl.nil.entity.CodeBlock import java.io.File class JavaPreprocess(private val config: NILConfig) : Preprocess(config.threads) { diff --git a/src/main/kotlin/io/github/t45k/nil/usecase/preprocess/Preprocess.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/Preprocess.kt similarity index 80% rename from src/main/kotlin/io/github/t45k/nil/usecase/preprocess/Preprocess.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/Preprocess.kt index 40e76a8..348810a 100644 --- a/src/main/kotlin/io/github/t45k/nil/usecase/preprocess/Preprocess.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/Preprocess.kt @@ -1,11 +1,11 @@ -package io.github.t45k.nil.usecase.preprocess +package jp.ac.osaka_u.sdl.nil.usecase.preprocess -import io.github.t45k.nil.NILMain.Companion.CODE_BLOCK_FILE_NAME -import io.github.t45k.nil.entity.CodeBlock -import io.github.t45k.nil.entity.TokenSequence -import io.github.t45k.nil.util.parallelIfSpecified import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.schedulers.Schedulers +import jp.ac.osaka_u.sdl.nil.NILMain.Companion.CODE_BLOCK_FILE_NAME +import jp.ac.osaka_u.sdl.nil.entity.CodeBlock +import jp.ac.osaka_u.sdl.nil.entity.TokenSequence +import jp.ac.osaka_u.sdl.nil.util.parallelIfSpecified import java.io.File /** diff --git a/src/main/kotlin/io/github/t45k/nil/usecase/preprocess/SymbolSeparator.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/SymbolSeparator.kt similarity index 90% rename from src/main/kotlin/io/github/t45k/nil/usecase/preprocess/SymbolSeparator.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/SymbolSeparator.kt index 74d94b1..8680aba 100644 --- a/src/main/kotlin/io/github/t45k/nil/usecase/preprocess/SymbolSeparator.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/SymbolSeparator.kt @@ -1,6 +1,6 @@ -package io.github.t45k.nil.usecase.preprocess +package jp.ac.osaka_u.sdl.nil.usecase.preprocess -import io.github.t45k.nil.entity.TokenSequence +import jp.ac.osaka_u.sdl.nil.entity.TokenSequence /** * This class converts a code blocks as a text into token sequence. diff --git a/src/main/kotlin/io/github/t45k/nil/util/LexicalAnalyzer.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/util/LexicalAnalyzer.kt similarity index 95% rename from src/main/kotlin/io/github/t45k/nil/util/LexicalAnalyzer.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/util/LexicalAnalyzer.kt index e76819e..8b6957b 100644 --- a/src/main/kotlin/io/github/t45k/nil/util/LexicalAnalyzer.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/util/LexicalAnalyzer.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.util +package jp.ac.osaka_u.sdl.nil.util import org.eclipse.jdt.core.ToolFactory import org.eclipse.jdt.core.compiler.ITerminalSymbols.TokenNameEOF diff --git a/src/main/kotlin/io/github/t45k/nil/util/ProgressMonitor.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/util/ProgressMonitor.kt similarity index 95% rename from src/main/kotlin/io/github/t45k/nil/util/ProgressMonitor.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/util/ProgressMonitor.kt index 97ac82d..80be3b9 100644 --- a/src/main/kotlin/io/github/t45k/nil/util/ProgressMonitor.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/util/ProgressMonitor.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.util +package jp.ac.osaka_u.sdl.nil.util import java.util.concurrent.atomic.AtomicInteger diff --git a/src/main/kotlin/io/github/t45k/nil/util/RxExtention.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/util/RxExtention.kt similarity index 88% rename from src/main/kotlin/io/github/t45k/nil/util/RxExtention.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/util/RxExtention.kt index c11bb1d..6f7c7f9 100644 --- a/src/main/kotlin/io/github/t45k/nil/util/RxExtention.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/util/RxExtention.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.util +package jp.ac.osaka_u.sdl.nil.util import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.parallel.ParallelFlowable diff --git a/src/main/kotlin/io/github/t45k/nil/util/Timer.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/util/Timer.kt similarity index 94% rename from src/main/kotlin/io/github/t45k/nil/util/Timer.kt rename to src/main/kotlin/jp/ac/osaka_u/sdl/nil/util/Timer.kt index d700029..4545c5f 100644 --- a/src/main/kotlin/io/github/t45k/nil/util/Timer.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/util/Timer.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.util +package jp.ac.osaka_u.sdl.nil.util /** * Transform milli seconds into XXhXXmXXs format. diff --git a/src/test/kotlin/io/github/t45k/nil/NILConfigTest.kt b/src/test/kotlin/jp/ac/osaka_u/sdl/nil/NILConfigTest.kt similarity index 92% rename from src/test/kotlin/io/github/t45k/nil/NILConfigTest.kt rename to src/test/kotlin/jp/ac/osaka_u/sdl/nil/NILConfigTest.kt index 7d4f396..01a0631 100644 --- a/src/test/kotlin/io/github/t45k/nil/NILConfigTest.kt +++ b/src/test/kotlin/jp/ac/osaka_u/sdl/nil/NILConfigTest.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil +package jp.ac.osaka_u.sdl.nil import kotlin.test.Test import kotlin.test.assertFailsWith diff --git a/src/test/kotlin/io/github/t45k/nil/NILMainTest.kt b/src/test/kotlin/jp/ac/osaka_u/sdl/nil/NILMainTest.kt similarity index 96% rename from src/test/kotlin/io/github/t45k/nil/NILMainTest.kt rename to src/test/kotlin/jp/ac/osaka_u/sdl/nil/NILMainTest.kt index bab1d15..19ba360 100644 --- a/src/test/kotlin/io/github/t45k/nil/NILMainTest.kt +++ b/src/test/kotlin/jp/ac/osaka_u/sdl/nil/NILMainTest.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil +package jp.ac.osaka_u.sdl.nil import java.io.File import kotlin.test.Test diff --git a/src/test/kotlin/io/github/t45k/nil/util/TimerKtTest.kt b/src/test/kotlin/jp/ac/osaka_u/sdl/nil/util/TimerKtTest.kt similarity index 89% rename from src/test/kotlin/io/github/t45k/nil/util/TimerKtTest.kt rename to src/test/kotlin/jp/ac/osaka_u/sdl/nil/util/TimerKtTest.kt index 8ae9dd8..a362459 100644 --- a/src/test/kotlin/io/github/t45k/nil/util/TimerKtTest.kt +++ b/src/test/kotlin/jp/ac/osaka_u/sdl/nil/util/TimerKtTest.kt @@ -1,4 +1,4 @@ -package io.github.t45k.nil.util +package jp.ac.osaka_u.sdl.nil.util import kotlin.test.Test import kotlin.test.assertEquals From a44ec1ade0637a690db7dc3c0e37341f0dcd118d Mon Sep 17 00:00:00 2001 From: T45K Date: Sat, 30 Jan 2021 22:22:54 +0900 Subject: [PATCH 2/5] rename --- .../kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt | 18 +++++++++--------- .../kotlin/jp/ac/osaka_u/sdl/nil/NILMain.kt | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt index 2a87012..a74d192 100644 --- a/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt @@ -8,8 +8,8 @@ data class NILConfig( val minToken: Int = 50, val gramSize: Int = 5, val partitionNum: Int = 10, - val filteringThreshold: Int = 10, - val verifyingThreshold: Int = 70, + val filtrationThreshold: Int = 10, + val verificationiThreshold: Int = 70, val outputFileName: String = "result.csv", val threads: Int = 0, val isForBigCloneEval: Boolean = false, @@ -22,8 +22,8 @@ fun parseArgs(args: Array): NILConfig { var minToken = 50 var gramSize = 5 var partitionNum = 10 - var filteringThreshold = 10 - var verifyingThreshold = 70 + var filtrationThreshold = 10 + var verificationThreshold = 70 var outputFileName: String? = null var threads = 0 var isForBigCloneEval = false @@ -37,8 +37,8 @@ fun parseArgs(args: Array): NILConfig { "-mit", "--min-token" -> minToken = iterator.next().toIntOrException(optionName) "-n", "--n-gram" -> gramSize = iterator.next().toIntOrException(optionName) "-p", "--partition-number" -> partitionNum = iterator.next().toIntOrException(optionName) - "-f", "--filtering-threshold" -> filteringThreshold = iterator.next().toIntOrException(optionName) - "-v", "--verifying-threshold" -> verifyingThreshold = iterator.next().toIntOrException(optionName) + "-f", "--filtering-threshold" -> filtrationThreshold = iterator.next().toIntOrException(optionName) + "-v", "--verifying-threshold" -> verificationThreshold = iterator.next().toIntOrException(optionName) "-o", "--output" -> outputFileName = iterator.next() "-t", "--threads" -> threads = iterator.next().toInt() "-bce", "--bigcloneeval" -> isForBigCloneEval = true @@ -57,9 +57,9 @@ fun parseArgs(args: Array): NILConfig { minToken, gramSize, partitionNum, - filteringThreshold, - verifyingThreshold, - outputFileName ?: "result_${gramSize}_${filteringThreshold}_${verifyingThreshold}.csv", + filtrationThreshold, + verificationThreshold, + outputFileName ?: "result_${gramSize}_${filtrationThreshold}_${verificationThreshold}.csv", threads, isForBigCloneEval, isForMutationInjectionFramework, diff --git a/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILMain.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILMain.kt index 7a7168b..d02f532 100644 --- a/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILMain.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILMain.kt @@ -33,8 +33,8 @@ class NILMain(private val config: NILConfig) { logger.infoPreprocessCompletion(tokenSequences.size) val partitionSize = (tokenSequences.size + config.partitionNum - 1) / config.partitionNum - val filteringPhase = NGramBasedFiltration(config.filteringThreshold) - val verifyingPhase = LCSBasedVerification(HuntSzymanskiLCS(), config.verifyingThreshold) + val filtrationPhase = NGramBasedFiltration(config.filtrationThreshold) + val verificationPhase = LCSBasedVerification(HuntSzymanskiLCS(), config.verificationiThreshold) File(CLONE_PAIR_FILE_NAME).bufferedWriter().use { bw -> repeat(config.partitionNum) { i -> @@ -44,9 +44,9 @@ class NILMain(private val config: NILConfig) { InvertedIndex.create(partitionSize, config.gramSize, tokenSequences, startIndex) logger.infoInvertedIndexCreationCompletion(i + 1) - val locatingPhase = NGramBasedLocation(invertedIndex) + val locationPhase = NGramBasedLocation(invertedIndex) val cloneDetection = - CloneDetection(locatingPhase, filteringPhase, verifyingPhase, tokenSequences, config.gramSize) + CloneDetection(locationPhase, filtrationPhase, verificationPhase, tokenSequences, config.gramSize) Flowable.range(startIndex + 1, tokenSequences.size - startIndex - 1) .parallelIfSpecified(config.threads) .runOn(Schedulers.computation()) From bc6d113d95164f9621a8a6d51f233ba5ecb80213 Mon Sep 17 00:00:00 2001 From: T45K Date: Sat, 30 Jan 2021 22:23:08 +0900 Subject: [PATCH 3/5] fix --- src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt | 2 +- src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILMain.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt index a74d192..8e93a5b 100644 --- a/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt @@ -9,7 +9,7 @@ data class NILConfig( val gramSize: Int = 5, val partitionNum: Int = 10, val filtrationThreshold: Int = 10, - val verificationiThreshold: Int = 70, + val verificationThreshold: Int = 70, val outputFileName: String = "result.csv", val threads: Int = 0, val isForBigCloneEval: Boolean = false, diff --git a/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILMain.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILMain.kt index d02f532..e42a83e 100644 --- a/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILMain.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILMain.kt @@ -34,7 +34,7 @@ class NILMain(private val config: NILConfig) { val partitionSize = (tokenSequences.size + config.partitionNum - 1) / config.partitionNum val filtrationPhase = NGramBasedFiltration(config.filtrationThreshold) - val verificationPhase = LCSBasedVerification(HuntSzymanskiLCS(), config.verificationiThreshold) + val verificationPhase = LCSBasedVerification(HuntSzymanskiLCS(), config.verificationThreshold) File(CLONE_PAIR_FILE_NAME).bufferedWriter().use { bw -> repeat(config.partitionNum) { i -> From e29ef36b46fd6c4c6de7fd5bf06f2c1eefe89b22 Mon Sep 17 00:00:00 2001 From: T45K Date: Sat, 30 Jan 2021 22:24:43 +0900 Subject: [PATCH 4/5] change options --- src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt index 8e93a5b..8b156c5 100644 --- a/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/NILConfig.kt @@ -37,8 +37,8 @@ fun parseArgs(args: Array): NILConfig { "-mit", "--min-token" -> minToken = iterator.next().toIntOrException(optionName) "-n", "--n-gram" -> gramSize = iterator.next().toIntOrException(optionName) "-p", "--partition-number" -> partitionNum = iterator.next().toIntOrException(optionName) - "-f", "--filtering-threshold" -> filtrationThreshold = iterator.next().toIntOrException(optionName) - "-v", "--verifying-threshold" -> verificationThreshold = iterator.next().toIntOrException(optionName) + "-f", "--filtration-threshold" -> filtrationThreshold = iterator.next().toIntOrException(optionName) + "-v", "--verification-threshold" -> verificationThreshold = iterator.next().toIntOrException(optionName) "-o", "--output" -> outputFileName = iterator.next() "-t", "--threads" -> threads = iterator.next().toInt() "-bce", "--bigcloneeval" -> isForBigCloneEval = true @@ -81,10 +81,10 @@ class InvalidOptionException(private val option: String) : RuntimeException() { |-mit, --min-token${'\t'}${'\t'}${'\t'}Minimum token (default: 50) |-n, --n-gram${'\t'}${'\t'}${'\t'}${'\t'}N of N-gram (default: 5) |-p, --partition-number${'\t'}${'\t'}${'\t'}The number of partition (default: 10) - |-f, --filtering-threshold${'\t'}${'\t'}Filtering threshold (default: 10%) - |-v, --verifying-threshold${'\t'}${'\t'}Verifying threshold (default: 70%) + |-f, --filtration-threshold${'\t'}${'\t'}Filtration threshold (default: 10%) + |-v, --verification-threshold${'\t'}${'\t'}Verification threshold (default: 70%) |-o, --output${'\t'}${'\t'}${'\t'}${'\t'}Output file name (default: result_{N-gram}_{filtering_threshold}_{verifying_threshold}.csv) - |-t, --thrads${'\t'}${'\t'}${'\t'}${'\t'}The number of threads used for parallel execution (default: all threads) + |-t, --threads${'\t'}${'\t'}${'\t'}${'\t'}The number of threads used for parallel execution (default: all threads) |-bce, --bigcloneeval${'\t'}${'\t'}${'\t'}Output result feasible to BigCloneEval (default: false) |-mif, --mutationinjectionframework${'\t'}Output result feasible to MutationInjectionFramework (default: false) """.trimMargin() From 073bb9fa1f5ac48fe75465c499fb081095521d74 Mon Sep 17 00:00:00 2001 From: T45K Date: Sat, 30 Jan 2021 22:36:52 +0900 Subject: [PATCH 5/5] modify --- .../sdl/nil/usecase/preprocess/JavaParser.kt | 22 +++++++++---------- .../jp/ac/osaka_u/sdl/nil/NILMainTest.kt | 9 ++++---- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/JavaParser.kt b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/JavaParser.kt index 86ebaf9..dd4dc78 100644 --- a/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/JavaParser.kt +++ b/src/main/kotlin/jp/ac/osaka_u/sdl/nil/usecase/preprocess/JavaParser.kt @@ -33,18 +33,16 @@ class JavaParser(private val tokenizer: (String) -> List, private val confi val fileName = sourceFile.canonicalPath object : ASTVisitor() { - override fun visit(node: MethodDeclaration?): Boolean { - node?.also { - val startLine = if (it.javadoc == null) { - compilationUnit.getLineNumber(it.startPosition) - } else { - compilationUnit.getLineNumber(node.getNodeNextToJavaDoc().startPosition) - } - val endLine = compilationUnit.getLineNumber(it.startPosition + it.length) - it.javadoc = null - if (endLine - startLine + 1 >= config.minLine && LexicalAnalyzer.countTokens(it.toString()) >= config.minToken) { - emitter.onNext(CodeBlock(fileName, startLine, endLine, tokenizer(it.toString()))) - } + override fun visit(node: MethodDeclaration): Boolean { + val startLine = if (node.javadoc == null) { + compilationUnit.getLineNumber(node.startPosition) + } else { + compilationUnit.getLineNumber(node.getNodeNextToJavaDoc().startPosition) + } + val endLine = compilationUnit.getLineNumber(node.startPosition + node.length) + node.javadoc = null + if (endLine - startLine + 1 >= config.minLine && LexicalAnalyzer.countTokens(node.toString()) >= config.minToken) { + emitter.onNext(CodeBlock(fileName, startLine, endLine, tokenizer(node.toString()))) } return false } diff --git a/src/test/kotlin/jp/ac/osaka_u/sdl/nil/NILMainTest.kt b/src/test/kotlin/jp/ac/osaka_u/sdl/nil/NILMainTest.kt index 19ba360..5bdb724 100644 --- a/src/test/kotlin/jp/ac/osaka_u/sdl/nil/NILMainTest.kt +++ b/src/test/kotlin/jp/ac/osaka_u/sdl/nil/NILMainTest.kt @@ -8,15 +8,16 @@ internal class NILMainTest { @Test fun test() { - val config = parseArgs(arrayOf("-s", "./src/test/resources/examples", "-bce", "-t", "1")) + val config = parseArgs(arrayOf("-s", "./src/test/resources/examples", "-bce", "-t", "1", "-p", "1")) NILMain(config).run() val outputFile = File(config.outputFileName) - val result = "examples,LargeGapClones.java,3,14,examples,LargeGapClones.java,16,39" + + val result = "examples,AssertContainClones.java,2,27,examples,AssertContainClones.java,30,55" + System.lineSeparator() + - "examples,AssertContainClones.java,2,27,examples,AssertContainClones.java,30,55" + + "examples,LargeGapClones.java,3,14,examples,LargeGapClones.java,16,39" + System.lineSeparator() + - "examples,LargeVarianceClones.java,3,21,examples,LargeVarianceClones.java,23,54\n" + "examples,LargeVarianceClones.java,3,21,examples,LargeVarianceClones.java,23,54" + + System.lineSeparator() assertEquals(result, outputFile.readText()) outputFile.delete()