diff options
author | Rocky Madden <git@rockymadden.com> | 2013-03-19 09:59:53 -0600 |
---|---|---|
committer | Rocky Madden <git@rockymadden.com> | 2013-03-19 09:59:53 -0600 |
commit | f81c7919bb3546a788d6fb2a072217660cdc0b9b (patch) | |
tree | fa2d637635e8f2511cf87819c4f8413ed4d04295 /core | |
parent | ebdc378009ddf6a0f5cc664e642d4edd83b2229d (diff) | |
download | stringmetric-f81c7919bb3546a788d6fb2a072217660cdc0b9b.tar.gz stringmetric-f81c7919bb3546a788d6fb2a072217660cdc0b9b.tar.bz2 stringmetric-f81c7919bb3546a788d6fb2a072217660cdc0b9b.zip |
Moved Alphabet into root package.
Diffstat (limited to 'core')
12 files changed, 13 insertions, 14 deletions
diff --git a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/Alphabet.scala b/core/source/core/scala/com/rockymadden/stringmetric/Alphabet.scala index 7c52c7b..d2ede81 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/Alphabet.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/Alphabet.scala @@ -1,4 +1,4 @@ -package com.rockymadden.stringmetric.phonetic +package com.rockymadden.stringmetric import scala.collection.immutable.Set diff --git a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithm.scala b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithm.scala index 17e0931..e927852 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithm.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithm.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.rockymadden.stringmetric.{ StringAlgorithm, StringFilter } -import com.rockymadden.stringmetric.phonetic.Alphabet.{ Alpha, LowercaseVowel } +import com.rockymadden.stringmetric.Alphabet.{ Alpha, LowercaseVowel } import scala.annotation.{ switch, tailrec } /** An implementation of the Metaphone algorithm. */ diff --git a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetric.scala index 1793766..1677e20 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetric.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.rockymadden.stringmetric.{ StringFilter, StringMetric } -import com.rockymadden.stringmetric.phonetic.Alphabet.Alpha +import com.rockymadden.stringmetric.Alphabet.Alpha /** A implementation of the Metaphone metric. */ class MetaphoneMetric extends StringMetric[DummyImplicit, Boolean] { this: StringFilter => diff --git a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithm.scala b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithm.scala index 261918f..b7a1216 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithm.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithm.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.rockymadden.stringmetric.{ StringAlgorithm, StringFilter } -import com.rockymadden.stringmetric.phonetic.Alphabet.{ Alpha, LowercaseVowel } +import com.rockymadden.stringmetric.Alphabet.{ Alpha, LowercaseVowel } import scala.annotation.{ switch, tailrec } /** An implementation of the NYSIIS algorithm. */ diff --git a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/NysiisMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/NysiisMetric.scala index e83a0e6..ff3e251 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/NysiisMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/NysiisMetric.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.rockymadden.stringmetric.{ StringFilter, StringMetric } -import com.rockymadden.stringmetric.phonetic.Alphabet.Alpha +import com.rockymadden.stringmetric.Alphabet.Alpha /** An implementation of the NYSIIS metric. */ class NysiisMetric extends StringMetric[DummyImplicit, Boolean] { this: StringFilter => diff --git a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithm.scala b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithm.scala index ec9736b..c97336e 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithm.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithm.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.rockymadden.stringmetric.{ StringAlgorithm, StringFilter } -import com.rockymadden.stringmetric.phonetic.Alphabet.{ Alpha, LowercaseVowel } +import com.rockymadden.stringmetric.Alphabet.{ Alpha, LowercaseVowel } import scala.annotation.{ switch, tailrec } /** An implementation of the refined NYSIIS algorithm. */ diff --git a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetric.scala index 3298cc3..b554147 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetric.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.rockymadden.stringmetric.{ StringFilter, StringMetric } -import com.rockymadden.stringmetric.phonetic.Alphabet.Alpha +import com.rockymadden.stringmetric.Alphabet.Alpha /** An implementation of the refined NYSIIS metric. */ class RefinedNysiisMetric extends StringMetric[DummyImplicit, Boolean] { this: StringFilter => diff --git a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithm.scala b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithm.scala index d6ce29b..5574954 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithm.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithm.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.rockymadden.stringmetric.{ StringAlgorithm, StringFilter } -import com.rockymadden.stringmetric.phonetic.Alphabet.Alpha +import com.rockymadden.stringmetric.Alphabet.Alpha import scala.annotation.{ switch, tailrec } /** An implementation of the refined Soundex algorithm. */ diff --git a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala index 7214de7..777cb3e 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.rockymadden.stringmetric.{ StringFilter, StringMetric } -import com.rockymadden.stringmetric.phonetic.Alphabet.Alpha +import com.rockymadden.stringmetric.Alphabet.Alpha /** An implementation of the refined Soundex metric. */ class RefinedSoundexMetric extends StringMetric[DummyImplicit, Boolean] { this: StringFilter => diff --git a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithm.scala b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithm.scala index e616caa..dee45c2 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithm.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithm.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.rockymadden.stringmetric.{ StringAlgorithm, StringFilter } -import com.rockymadden.stringmetric.phonetic.Alphabet.Alpha +import com.rockymadden.stringmetric.Alphabet.Alpha import scala.annotation.{ switch, tailrec } /** An implementation of the Soundex algorithm. */ diff --git a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/SoundexMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/SoundexMetric.scala index bccfbd9..512fa4d 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/SoundexMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/SoundexMetric.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.rockymadden.stringmetric.{ StringFilter, StringMetric } -import com.rockymadden.stringmetric.phonetic.Alphabet.Alpha +import com.rockymadden.stringmetric.Alphabet.Alpha /** An implementation of the Soundex metric. */ class SoundexMetric extends StringMetric[DummyImplicit, Boolean] { this: StringFilter => diff --git a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/AlphabetSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/AlphabetSpec.scala index 3287d45..25b7283 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/phonetic/AlphabetSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/AlphabetSpec.scala @@ -1,7 +1,6 @@ -package com.rockymadden.stringmetric.phonetic +package com.rockymadden.stringmetric -import com.rockymadden.stringmetric.ScalaTest -import com.rockymadden.stringmetric.phonetic.Alphabet.{ Alpha, Vowel } +import com.rockymadden.stringmetric.Alphabet.{ Alpha, Vowel } import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner |