From 60349aefdc230644fc72921ef255eb3649880883 Mon Sep 17 00:00:00 2001 From: Stypox Date: Tue, 4 Jun 2024 11:45:03 +0200 Subject: [PATCH] Rename standard/helper to standard/util --- app/src/main/kotlin/org/stypox/dicio/util/StringUtils.kt | 2 +- .../java/org/dicio/skill/standard/StandardRecognizerData.kt | 4 ++-- .../org/dicio/skill/standard/construct/CapturingConstruct.kt | 4 ++-- .../org/dicio/skill/standard/construct/CompositeConstruct.kt | 4 ++-- .../main/java/org/dicio/skill/standard/construct/Construct.kt | 2 +- .../org/dicio/skill/standard/construct/OptionalConstruct.kt | 2 +- .../java/org/dicio/skill/standard/construct/OrConstruct.kt | 4 ++-- .../java/org/dicio/skill/standard/construct/WordConstruct.kt | 4 ++-- .../org/dicio/skill/standard/{helper => util}/MatchHelper.kt | 2 +- .../org/dicio/skill/standard/{helper => util}/MemToEnd.kt | 2 +- .../java/org/dicio/skill/standard/{helper => util}/Token.kt | 2 +- .../org/dicio/skill/standard/{helper => util}/Tokenizers.kt | 2 +- .../test/java/org/dicio/skill/old_standard/SentenceTest.kt | 2 +- .../test/java/org/dicio/skill/old_standard/WordExtractor.kt | 2 +- .../skill/old_standard/word/DiacriticsInsensitiveWordTest.kt | 2 +- skill/src/test/java/org/dicio/skill/util/WordExtractorTest.kt | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) rename skill/src/main/java/org/dicio/skill/standard/{helper => util}/MatchHelper.kt (94%) rename skill/src/main/java/org/dicio/skill/standard/{helper => util}/MemToEnd.kt (94%) rename skill/src/main/java/org/dicio/skill/standard/{helper => util}/Token.kt (88%) rename skill/src/main/java/org/dicio/skill/standard/{helper => util}/Tokenizers.kt (98%) diff --git a/app/src/main/kotlin/org/stypox/dicio/util/StringUtils.kt b/app/src/main/kotlin/org/stypox/dicio/util/StringUtils.kt index 761a25fe..7ef89bd9 100644 --- a/app/src/main/kotlin/org/stypox/dicio/util/StringUtils.kt +++ b/app/src/main/kotlin/org/stypox/dicio/util/StringUtils.kt @@ -1,6 +1,6 @@ package org.stypox.dicio.util -import org.dicio.skill.standard.helper.nfkdNormalizeWord +import org.dicio.skill.standard.util.nfkdNormalizeWord import java.util.Locale import java.util.regex.Pattern import kotlin.math.max diff --git a/skill/src/main/java/org/dicio/skill/standard/StandardRecognizerData.kt b/skill/src/main/java/org/dicio/skill/standard/StandardRecognizerData.kt index 2365577c..6207d938 100644 --- a/skill/src/main/java/org/dicio/skill/standard/StandardRecognizerData.kt +++ b/skill/src/main/java/org/dicio/skill/standard/StandardRecognizerData.kt @@ -2,8 +2,8 @@ package org.dicio.skill.standard import org.dicio.skill.skill.Specificity import org.dicio.skill.standard.construct.Construct -import org.dicio.skill.standard.helper.MatchHelper -import org.dicio.skill.standard.helper.initialMemToEnd +import org.dicio.skill.standard.util.MatchHelper +import org.dicio.skill.standard.util.initialMemToEnd open class StandardRecognizerData( val specificity: Specificity, diff --git a/skill/src/main/java/org/dicio/skill/standard/construct/CapturingConstruct.kt b/skill/src/main/java/org/dicio/skill/standard/construct/CapturingConstruct.kt index 21f1ab42..5bab5fd5 100644 --- a/skill/src/main/java/org/dicio/skill/standard/construct/CapturingConstruct.kt +++ b/skill/src/main/java/org/dicio/skill/standard/construct/CapturingConstruct.kt @@ -2,8 +2,8 @@ package org.dicio.skill.standard.construct import org.dicio.skill.standard.StandardScore import org.dicio.skill.standard.capture.StringRangeCapture -import org.dicio.skill.standard.helper.MatchHelper -import org.dicio.skill.standard.helper.normalizeMemToEnd +import org.dicio.skill.standard.util.MatchHelper +import org.dicio.skill.standard.util.normalizeMemToEnd data class CapturingConstruct( private val name: String, diff --git a/skill/src/main/java/org/dicio/skill/standard/construct/CompositeConstruct.kt b/skill/src/main/java/org/dicio/skill/standard/construct/CompositeConstruct.kt index dba67772..c1b13cf1 100644 --- a/skill/src/main/java/org/dicio/skill/standard/construct/CompositeConstruct.kt +++ b/skill/src/main/java/org/dicio/skill/standard/construct/CompositeConstruct.kt @@ -1,8 +1,8 @@ package org.dicio.skill.standard.construct import org.dicio.skill.standard.StandardScore -import org.dicio.skill.standard.helper.MatchHelper -import org.dicio.skill.standard.helper.normalizeMemToEnd +import org.dicio.skill.standard.util.MatchHelper +import org.dicio.skill.standard.util.normalizeMemToEnd data class CompositeConstruct( private val constructs: List diff --git a/skill/src/main/java/org/dicio/skill/standard/construct/Construct.kt b/skill/src/main/java/org/dicio/skill/standard/construct/Construct.kt index cc98a1d0..49fcac97 100644 --- a/skill/src/main/java/org/dicio/skill/standard/construct/Construct.kt +++ b/skill/src/main/java/org/dicio/skill/standard/construct/Construct.kt @@ -1,7 +1,7 @@ package org.dicio.skill.standard.construct import org.dicio.skill.standard.StandardScore -import org.dicio.skill.standard.helper.MatchHelper +import org.dicio.skill.standard.util.MatchHelper interface Construct { fun matchToEnd(memToEnd: Array, helper: MatchHelper) diff --git a/skill/src/main/java/org/dicio/skill/standard/construct/OptionalConstruct.kt b/skill/src/main/java/org/dicio/skill/standard/construct/OptionalConstruct.kt index af0b0529..23c1be6f 100644 --- a/skill/src/main/java/org/dicio/skill/standard/construct/OptionalConstruct.kt +++ b/skill/src/main/java/org/dicio/skill/standard/construct/OptionalConstruct.kt @@ -1,7 +1,7 @@ package org.dicio.skill.standard.construct import org.dicio.skill.standard.StandardScore -import org.dicio.skill.standard.helper.MatchHelper +import org.dicio.skill.standard.util.MatchHelper class OptionalConstruct : Construct { override fun matchToEnd(memToEnd: Array, helper: MatchHelper) { diff --git a/skill/src/main/java/org/dicio/skill/standard/construct/OrConstruct.kt b/skill/src/main/java/org/dicio/skill/standard/construct/OrConstruct.kt index 40254df8..340dea7b 100644 --- a/skill/src/main/java/org/dicio/skill/standard/construct/OrConstruct.kt +++ b/skill/src/main/java/org/dicio/skill/standard/construct/OrConstruct.kt @@ -1,8 +1,8 @@ package org.dicio.skill.standard.construct import org.dicio.skill.standard.StandardScore -import org.dicio.skill.standard.helper.MatchHelper -import org.dicio.skill.standard.helper.normalizeMemToEnd +import org.dicio.skill.standard.util.MatchHelper +import org.dicio.skill.standard.util.normalizeMemToEnd data class OrConstruct( private val constructs: List diff --git a/skill/src/main/java/org/dicio/skill/standard/construct/WordConstruct.kt b/skill/src/main/java/org/dicio/skill/standard/construct/WordConstruct.kt index 911594c9..3a078154 100644 --- a/skill/src/main/java/org/dicio/skill/standard/construct/WordConstruct.kt +++ b/skill/src/main/java/org/dicio/skill/standard/construct/WordConstruct.kt @@ -1,8 +1,8 @@ package org.dicio.skill.standard.construct import org.dicio.skill.standard.StandardScore -import org.dicio.skill.standard.helper.MatchHelper -import org.dicio.skill.standard.helper.normalizeMemToEnd +import org.dicio.skill.standard.util.MatchHelper +import org.dicio.skill.standard.util.normalizeMemToEnd data class WordConstruct( diff --git a/skill/src/main/java/org/dicio/skill/standard/helper/MatchHelper.kt b/skill/src/main/java/org/dicio/skill/standard/util/MatchHelper.kt similarity index 94% rename from skill/src/main/java/org/dicio/skill/standard/helper/MatchHelper.kt rename to skill/src/main/java/org/dicio/skill/standard/util/MatchHelper.kt index 264a6242..2da7e835 100644 --- a/skill/src/main/java/org/dicio/skill/standard/helper/MatchHelper.kt +++ b/skill/src/main/java/org/dicio/skill/standard/util/MatchHelper.kt @@ -1,4 +1,4 @@ -package org.dicio.skill.standard.helper +package org.dicio.skill.standard.util data class MatchHelper( val userInput: String, diff --git a/skill/src/main/java/org/dicio/skill/standard/helper/MemToEnd.kt b/skill/src/main/java/org/dicio/skill/standard/util/MemToEnd.kt similarity index 94% rename from skill/src/main/java/org/dicio/skill/standard/helper/MemToEnd.kt rename to skill/src/main/java/org/dicio/skill/standard/util/MemToEnd.kt index 21535356..8d18ad75 100644 --- a/skill/src/main/java/org/dicio/skill/standard/helper/MemToEnd.kt +++ b/skill/src/main/java/org/dicio/skill/standard/util/MemToEnd.kt @@ -1,4 +1,4 @@ -package org.dicio.skill.standard.helper +package org.dicio.skill.standard.util import org.dicio.skill.standard.StandardScore diff --git a/skill/src/main/java/org/dicio/skill/standard/helper/Token.kt b/skill/src/main/java/org/dicio/skill/standard/util/Token.kt similarity index 88% rename from skill/src/main/java/org/dicio/skill/standard/helper/Token.kt rename to skill/src/main/java/org/dicio/skill/standard/util/Token.kt index e6b06ff8..27b4b253 100644 --- a/skill/src/main/java/org/dicio/skill/standard/helper/Token.kt +++ b/skill/src/main/java/org/dicio/skill/standard/util/Token.kt @@ -1,4 +1,4 @@ -package org.dicio.skill.standard.helper +package org.dicio.skill.standard.util interface Token { /** diff --git a/skill/src/main/java/org/dicio/skill/standard/helper/Tokenizers.kt b/skill/src/main/java/org/dicio/skill/standard/util/Tokenizers.kt similarity index 98% rename from skill/src/main/java/org/dicio/skill/standard/helper/Tokenizers.kt rename to skill/src/main/java/org/dicio/skill/standard/util/Tokenizers.kt index 0443f732..61e813f1 100644 --- a/skill/src/main/java/org/dicio/skill/standard/helper/Tokenizers.kt +++ b/skill/src/main/java/org/dicio/skill/standard/util/Tokenizers.kt @@ -1,4 +1,4 @@ -package org.dicio.skill.standard.helper +package org.dicio.skill.standard.util import java.text.Normalizer diff --git a/skill/src/test/java/org/dicio/skill/old_standard/SentenceTest.kt b/skill/src/test/java/org/dicio/skill/old_standard/SentenceTest.kt index b8298a82..9c4a109c 100644 --- a/skill/src/test/java/org/dicio/skill/old_standard/SentenceTest.kt +++ b/skill/src/test/java/org/dicio/skill/old_standard/SentenceTest.kt @@ -15,7 +15,7 @@ import org.dicio.skill.old_standard_impl.word.DiacriticsInsensitiveWord import org.dicio.skill.old_standard_impl.word.DiacriticsSensitiveWord import org.dicio.skill.old_standard.WordExtractor.extractWords import org.dicio.skill.old_standard.WordExtractor.normalizeWords -import org.dicio.skill.standard.helper.nfkdNormalizeWord +import org.dicio.skill.standard.util.nfkdNormalizeWord private const val FLOAT_EQUALS_DELTA: Float = 0.0001f diff --git a/skill/src/test/java/org/dicio/skill/old_standard/WordExtractor.kt b/skill/src/test/java/org/dicio/skill/old_standard/WordExtractor.kt index 3ad752dd..bd915cd4 100644 --- a/skill/src/test/java/org/dicio/skill/old_standard/WordExtractor.kt +++ b/skill/src/test/java/org/dicio/skill/old_standard/WordExtractor.kt @@ -1,6 +1,6 @@ package org.dicio.skill.old_standard -import org.dicio.skill.standard.helper.nfkdNormalizeWord +import org.dicio.skill.standard.util.nfkdNormalizeWord import java.util.regex.Pattern object WordExtractor { diff --git a/skill/src/test/java/org/dicio/skill/old_standard/word/DiacriticsInsensitiveWordTest.kt b/skill/src/test/java/org/dicio/skill/old_standard/word/DiacriticsInsensitiveWordTest.kt index 566048a7..6b82572d 100644 --- a/skill/src/test/java/org/dicio/skill/old_standard/word/DiacriticsInsensitiveWordTest.kt +++ b/skill/src/test/java/org/dicio/skill/old_standard/word/DiacriticsInsensitiveWordTest.kt @@ -5,7 +5,7 @@ import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.booleans.shouldBeFalse import io.kotest.matchers.booleans.shouldBeTrue import org.dicio.skill.old_standard_impl.word.DiacriticsInsensitiveWord -import org.dicio.skill.standard.helper.nfkdNormalizeWord +import org.dicio.skill.standard.util.nfkdNormalizeWord class DiacriticsInsensitiveWordTest : StringSpec({ "matches" { diff --git a/skill/src/test/java/org/dicio/skill/util/WordExtractorTest.kt b/skill/src/test/java/org/dicio/skill/util/WordExtractorTest.kt index e45cc98a..be28b911 100644 --- a/skill/src/test/java/org/dicio/skill/util/WordExtractorTest.kt +++ b/skill/src/test/java/org/dicio/skill/util/WordExtractorTest.kt @@ -7,7 +7,7 @@ import org.dicio.skill.old_standard_impl.InputWordRange import org.dicio.skill.old_standard.WordExtractor.extractCapturingGroup import org.dicio.skill.old_standard.WordExtractor.extractWords import org.dicio.skill.old_standard.WordExtractor.normalizeWords -import org.dicio.skill.standard.helper.nfkdNormalizeWord +import org.dicio.skill.standard.util.nfkdNormalizeWord class WordExtractorTest : StringSpec({