Restructured metrics into subpackages. One for distance and one for phonetic.

5 files changed, 10 insertions, 5 deletions

diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/command/hammingMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/command/hammingMetric.scala
index 9428bc2..d0e121a 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/command/hammingMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/command/hammingMetric.scala
@@ -1,8 +1,9 @@
 package org.hashtree.stringmetric.cli.command
 
-import org.hashtree.stringmetric.{ CaseStringCleaner, HammingMetric, StringCleanerDelegate }
+import org.hashtree.stringmetric.{ CaseStringCleaner, StringCleanerDelegate }
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.cli.command._
+import org.hashtree.stringmetric.distance.HammingMetric
 
 /**
  * The hammingMetric [[org.hashtree.stringmetric.cli.command.Command]]. Compares the number of characters that two equal
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/command/jaroMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/command/jaroMetric.scala
index 922e285..86abdd5 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/command/jaroMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/command/jaroMetric.scala
@@ -1,8 +1,9 @@
 package org.hashtree.stringmetric.cli.command
 
-import org.hashtree.stringmetric.{ CaseStringCleaner, JaroMetric, StringCleanerDelegate }
+import org.hashtree.stringmetric.{ CaseStringCleaner, StringCleanerDelegate }
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.cli.command._
+import org.hashtree.stringmetric.distance.JaroMetric
 
 /**
  * The jaroMetric [[org.hashtree.stringmetric.cli.command.Command]]. Compares two strings to calculate the
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/command/jaroWinklerMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/command/jaroWinklerMetric.scala
index 6509cc4..564024d 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/command/jaroWinklerMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/command/jaroWinklerMetric.scala
@@ -1,8 +1,9 @@
 package org.hashtree.stringmetric.cli.command
 
-import org.hashtree.stringmetric.{ CaseStringCleaner, JaroWinklerMetric, StringCleanerDelegate }
+import org.hashtree.stringmetric.{ CaseStringCleaner, StringCleanerDelegate }
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.cli.command._
+import org.hashtree.stringmetric.distance.JaroWinklerMetric
 
 /**
  * The jaroWinklerMetric [[org.hashtree.stringmetric.cli.command.Command]]. Compares two strings to calculate the
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/command/levenshteinMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/command/levenshteinMetric.scala
index 59a73e8..3c7682a 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/command/levenshteinMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/command/levenshteinMetric.scala
@@ -1,8 +1,9 @@
 package org.hashtree.stringmetric.cli.command
 
-import org.hashtree.stringmetric.{ CaseStringCleaner, LevenshteinMetric, StringCleanerDelegate }
+import org.hashtree.stringmetric.{ CaseStringCleaner, StringCleanerDelegate }
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.cli.command._
+import org.hashtree.stringmetric.distance.LevenshteinMetric
 
 /**
  * The levenshteinMetric [[org.hashtree.stringmetric.cli.command.Command]]. Compares the number of characters that two
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/command/soundexMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/command/soundexMetric.scala
index cb119c2..adefd14 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/command/soundexMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/command/soundexMetric.scala
@@ -1,8 +1,9 @@
 package org.hashtree.stringmetric.cli.command
 
-import org.hashtree.stringmetric.{ SoundexMetric, StringCleanerDelegate }
+import org.hashtree.stringmetric.StringCleanerDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.cli.command._
+import org.hashtree.stringmetric.phonetic.SoundexMetric
 
 /**
  * The soundexMetric [[org.hashtree.stringmetric.cli.command.Command]]. Compares two strings to determine if they are