From ab53b6fd3023748a39b27dcc8784c3880e413833 Mon Sep 17 00:00:00 2001 From: Rocky Madden Date: Mon, 6 Jan 2014 09:50:27 -0700 Subject: Code formatting tweaks. --- core/src/main/scala/com/rockymadden/stringmetric/Algorithm.scala | 3 +-- core/src/main/scala/com/rockymadden/stringmetric/Transform.scala | 1 + core/src/test/scala/com/rockymadden/stringmetric/MetricSpec.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/scala/com/rockymadden/stringmetric/Algorithm.scala b/core/src/main/scala/com/rockymadden/stringmetric/Algorithm.scala index f2863d0..21a6ad8 100755 --- a/core/src/main/scala/com/rockymadden/stringmetric/Algorithm.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/Algorithm.scala @@ -52,8 +52,7 @@ object Algorithm { private val base: StringAlgorithm = sa private var memo: Map[String, Option[String]] = Map() - override def compute(a: Array[Char]): Option[Array[Char]] = - compute(a.toString).map(_.toCharArray) + override def compute(a: Array[Char]): Option[Array[Char]] = compute(a.toString).map(_.toCharArray) override def compute(a: String): Option[String] = if (memo.contains(a)) memo(a) diff --git a/core/src/main/scala/com/rockymadden/stringmetric/Transform.scala b/core/src/main/scala/com/rockymadden/stringmetric/Transform.scala index de9e71f..af8bf45 100644 --- a/core/src/main/scala/com/rockymadden/stringmetric/Transform.scala +++ b/core/src/main/scala/com/rockymadden/stringmetric/Transform.scala @@ -16,6 +16,7 @@ object Transform { 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 diff --git a/core/src/test/scala/com/rockymadden/stringmetric/MetricSpec.scala b/core/src/test/scala/com/rockymadden/stringmetric/MetricSpec.scala index 538976d..f821226 100644 --- a/core/src/test/scala/com/rockymadden/stringmetric/MetricSpec.scala +++ b/core/src/test/scala/com/rockymadden/stringmetric/MetricSpec.scala @@ -8,7 +8,7 @@ final class MetricSpec extends ScalaTest { import phonetic._ import similarity._ import Metric._ - import Transform.StringTransform + import Transform._ "StringMetric standalone object" should provide { "compare method and companion object pass through" in { -- cgit v1.2.3