Broke out n-gram tokenizer algorithm into tokenization package.

3 files changed, 39 insertions, 39 deletions

diff --git a/core/source/test/scala/com/rockymadden/stringmetric/ConfigurableStringAlgorithmSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/ConfigurableStringAlgorithmSpec.scala
deleted file mode 100755
index eb09a25..0000000
--- a/core/source/test/scala/com/rockymadden/stringmetric/ConfigurableStringAlgorithmSpec.scala
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.rockymadden.stringmetric
-
-import com.rockymadden.stringmetric.similarity._
-import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
-
-@RunWith(classOf[JUnitRunner])
-final class ConfigurableStringAlgorithmSpec extends ScalaTest {
-	"StringAlgorithm standalone object" should provide {
-		"compute method, type, and companion object pass-throughs" in {
-			val nGram: ConfigurableStringAlgorithm.NGram = ConfigurableStringAlgorithm.NGram()
-
-			nGram.compute("testone")(1).get should
-				equal (ConfigurableStringAlgorithm.computeWithNGram("testone")(1).get)
-			nGram.compute("testone".toCharArray)(1).get should
-				equal (ConfigurableStringAlgorithm.computeWithNGram("testone".toCharArray)(1).get)
-			nGram.compute("testone".toCharArray)(1).get should
-				equal (NGramAlgorithm.compute("testone".toCharArray)(1).get)
-		}
-	}
-}
-
-
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/StringTokenizerSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/StringTokenizerSpec.scala
new file mode 100755
index 0000000..8837c25
--- /dev/null
+++ b/core/source/test/scala/com/rockymadden/stringmetric/StringTokenizerSpec.scala
@@ -0,0 +1,23 @@
+package com.rockymadden.stringmetric
+
+import com.rockymadden.stringmetric.tokenization.NGramTokenizer
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
+
+@RunWith(classOf[JUnitRunner])
+final class StringTokenizerSpec extends ScalaTest {
+	"StringTokenizer standalone object" should provide {
+		"tokenize method, type, and companion object pass-throughs" in {
+			val nGram: StringTokenizer.NGram = StringTokenizer.NGram()
+
+			nGram.tokenize("testone")(1).get should
+				equal (StringTokenizer.tokenizeWithNGram("testone")(1).get)
+			nGram.tokenize("testone".toCharArray)(1).get should
+				equal (StringTokenizer.tokenizeWithNGram("testone".toCharArray)(1).get)
+			nGram.tokenize("testone".toCharArray)(1).get should
+				equal (NGramTokenizer.tokenize("testone".toCharArray)(1).get)
+		}
+	}
+}
+
+
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/similarity/NGramAlgorithmSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/tokenization/NGramTokenizerSpec.scala
index 82a0c69..56fdc13 100755
--- a/core/source/test/scala/com/rockymadden/stringmetric/similarity/NGramAlgorithmSpec.scala
+++ b/core/source/test/scala/com/rockymadden/stringmetric/tokenization/NGramTokenizerSpec.scala
@@ -1,46 +1,46 @@
-package com.rockymadden.stringmetric.similarity
+package com.rockymadden.stringmetric.tokenization
 
 import com.rockymadden.stringmetric.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class NGramAlgorithmSpec extends ScalaTest {
-	import NGramAlgorithmSpec.Algorithm
+final class NGramTokenizerSpec extends ScalaTest {
+	import NGramTokenizerSpec.Tokenizer
 
-	"NGramAlgorithm" should provide {
-		"compute method" when passed {
+	"NGramTokenizer" should provide {
+		"tokenize method" when passed {
 			"empty argument" should returns {
 				"None" in {
-					Algorithm.compute("")(1).isDefined should be (false)
+					Tokenizer.tokenize("")(1).isDefined should be (false)
 				}
 			}
 			"invalid n argument" should throws {
 				"IllegalArgumentException" in {
 					evaluating {
-						Algorithm.compute("")(0).isDefined should be (false)
+						Tokenizer.tokenize("")(0).isDefined should be (false)
 					} should produce [IllegalArgumentException]
 
 					evaluating {
-						Algorithm.compute("")(-1).isDefined should be (false)
+						Tokenizer.tokenize("")(-1).isDefined should be (false)
 					} should produce [IllegalArgumentException]
 				}
 			}
 			"valid argument" should returns {
 				"Array[String]" in {
-					Algorithm.compute("abcdefghijklmnopqrstuvwxyz")(1).get should equal (
+					Tokenizer.tokenize("abcdefghijklmnopqrstuvwxyz")(1).get should equal (
 						Array(
 							"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r",
 							"s", "t", "u", "v", "w", "x", "y", "z"
 						)
 					)
-					Algorithm.compute("abcdefghijklmnopqrstuvwxyz")(2).get should equal (
+					Tokenizer.tokenize("abcdefghijklmnopqrstuvwxyz")(2).get should equal (
 						Array(
 							"ab", "bc", "cd", "de", "ef", "fg", "gh", "hi", "ij", "jk", "kl", "lm", "mn", "no", "op",
 							"pq", "qr", "rs", "st", "tu", "uv", "vw", "wx", "xy", "yz"
 						)
 					)
-					Algorithm.compute("abcdefghijklmnopqrstuvwxyz")(3).get should equal (
+					Tokenizer.tokenize("abcdefghijklmnopqrstuvwxyz")(3).get should equal (
 						Array(
 							"abc", "bcd", "cde", "def", "efg", "fgh", "ghi", "hij", "ijk", "jkl", "klm", "lmn", "mno",
 							"nop", "opq", "pqr", "qrs", "rst", "stu", "tuv", "uvw", "vwx", "wxy", "xyz"
@@ -50,10 +50,10 @@ final class NGramAlgorithmSpec extends ScalaTest {
 			}
 		}
 	}
-	"NGramAlgorithm companion object" should provide {
-		"pass-through compute method" should returns {
+	"NGramTokenizer companion object" should provide {
+		"pass-through tokenize method" should returns {
 			"same value as class" in {
-				NGramAlgorithm.compute("abcdefghijklmnopqrstuvwxyz")(1).get should equal (
+				NGramTokenizer.tokenize("abcdefghijklmnopqrstuvwxyz")(1).get should equal (
 					Array(
 						"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r",
 						"s", "t", "u", "v", "w", "x", "y", "z"
@@ -64,6 +64,6 @@ final class NGramAlgorithmSpec extends ScalaTest {
 	}
 }
 
-object NGramAlgorithmSpec {
-	private final val Algorithm = NGramAlgorithm()
+object NGramTokenizerSpec {
+	private final val Tokenizer = NGramTokenizer()
 }