diff options
Diffstat (limited to 'core/source/main/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala')
-rwxr-xr-x | core/source/main/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/core/source/main/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala b/core/source/main/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala index eb2f01e..5ad0e30 100755 --- a/core/source/main/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala +++ b/core/source/main/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala @@ -1,33 +1,16 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.{StringFilter, StringMetric} -import com.rockymadden.stringmetric.Alphabet.Alpha +import com.rockymadden.stringmetric.Metric.StringMetricLike -/** An implementation of the refined Soundex metric. */ -class RefinedSoundexMetric extends StringMetric[DummyImplicit, Boolean] { this: StringFilter => - final override def compare(charArray1: Array[Char], charArray2: Array[Char]) - (implicit di: DummyImplicit): Option[Boolean] = { +case object RefinedSoundexMetric extends StringMetricLike[Boolean] { + import com.rockymadden.stringmetric.Alphabet.Alpha - val fca1 = filter(charArray1) - lazy val fca2 = filter(charArray2) - - if (fca1.length == 0 || !(Alpha isSuperset fca1.head) || fca2.length == 0 || !(Alpha isSuperset fca2.head)) None - else if (fca1.head.toLower != fca2.head.toLower) Some(false) - else RefinedSoundexAlgorithm.compute(fca1).filter(_.length > 0).flatMap(rse1 => - RefinedSoundexAlgorithm.compute(fca2).filter(_.length > 0).map(rse1.sameElements(_)) + 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) + else RefinedSoundexAlgorithm.compute(a).filter(_.length > 0).flatMap(rse1 => + RefinedSoundexAlgorithm.compute(b).filter(_.length > 0).map(rse1.sameElements(_)) ) - } - - final override def compare(string1: String, string2: String)(implicit di: DummyImplicit): Option[Boolean] = - compare(string1.toCharArray, string2.toCharArray) -} - -object RefinedSoundexMetric { - private lazy val self = apply() - - def apply(): RefinedSoundexMetric = new RefinedSoundexMetric with StringFilter - - def compare(charArray1: Array[Char], charArray2: Array[Char]) = self.compare(charArray1, charArray2) - def compare(string1: String, string2: String) = self.compare(string1, string2) + override def compare(a: String, b: String): Option[Boolean] = compare(a.toCharArray, b.toCharArray) } |