From 1a4f4726741b394cd0e18985f06e5d27f8b9bd64 Mon Sep 17 00:00:00 2001 From: Rocky Madden Date: Fri, 3 Jan 2014 20:27:06 -0700 Subject: Final clean up. --- .../com/rockymadden/stringmetric/Algorithm.scala | 10 ++++---- .../com/rockymadden/stringmetric/Metric.scala | 28 +++++++++++----------- .../com/rockymadden/stringmetric/Transform.scala | 18 +++++++------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/core/src/main/scala/com/rockymadden/stringmetric/Algorithm.scala b/core/src/main/scala/com/rockymadden/stringmetric/Algorithm.scala index 84f136d..71796d7 100755 --- a/core/src/main/scala/com/rockymadden/stringmetric/Algorithm.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/Algorithm.scala @@ -15,11 +15,11 @@ object Algorithm { object StringAlgorithm { - final val Metaphone = phonetic.MetaphoneAlgorithm - final val Nysiis = phonetic.NysiisAlgorithm - final val RefinedNysiis = phonetic.RefinedNysiisAlgorithm - final val RefinedSoundex = phonetic.RefinedSoundexAlgorithm - final val Soundex = phonetic.SoundexAlgorithm + val Metaphone = phonetic.MetaphoneAlgorithm + val Nysiis = phonetic.NysiisAlgorithm + val RefinedNysiis = phonetic.RefinedNysiisAlgorithm + val RefinedSoundex = phonetic.RefinedSoundexAlgorithm + val Soundex = phonetic.SoundexAlgorithm def computeWithMetaphone(a: Array[Char]) = Metaphone.compute(a) diff --git a/core/src/main/scala/com/rockymadden/stringmetric/Metric.scala b/core/src/main/scala/com/rockymadden/stringmetric/Metric.scala index f45dd14..b48da74 100755 --- a/core/src/main/scala/com/rockymadden/stringmetric/Metric.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/Metric.scala @@ -15,20 +15,20 @@ object Metric { object StringMetric { - final val DiceSorensen = similarity.DiceSorensenMetric - final val Hamming = similarity.HammingMetric - final val Jaccard = similarity.JaccardMetric - final val Jaro = similarity.JaroMetric - final val JaroWinkler = similarity.JaroWinklerMetric - final val Levenshtein = similarity.LevenshteinMetric - final val Metaphone = phonetic.MetaphoneMetric - final val NGram = similarity.NGramMetric - final val Nysiis = phonetic.NysiisMetric - final val Overlap = similarity.OverlapMetric - final val RefinedNysiis = phonetic.RefinedNysiisMetric - final val RefinedSoundex = phonetic.RefinedSoundexMetric - final val Soundex = phonetic.SoundexMetric - final val WeightedLevenshtein = similarity.WeightedLevenshteinMetric + val DiceSorensen = similarity.DiceSorensenMetric + val Hamming = similarity.HammingMetric + val Jaccard = similarity.JaccardMetric + val Jaro = similarity.JaroMetric + val JaroWinkler = similarity.JaroWinklerMetric + val Levenshtein = similarity.LevenshteinMetric + val Metaphone = phonetic.MetaphoneMetric + val NGram = similarity.NGramMetric + val Nysiis = phonetic.NysiisMetric + val Overlap = similarity.OverlapMetric + val RefinedNysiis = phonetic.RefinedNysiisMetric + val RefinedSoundex = phonetic.RefinedSoundexMetric + val Soundex = phonetic.SoundexMetric + val WeightedLevenshtein = similarity.WeightedLevenshteinMetric def compareWithDiceSorensen(n: Int)(a: Array[Char], b: Array[Char]) = DiceSorensen(n).compare(a, b) diff --git a/core/src/main/scala/com/rockymadden/stringmetric/Transform.scala b/core/src/main/scala/com/rockymadden/stringmetric/Transform.scala index c2cdace..de9e71f 100644 --- a/core/src/main/scala/com/rockymadden/stringmetric/Transform.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/Transform.scala @@ -9,17 +9,17 @@ object Transform { object StringTransform { - private final val Ascii = NumericRange(0x00, 0x7F, 1) - private final val ExtendedAscii = NumericRange(0x00, 0x7F, 1) - private final val Latin = NumericRange(0x00, 0x24F, 1) - private final val LowerCase = NumericRange(0x61, 0x7A, 1) - private final val Numbers = NumericRange(0x30, 0x39, 1) - private final val UpperCase = NumericRange(0x41, 0x5A, 1) - - private final val filter: ((Array[Char], (Char => Boolean)) => String) = (ca, f) => + private val Ascii = NumericRange(0x00, 0x7F, 1) + private val ExtendedAscii = NumericRange(0x00, 0x7F, 1) + private val Latin = NumericRange(0x00, 0x24F, 1) + private val LowerCase = NumericRange(0x61, 0x7A, 1) + private val Numbers = NumericRange(0x30, 0x39, 1) + private val UpperCase = NumericRange(0x41, 0x5A, 1) + + private val filter: ((Array[Char], (Char => Boolean)) => String) = (ca, f) => ca.filter(c => f(c)).mkString - private final val filterNot: ((Array[Char], (Char => Boolean)) => String) = (ca, f) => + private val filterNot: ((Array[Char], (Char => Boolean)) => String) = (ca, f) => ca.filterNot(c => f(c)).mkString val filterAlpha: StringTransform = (ca) => filter(ca, c => { -- cgit v1.2.3