1 files changed, 8 insertions, 25 deletions
diff --git a/core/source/main/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetric.scala b/core/source/main/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetric.scala
index 2975ad3..083016c 100755
--- a/core/source/main/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetric.scala
+++ b/core/source/main/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetric.scala
@@ -1,32 +1,15 @@
 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 Metaphone metric. */
-class MetaphoneMetric extends StringMetric[DummyImplicit, Boolean] { this: StringFilter =>
-	final override def compare(charArray1: Array[Char], charArray2: Array[Char])
-		(implicit di: DummyImplicit): Option[Boolean] = {
+case object MetaphoneMetric 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 MetaphoneAlgorithm.compute(fca1).filter(_.length > 0).flatMap(mp1 =>
-			MetaphoneAlgorithm.compute(fca2).filter(_.length > 0).map(mp1.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 MetaphoneAlgorithm.compute(a).filter(_.length > 0).flatMap(mp1 =>
+			MetaphoneAlgorithm.compute(b).filter(_.length > 0).map(mp1.sameElements(_))
 		)
-	}
-
-	final override def compare(string1: String, string2: String)(implicit di: DummyImplicit): Option[Boolean] =
-		compare(string1.toCharArray, string2.toCharArray)
-}
-
-object MetaphoneMetric {
-	private lazy val self = apply()
-
-	def apply(): MetaphoneMetric = new MetaphoneMetric 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)
 }