mirror of
https://github.com/Stypox/dicio-android.git
synced 2026-02-20 04:30:50 +08:00
Rename standard/helper to standard/util
This commit is contained in:
parent
d9d89d2012
commit
60349aefdc
@ -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
|
||||
|
||||
@ -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<out T>(
|
||||
val specificity: Specificity,
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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<Construct>
|
||||
|
||||
@ -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<StandardScore>, helper: MatchHelper)
|
||||
|
||||
@ -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<StandardScore>, helper: MatchHelper) {
|
||||
|
||||
@ -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<Construct>
|
||||
|
||||
@ -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(
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.dicio.skill.standard.helper
|
||||
package org.dicio.skill.standard.util
|
||||
|
||||
data class MatchHelper(
|
||||
val userInput: String,
|
||||
@ -1,4 +1,4 @@
|
||||
package org.dicio.skill.standard.helper
|
||||
package org.dicio.skill.standard.util
|
||||
|
||||
import org.dicio.skill.standard.StandardScore
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package org.dicio.skill.standard.helper
|
||||
package org.dicio.skill.standard.util
|
||||
|
||||
interface Token {
|
||||
/**
|
||||
@ -1,4 +1,4 @@
|
||||
package org.dicio.skill.standard.helper
|
||||
package org.dicio.skill.standard.util
|
||||
|
||||
import java.text.Normalizer
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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" {
|
||||
|
||||
@ -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({
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user