summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRocky Madden <git@rockymadden.com>2014-01-02 11:24:42 -0700
committerRocky Madden <git@rockymadden.com>2014-01-02 11:24:42 -0700
commit6bd9e223b8fbad00ff82f9f368eb4451e5269eeb (patch)
treed4603d1a759aee1ee2b6a77cca39d471bd699d61
parent8a6853a76a61184bc2ad559e59292ef7ea1dfd4a (diff)
downloadstringmetric-6bd9e223b8fbad00ff82f9f368eb4451e5269eeb.tar.gz
stringmetric-6bd9e223b8fbad00ff82f9f368eb4451e5269eeb.tar.bz2
stringmetric-6bd9e223b8fbad00ff82f9f368eb4451e5269eeb.zip
Checks can be combined.
-rwxr-xr-xcore/source/main/scala/com/rockymadden/stringmetric/Tokenize.scala7
1 files changed, 2 insertions, 5 deletions
diff --git a/core/source/main/scala/com/rockymadden/stringmetric/Tokenize.scala b/core/source/main/scala/com/rockymadden/stringmetric/Tokenize.scala
index 00b173d..a011c96 100755
--- a/core/source/main/scala/com/rockymadden/stringmetric/Tokenize.scala
+++ b/core/source/main/scala/com/rockymadden/stringmetric/Tokenize.scala
@@ -19,12 +19,9 @@ object Tokenize {
final case class NGramTokenizer(n: Int) extends StringTokenizer {
- override def tokenize(a: Array[Char]): Option[Array[Array[Char]]] = {
- if (n <= 0) return None
-
- if (a.length < n) None
+ override def tokenize(a: Array[Char]): Option[Array[Array[Char]]] =
+ if (n <= 0 || a.length < n) None
else Some(sequence(a, Array.empty[Array[Char]], n))
- }
override def tokenize(a: String): Option[Array[String]] = tokenize(a.toCharArray).map(_.map(_.mkString))