Broke out n-gram tokenizer algorithm into tokenization package.

2 files changed, 14 insertions, 14 deletions

diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/nGramAlgorithm.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/tokenization/nGramTokenizer.scala
index 707f7fd..566ddb6 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/nGramAlgorithm.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/tokenization/nGramTokenizer.scala
@@ -1,13 +1,13 @@
-package com.rockymadden.stringmetric.cli.similarity
+package com.rockymadden.stringmetric.cli.tokenization
 
 import com.rockymadden.stringmetric.cli._
-import com.rockymadden.stringmetric.similarity.NGramAlgorithm
+import com.rockymadden.stringmetric.tokenization.NGramTokenizer
 
 /**
- * The nGramAlgorithm [[com.rockymadden.stringmetric.cli.Command]]. Returns the N-Gram representation of the passed
+ * The nGramTokenizer [[com.rockymadden.stringmetric.cli.Command]]. Returns the N-Gram representation of the passed
  * string.
  */
-object nGramAlgorithm extends Command {
+object nGramTokenizer extends Command {
 	override def main(args: Array[String]): Unit = {
 		val opts: OptionMap = args
 
@@ -31,7 +31,7 @@ object nGramAlgorithm extends Command {
 		println(
 			"Returns the N-Gram representation of the passed string." + ls + ls +
 			"Syntax:" + ls +
-			tab + "nGramAlgorithm [Options] string..." + ls + ls +
+			tab + "nGramTokenizer [Options] string..." + ls + ls +
 			"Options:" + ls +
 			tab + "-h, --help" + ls +
 			tab + tab + "Outputs description, syntax, and opts." +
@@ -41,8 +41,8 @@ object nGramAlgorithm extends Command {
 	}
 
 	override def execute(opts: OptionMap): Unit =
-		NGramAlgorithm.compute(opts('dashless))(opts('n)) match {
-			// Implicits a pain here.
+		NGramTokenizer.tokenize(opts('dashless))(opts('n)) match {
+			// Implicits are a pain here.
 			case Some(c) => {
 				val sb = new StringBuilder
 
diff --git a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/nGramAlgorithmSpec.scala b/cli/source/test/scala/com/rockymadden/stringmetric/cli/tokenization/nGramTokenizerSpec.scala
index 55ac2da..144acb4 100755
--- a/cli/source/test/scala/com/rockymadden/stringmetric/cli/similarity/nGramAlgorithmSpec.scala
+++ b/cli/source/test/scala/com/rockymadden/stringmetric/cli/tokenization/nGramTokenizerSpec.scala
@@ -1,19 +1,19 @@
-package com.rockymadden.stringmetric.cli.similarity
+package com.rockymadden.stringmetric.cli.tokenization
 
 import com.rockymadden.stringmetric.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class nGramAlgorithmSpec extends ScalaTest {
-	"nGramAlgorithm" should provide {
+final class nGramTokenizerSpec extends ScalaTest {
+	"nGramTokenizer" should provide {
 		"main method" when passed {
 			"valid dashless argument and valid n argument" should executes {
 				"print N-Gram representation" in {
 					val out = new java.io.ByteArrayOutputStream()
 
 					Console.withOut(out)(
-						nGramAlgorithm.main(
+						nGramTokenizer.main(
 							Array(
 								"--unitTest",
 								"--debug",
@@ -27,7 +27,7 @@ final class nGramAlgorithmSpec extends ScalaTest {
 					out.reset()
 
 					Console.withOut(out)(
-						nGramAlgorithm.main(
+						nGramTokenizer.main(
 							Array(
 								"--unitTest",
 								"--debug",
@@ -44,7 +44,7 @@ final class nGramAlgorithmSpec extends ScalaTest {
 			"valid dashless argument and invalid n argument" should throws {
 				"IllegalArgumentException" in {
 					evaluating {
-						nGramAlgorithm.main(
+						nGramTokenizer.main(
 							Array(
 								"--unitTest",
 								"abc",
@@ -57,7 +57,7 @@ final class nGramAlgorithmSpec extends ScalaTest {
 			"no dashless argument" should throws {
 				"IllegalArgumentException" in {
 					evaluating {
-						nGramAlgorithm.main(Array("--unitTest", "--debug"))
+						nGramTokenizer.main(Array("--unitTest", "--debug"))
 					} should produce [IllegalArgumentException]
 				}
 			}