From 46b69a796ef7632dafda2df0467b811008906bb0 Mon Sep 17 00:00:00 2001 From: Rocky Madden Date: Thu, 2 Jan 2014 11:13:42 -0700 Subject: Full qualification not needed. --- .../com/rockymadden/stringmetric/Algorithm.scala | 12 ++++----- .../com/rockymadden/stringmetric/Metric.scala | 30 +++++++++++----------- .../com/rockymadden/stringmetric/Tokenize.scala | 2 +- .../com/rockymadden/stringmetric/package.scala | 4 +-- .../rockymadden/stringmetric/AlgorithmSpec.scala | 6 ++--- .../rockymadden/stringmetric/AlphabetSpec.scala | 3 ++- .../com/rockymadden/stringmetric/MetricSpec.scala | 8 +++--- .../rockymadden/stringmetric/TransformSpec.scala | 2 +- 8 files changed, 34 insertions(+), 33 deletions(-) diff --git a/core/source/main/scala/com/rockymadden/stringmetric/Algorithm.scala b/core/source/main/scala/com/rockymadden/stringmetric/Algorithm.scala index dd810b8..84f136d 100755 --- a/core/source/main/scala/com/rockymadden/stringmetric/Algorithm.scala +++ b/core/source/main/scala/com/rockymadden/stringmetric/Algorithm.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric object Algorithm { - import com.rockymadden.stringmetric.Transform.StringTransform + import Transform.StringTransform trait Algorithm[A] { @@ -15,11 +15,11 @@ object Algorithm { object StringAlgorithm { - final val Metaphone = com.rockymadden.stringmetric.phonetic.MetaphoneAlgorithm - final val Nysiis = com.rockymadden.stringmetric.phonetic.NysiisAlgorithm - final val RefinedNysiis = com.rockymadden.stringmetric.phonetic.RefinedNysiisAlgorithm - final val RefinedSoundex = com.rockymadden.stringmetric.phonetic.RefinedSoundexAlgorithm - final val Soundex = com.rockymadden.stringmetric.phonetic.SoundexAlgorithm + final val Metaphone = phonetic.MetaphoneAlgorithm + final val Nysiis = phonetic.NysiisAlgorithm + final val RefinedNysiis = phonetic.RefinedNysiisAlgorithm + final val RefinedSoundex = phonetic.RefinedSoundexAlgorithm + final val Soundex = phonetic.SoundexAlgorithm def computeWithMetaphone(a: Array[Char]) = Metaphone.compute(a) diff --git a/core/source/main/scala/com/rockymadden/stringmetric/Metric.scala b/core/source/main/scala/com/rockymadden/stringmetric/Metric.scala index 2a62456..f45dd14 100755 --- a/core/source/main/scala/com/rockymadden/stringmetric/Metric.scala +++ b/core/source/main/scala/com/rockymadden/stringmetric/Metric.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric object Metric { - import com.rockymadden.stringmetric.Transform.StringTransform + import Transform.StringTransform trait Metric[A, B] { @@ -15,20 +15,20 @@ object Metric { object StringMetric { - final val DiceSorensen = com.rockymadden.stringmetric.similarity.DiceSorensenMetric - final val Hamming = com.rockymadden.stringmetric.similarity.HammingMetric - final val Jaccard = com.rockymadden.stringmetric.similarity.JaccardMetric - final val Jaro = com.rockymadden.stringmetric.similarity.JaroMetric - final val JaroWinkler = com.rockymadden.stringmetric.similarity.JaroWinklerMetric - final val Levenshtein = com.rockymadden.stringmetric.similarity.LevenshteinMetric - final val Metaphone = com.rockymadden.stringmetric.phonetic.MetaphoneMetric - final val NGram = com.rockymadden.stringmetric.similarity.NGramMetric - final val Nysiis = com.rockymadden.stringmetric.phonetic.NysiisMetric - final val Overlap = com.rockymadden.stringmetric.similarity.OverlapMetric - final val RefinedNysiis = com.rockymadden.stringmetric.phonetic.RefinedNysiisMetric - final val RefinedSoundex = com.rockymadden.stringmetric.phonetic.RefinedSoundexMetric - final val Soundex = com.rockymadden.stringmetric.phonetic.SoundexMetric - final val WeightedLevenshtein = com.rockymadden.stringmetric.similarity.WeightedLevenshteinMetric + final val DiceSorensen = similarity.DiceSorensenMetric + final val Hamming = similarity.HammingMetric + final val Jaccard = similarity.JaccardMetric + final val Jaro = similarity.JaroMetric + final val JaroWinkler = similarity.JaroWinklerMetric + final val Levenshtein = similarity.LevenshteinMetric + final val Metaphone = phonetic.MetaphoneMetric + final val NGram = similarity.NGramMetric + final val Nysiis = phonetic.NysiisMetric + final val Overlap = similarity.OverlapMetric + final val RefinedNysiis = phonetic.RefinedNysiisMetric + final val RefinedSoundex = phonetic.RefinedSoundexMetric + final val Soundex = phonetic.SoundexMetric + final val WeightedLevenshtein = similarity.WeightedLevenshteinMetric def compareWithDiceSorensen(n: Int)(a: Array[Char], b: Array[Char]) = DiceSorensen(n).compare(a, b) diff --git a/core/source/main/scala/com/rockymadden/stringmetric/Tokenize.scala b/core/source/main/scala/com/rockymadden/stringmetric/Tokenize.scala index 0bae29a..36b7eef 100755 --- a/core/source/main/scala/com/rockymadden/stringmetric/Tokenize.scala +++ b/core/source/main/scala/com/rockymadden/stringmetric/Tokenize.scala @@ -12,7 +12,7 @@ object Tokenize { object StringTokenizer { - val NGram = com.rockymadden.stringmetric.tokenize.NGramTokenizer + val NGram = tokenize.NGramTokenizer def tokenizeWithNGram(n: Int)(charArray: Array[Char]) = NGram(n).tokenize(charArray) } diff --git a/core/source/main/scala/com/rockymadden/stringmetric/package.scala b/core/source/main/scala/com/rockymadden/stringmetric/package.scala index 07957c8..e5bc19d 100755 --- a/core/source/main/scala/com/rockymadden/stringmetric/package.scala +++ b/core/source/main/scala/com/rockymadden/stringmetric/package.scala @@ -2,8 +2,8 @@ package com.rockymadden package object stringmetric { import scala.language.implicitConversions - import com.rockymadden.stringmetric.Algorithm._ - import com.rockymadden.stringmetric.Metric._ + import Algorithm._ + import Metric._ type CompareTuple[T] = (Array[T], Array[T]) type MatchTuple[T] = (Array[T], Array[T]) diff --git a/core/source/test/scala/com/rockymadden/stringmetric/AlgorithmSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/AlgorithmSpec.scala index 4e0aef8..d727145 100644 --- a/core/source/test/scala/com/rockymadden/stringmetric/AlgorithmSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/AlgorithmSpec.scala @@ -5,9 +5,9 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class AlgorithmSpec extends ScalaTest { - import com.rockymadden.stringmetric.phonetic._ - import com.rockymadden.stringmetric.Algorithm._ - import com.rockymadden.stringmetric.Transform.StringTransform + import phonetic._ + import Algorithm._ + import Transform.StringTransform "StringAlgorithm" should provide { "compute method and companion object pass through" in { diff --git a/core/source/test/scala/com/rockymadden/stringmetric/AlphabetSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/AlphabetSpec.scala index 109e704..5a6a1dc 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/AlphabetSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/AlphabetSpec.scala @@ -1,11 +1,12 @@ package com.rockymadden.stringmetric -import com.rockymadden.stringmetric.Alphabet.{Alpha, Vowel} import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class AlphabetSpec extends ScalaTest { "Alphabet" should provide { + import Alphabet.{Alpha, Vowel} + "an overloaded isSuperset method which accepts Char" when passed { "non-alphabet argument" should returns { "false" in { diff --git a/core/source/test/scala/com/rockymadden/stringmetric/MetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/MetricSpec.scala index e6fdd39..3b9021d 100644 --- a/core/source/test/scala/com/rockymadden/stringmetric/MetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/MetricSpec.scala @@ -5,10 +5,10 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class MetricSpec extends ScalaTest { - import com.rockymadden.stringmetric.phonetic._ - import com.rockymadden.stringmetric.similarity._ - import com.rockymadden.stringmetric.Metric._ - import com.rockymadden.stringmetric.Transform.StringTransform + import phonetic._ + import similarity._ + import Metric._ + import Transform.StringTransform "StringMetric standalone object" should provide { "compare method and companion object pass through" in { diff --git a/core/source/test/scala/com/rockymadden/stringmetric/TransformSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/TransformSpec.scala index 2349a6a..5e79c62 100644 --- a/core/source/test/scala/com/rockymadden/stringmetric/TransformSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/TransformSpec.scala @@ -5,7 +5,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class TransformSpec extends ScalaTest { "StringTransform" should provide { - import com.rockymadden.stringmetric.Transform._ + import Transform._ "filterAlpha()" when passed { "String" should returns { -- cgit v1.2.3