diff options
Diffstat (limited to 'core/src/main/scala/com/rockymadden/stringmetric/phonetic')
10 files changed, 20 insertions, 30 deletions
diff --git a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithm.scala b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithm.scala index 3abe7cc..bf1240c 100755 --- a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithm.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithm.scala @@ -1,10 +1,9 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.Algorithm.StringAlgorithm +import com.rockymadden.stringmetric._ +import com.rockymadden.stringmetric.Alphabet._ case object MetaphoneAlgorithm extends StringAlgorithm { - import com.rockymadden.stringmetric.Alphabet.{Alpha, LowercaseVowel} - override def compute(a: Array[Char]): Option[Array[Char]] = if (a.length == 0 || !(Alpha isSuperset a.head)) None else { diff --git a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetric.scala b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetric.scala index d06f774..dea1765 100755 --- a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetric.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetric.scala @@ -1,10 +1,9 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.Metric.StringMetric +import com.rockymadden.stringmetric._ +import com.rockymadden.stringmetric.Alphabet._ case object MetaphoneMetric extends StringMetric[Boolean] { - import com.rockymadden.stringmetric.Alphabet.Alpha - override def compare(a: Array[Char], b: Array[Char]): Option[Boolean] = if (a.length == 0 || !(Alpha isSuperset a.head) || b.length == 0 || !(Alpha isSuperset b.head)) None else MetaphoneAlgorithm.compute(a).filter(_.length > 0).flatMap { mp1 => diff --git a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithm.scala b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithm.scala index 3e46675..5f00497 100755 --- a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithm.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithm.scala @@ -1,10 +1,9 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.Algorithm.StringAlgorithm +import com.rockymadden.stringmetric._ +import com.rockymadden.stringmetric.Alphabet._ case object NysiisAlgorithm extends StringAlgorithm { - import com.rockymadden.stringmetric.Alphabet.{Alpha, LowercaseVowel} - override def compute(a: Array[Char]): Option[Array[Char]] = if (a.length == 0 || !(Alpha isSuperset a.head)) None else { diff --git a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/NysiisMetric.scala b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/NysiisMetric.scala index c9a0914..96ea3f1 100755 --- a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/NysiisMetric.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/NysiisMetric.scala @@ -1,10 +1,9 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.Metric.StringMetric +import com.rockymadden.stringmetric._ +import com.rockymadden.stringmetric.Alphabet._ case object NysiisMetric extends StringMetric[Boolean] { - import com.rockymadden.stringmetric.Alphabet.Alpha - override def compare(a: Array[Char], b: Array[Char]): Option[Boolean] = { val unequal: ((Char, Char) => Boolean) = (c1, c2) => { val lc1 = c1.toLower diff --git a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithm.scala b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithm.scala index 9976847..d5055a2 100755 --- a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithm.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithm.scala @@ -1,10 +1,9 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.Algorithm.StringAlgorithm +import com.rockymadden.stringmetric._ +import com.rockymadden.stringmetric.Alphabet._ case object RefinedNysiisAlgorithm extends StringAlgorithm { - import com.rockymadden.stringmetric.Alphabet.{Alpha, LowercaseVowel} - override def compute(a: Array[Char]): Option[Array[Char]] = if (a.length == 0 || !(Alpha isSuperset a.head)) None else { diff --git a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetric.scala b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetric.scala index 488f261..57378ac 100755 --- a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetric.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetric.scala @@ -1,10 +1,9 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.Metric.StringMetric +import com.rockymadden.stringmetric._ +import com.rockymadden.stringmetric.Alphabet._ case object RefinedNysiisMetric extends StringMetric[Boolean] { - import com.rockymadden.stringmetric.Alphabet.Alpha - override def compare(a: Array[Char], b: Array[Char]): Option[Boolean] = { val unequal = (c1: Char, c2: Char) => { val lc1 = c1.toLower diff --git a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithm.scala b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithm.scala index e8f3af6..ab7db8f 100755 --- a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithm.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithm.scala @@ -1,10 +1,9 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.Algorithm.StringAlgorithm +import com.rockymadden.stringmetric._ +import com.rockymadden.stringmetric.Alphabet._ case object RefinedSoundexAlgorithm extends StringAlgorithm { - import com.rockymadden.stringmetric.Alphabet.Alpha - override def compute(a: Array[Char]): Option[Array[Char]] = if (a.length == 0 || !(Alpha isSuperset a.head)) None else Some(transcode(a, Array(a.head.toLower))) diff --git a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala index 289fe29..51b9456 100755 --- a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala @@ -1,10 +1,9 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.Metric.StringMetric +import com.rockymadden.stringmetric._ +import com.rockymadden.stringmetric.Alphabet._ case object RefinedSoundexMetric extends StringMetric[Boolean] { - import com.rockymadden.stringmetric.Alphabet.Alpha - override def compare(a: Array[Char], b: Array[Char]): Option[Boolean] = if (a.length == 0 || !(Alpha isSuperset a.head) || b.length == 0 || !(Alpha isSuperset b.head)) None else if (a.head.toLower != b.head.toLower) Some(false) diff --git a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithm.scala b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithm.scala index b211908..7d24e2c 100755 --- a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithm.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithm.scala @@ -1,10 +1,9 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.Algorithm.StringAlgorithm +import com.rockymadden.stringmetric._ +import com.rockymadden.stringmetric.Alphabet._ case object SoundexAlgorithm extends StringAlgorithm { - import com.rockymadden.stringmetric.Alphabet.Alpha - override def compute(a: Array[Char]): Option[Array[Char]] = if (a.length == 0 || !(Alpha isSuperset a.head)) None else { diff --git a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/SoundexMetric.scala b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/SoundexMetric.scala index eca32db..242cbf0 100755 --- a/core/src/main/scala/com/rockymadden/stringmetric/phonetic/SoundexMetric.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/phonetic/SoundexMetric.scala @@ -1,10 +1,9 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.Metric.StringMetric +import com.rockymadden.stringmetric._ +import com.rockymadden.stringmetric.Alphabet._ case object SoundexMetric extends StringMetric[Boolean] { - import com.rockymadden.stringmetric.Alphabet.Alpha - override def compare(a: Array[Char], b: Array[Char]): Option[Boolean] = if (a.length == 0 || !(Alpha isSuperset a.head) || b.length == 0 || !(Alpha isSuperset b.head)) None else if (a.head.toLower != b.head.toLower) Some(false) |