diff options
author | Rocky Madden <git@rockymadden.com> | 2013-04-19 21:33:03 -0600 |
---|---|---|
committer | Rocky Madden <git@rockymadden.com> | 2013-04-19 21:33:03 -0600 |
commit | 2075c9febdab7c00984509db311d86f3c20e72ca (patch) | |
tree | c46c793d438426041417a8db6a2749a0f592ba3d /core/source | |
parent | e4a66e7745aada3118a6e0261e00ece5c10b5893 (diff) | |
download | stringmetric-2075c9febdab7c00984509db311d86f3c20e72ca.tar.gz stringmetric-2075c9febdab7c00984509db311d86f3c20e72ca.tar.bz2 stringmetric-2075c9febdab7c00984509db311d86f3c20e72ca.zip |
Code formatting tweaks.
Diffstat (limited to 'core/source')
47 files changed, 57 insertions, 57 deletions
diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/CaliperRunner.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/CaliperRunner.scala index 89f3ab9..4474a8d 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/CaliperRunner.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/CaliperRunner.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric -import com.google.caliper.{ Benchmark, Runner } +import com.google.caliper.{Benchmark, Runner} abstract class CaliperRunner(private[this] val suite: java.lang.Class[_ <: Benchmark]) { def main(args: Array[String]): Unit = Runner.main(suite, args) -}
\ No newline at end of file +} diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithmBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithmBenchmark.scala index 7af1a2c..bfc17f2 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithmBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithmBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.util.Random final class MetaphoneAlgorithmBenchmark extends CaliperBenchmark { diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetricBenchmark.scala index 34e77b3..147ab54 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithmBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithmBenchmark.scala index 97f88ed..79f9e16 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithmBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithmBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner, StringFilter } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.util.Random final class NysiisAlgorithmBenchmark extends CaliperBenchmark { diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/NysiisMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/NysiisMetricBenchmark.scala index 0af61c1..620d054 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/NysiisMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/NysiisMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithmBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithmBenchmark.scala index 65d9d8f..885bc3a 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithmBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithmBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.util.Random final class RefinedNysiisAlgorithmBenchmark extends CaliperBenchmark { diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetricBenchmark.scala index b7d8c93..d0da4e5 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithmBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithmBenchmark.scala index e2f58d3..99aa3df 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithmBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithmBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.util.Random final class RefinedSoundexAlgorithmBenchmark extends CaliperBenchmark { diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetricBenchmark.scala index 71a2485..8e24650 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithmBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithmBenchmark.scala index 8f5fd83..5c195a6 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithmBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithmBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.util.Random final class SoundexAlgorithmBenchmark extends CaliperBenchmark { diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/SoundexMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/SoundexMetricBenchmark.scala index 7d20a24..6534d72 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/SoundexMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/phonetic/SoundexMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.phonetic import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetricBenchmark.scala index 6561b97..88f5d4c 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.similarity import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/HammingMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/HammingMetricBenchmark.scala index 1e9b7db..60ef7d4 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/HammingMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/HammingMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.similarity import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/JaccardMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/JaccardMetricBenchmark.scala index 62be6bc..3f6a59f 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/JaccardMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/JaccardMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.similarity import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/JaroMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/JaroMetricBenchmark.scala index d43d594..c9c9b2c 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/JaroMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/JaroMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.similarity import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetricBenchmark.scala index dab240a..b3da154 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.similarity import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetricBenchmark.scala index 3f0fe55..d47e138 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.similarity import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/NGramMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/NGramMetricBenchmark.scala index 1ded58b..4250e66 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/NGramMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/NGramMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.similarity import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/OverlapMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/OverlapMetricBenchmark.scala index f607aff..4d7ce0a 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/OverlapMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/OverlapMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.similarity import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetricBenchmark.scala index f89ba22..edc1527 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.similarity import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricBenchmark.scala index 35726bf..b511654 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.similarity import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.annotation.tailrec import scala.util.Random diff --git a/core/source/benchmark/scala/com/rockymadden/stringmetric/tokenization/NGramTokenizerBenchmark.scala b/core/source/benchmark/scala/com/rockymadden/stringmetric/tokenization/NGramTokenizerBenchmark.scala index d5ff1f3..7e62662 100755 --- a/core/source/benchmark/scala/com/rockymadden/stringmetric/tokenization/NGramTokenizerBenchmark.scala +++ b/core/source/benchmark/scala/com/rockymadden/stringmetric/tokenization/NGramTokenizerBenchmark.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.tokenization import com.google.caliper.Param -import com.rockymadden.stringmetric.{ CaliperBenchmark, CaliperRunner } +import com.rockymadden.stringmetric.{CaliperBenchmark, CaliperRunner} import scala.util.Random final class NGramTokenizerBenchmark extends CaliperBenchmark { 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 e927852..c580fd3 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithm.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/MetaphoneAlgorithm.scala @@ -1,8 +1,8 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.{ StringAlgorithm, StringFilter } -import com.rockymadden.stringmetric.Alphabet.{ Alpha, LowercaseVowel } -import scala.annotation.{ switch, tailrec } +import com.rockymadden.stringmetric.{StringAlgorithm, StringFilter} +import com.rockymadden.stringmetric.Alphabet.{Alpha, LowercaseVowel} +import scala.annotation.{switch, tailrec} /** An implementation of the Metaphone algorithm. */ class MetaphoneAlgorithm extends StringAlgorithm[DummyImplicit, String] { this: StringFilter => 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 622dcc6..2975ad3 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/MetaphoneMetric.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.{ StringFilter, StringMetric } +import com.rockymadden.stringmetric.{StringFilter, StringMetric} import com.rockymadden.stringmetric.Alphabet.Alpha /** An implementation of the Metaphone metric. */ 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 b7a1216..ff0b3d6 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithm.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/NysiisAlgorithm.scala @@ -1,8 +1,8 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.{ StringAlgorithm, StringFilter } -import com.rockymadden.stringmetric.Alphabet.{ Alpha, LowercaseVowel } -import scala.annotation.{ switch, tailrec } +import com.rockymadden.stringmetric.{StringAlgorithm, StringFilter} +import com.rockymadden.stringmetric.Alphabet.{Alpha, LowercaseVowel} +import scala.annotation.{switch, tailrec} /** An implementation of the NYSIIS algorithm. */ class NysiisAlgorithm extends StringAlgorithm[DummyImplicit, String] { this: StringFilter => 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 cbae0a4..6d1c22c 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/NysiisMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/NysiisMetric.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.{ StringFilter, StringMetric } +import com.rockymadden.stringmetric.{StringFilter, StringMetric} import com.rockymadden.stringmetric.Alphabet.Alpha /** An implementation of the NYSIIS metric. */ 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 c97336e..334e9e3 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithm.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisAlgorithm.scala @@ -1,8 +1,8 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.{ StringAlgorithm, StringFilter } -import com.rockymadden.stringmetric.Alphabet.{ Alpha, LowercaseVowel } -import scala.annotation.{ switch, tailrec } +import com.rockymadden.stringmetric.{StringAlgorithm, StringFilter} +import com.rockymadden.stringmetric.Alphabet.{Alpha, LowercaseVowel} +import scala.annotation.{switch, tailrec} /** An implementation of the refined NYSIIS algorithm. */ class RefinedNysiisAlgorithm extends StringAlgorithm[DummyImplicit, String] { this: StringFilter => 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 52e8294..c96cc52 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedNysiisMetric.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.{ StringFilter, StringMetric } +import com.rockymadden.stringmetric.{StringFilter, StringMetric} import com.rockymadden.stringmetric.Alphabet.Alpha /** An implementation of the refined NYSIIS metric. */ 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 5574954..f22bde1 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithm.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexAlgorithm.scala @@ -1,8 +1,8 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.{ StringAlgorithm, StringFilter } +import com.rockymadden.stringmetric.{StringAlgorithm, StringFilter} import com.rockymadden.stringmetric.Alphabet.Alpha -import scala.annotation.{ switch, tailrec } +import scala.annotation.{switch, tailrec} /** An implementation of the refined Soundex algorithm. */ class RefinedSoundexAlgorithm extends StringAlgorithm[DummyImplicit, String] { this: StringFilter => 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 b8e6125..eb2f01e 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/RefinedSoundexMetric.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.{ StringFilter, StringMetric } +import com.rockymadden.stringmetric.{StringFilter, StringMetric} import com.rockymadden.stringmetric.Alphabet.Alpha /** An implementation of the refined Soundex metric. */ 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 dee45c2..361047d 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithm.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/SoundexAlgorithm.scala @@ -1,8 +1,8 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.{ StringAlgorithm, StringFilter } +import com.rockymadden.stringmetric.{StringAlgorithm, StringFilter} import com.rockymadden.stringmetric.Alphabet.Alpha -import scala.annotation.{ switch, tailrec } +import scala.annotation.{switch, tailrec} /** An implementation of the Soundex algorithm. */ class SoundexAlgorithm extends StringAlgorithm[DummyImplicit, String] { this: StringFilter => 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 036d275..e4daa17 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/phonetic/SoundexMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/phonetic/SoundexMetric.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.phonetic -import com.rockymadden.stringmetric.{ StringFilter, StringMetric } +import com.rockymadden.stringmetric.{StringFilter, StringMetric} import com.rockymadden.stringmetric.Alphabet.Alpha /** An implementation of the Soundex metric. */ diff --git a/core/source/core/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetric.scala index 5a5b969..5e01bb1 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetric.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -import com.rockymadden.stringmetric.{ StringMetric, MatchTuple, StringFilter } +import com.rockymadden.stringmetric.{StringMetric, MatchTuple, StringFilter} import com.rockymadden.stringmetric.tokenization.NGramTokenizer /** diff --git a/core/source/core/scala/com/rockymadden/stringmetric/similarity/HammingMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/similarity/HammingMetric.scala index 5300ec9..95ff203 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/HammingMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/HammingMetric.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -import com.rockymadden.stringmetric.{ CompareTuple, StringFilter, StringMetric } +import com.rockymadden.stringmetric.{CompareTuple, StringFilter, StringMetric} /** An implementation of the Hamming metric. */ class HammingMetric extends StringMetric[DummyImplicit, Int] { this: StringFilter => diff --git a/core/source/core/scala/com/rockymadden/stringmetric/similarity/JaccardMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/similarity/JaccardMetric.scala index b544ab9..3b9b418 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/JaccardMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/JaccardMetric.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -import com.rockymadden.stringmetric.{ StringMetric, MatchTuple, StringFilter } +import com.rockymadden.stringmetric.{StringMetric, MatchTuple, StringFilter} import com.rockymadden.stringmetric.tokenization.NGramTokenizer /* An implementation of the Jaccard metric. */ diff --git a/core/source/core/scala/com/rockymadden/stringmetric/similarity/JaroMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/similarity/JaroMetric.scala index bab89c9..b7ce2c5 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/JaroMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/JaroMetric.scala @@ -1,7 +1,7 @@ package com.rockymadden.stringmetric.similarity -import com.rockymadden.stringmetric.{ CompareTuple, MatchTuple, StringFilter, StringMetric } -import scala.collection.mutable.{ ArrayBuffer, HashSet } +import com.rockymadden.stringmetric.{CompareTuple, MatchTuple, StringFilter, StringMetric} +import scala.collection.mutable.{ArrayBuffer, HashSet} /** * An implementation of the Jaro metric. One differing detail in this implementation is that if a character is matched diff --git a/core/source/core/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetric.scala index 24fd316..4e9aebd 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/JaroWinklerMetric.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -import com.rockymadden.stringmetric.{ StringFilter, StringMetric } +import com.rockymadden.stringmetric.{StringFilter, StringMetric} /** * An implementation of the Jaro-Winkler metric. One differing detail in this implementation is that if a character is diff --git a/core/source/core/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetric.scala index 241523c..47dff23 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/LevenshteinMetric.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -import com.rockymadden.stringmetric.{ CompareTuple, StringFilter, StringMetric } +import com.rockymadden.stringmetric.{CompareTuple, StringFilter, StringMetric} /** An implementation of the Levenshtein metric. */ class LevenshteinMetric extends StringMetric[DummyImplicit, Int] { this: StringFilter => diff --git a/core/source/core/scala/com/rockymadden/stringmetric/similarity/NGramMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/similarity/NGramMetric.scala index ca6fa51..e74e8eb 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/NGramMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/NGramMetric.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -import com.rockymadden.stringmetric.{ StringMetric, MatchTuple, StringFilter } +import com.rockymadden.stringmetric.{StringMetric, MatchTuple, StringFilter} import com.rockymadden.stringmetric.tokenization.NGramTokenizer import scala.math diff --git a/core/source/core/scala/com/rockymadden/stringmetric/similarity/OverlapMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/similarity/OverlapMetric.scala index ee8bba0..a543a7e 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/OverlapMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/OverlapMetric.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -import com.rockymadden.stringmetric.{ StringMetric, MatchTuple, StringFilter } +import com.rockymadden.stringmetric.{StringMetric, MatchTuple, StringFilter} import com.rockymadden.stringmetric.tokenization.NGramTokenizer import scala.math diff --git a/core/source/core/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetric.scala index 845e5b4..1017b1f 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/RatcliffObershelpMetric.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -import com.rockymadden.stringmetric.{ CompareTuple, StringFilter, StringMetric } +import com.rockymadden.stringmetric.{CompareTuple, StringFilter, StringMetric} /** An implementation of the Ratcliff/Obershelp metric. */ class RatcliffObershelpMetric extends StringMetric[DummyImplicit, Double] { this: StringFilter => diff --git a/core/source/core/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetric.scala index feb0041..976b01a 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetric.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetric.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.similarity -import com.rockymadden.stringmetric.{ CompareTuple, StringMetric, StringFilter } +import com.rockymadden.stringmetric.{CompareTuple, StringMetric, StringFilter} import scala.math.BigDecimal /** An implementation of a weighted Levenshtein metric. */ diff --git a/core/source/core/scala/com/rockymadden/stringmetric/tokenization/NGramTokenizer.scala b/core/source/core/scala/com/rockymadden/stringmetric/tokenization/NGramTokenizer.scala index 8e27420..d66fd62 100755 --- a/core/source/core/scala/com/rockymadden/stringmetric/tokenization/NGramTokenizer.scala +++ b/core/source/core/scala/com/rockymadden/stringmetric/tokenization/NGramTokenizer.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric.tokenization -import com.rockymadden.stringmetric.{ StringFilter, StringTokenizer } +import com.rockymadden.stringmetric.{StringFilter, StringTokenizer} import scala.annotation.tailrec /** An implementation of the N-Gram tokenizer. */ diff --git a/core/source/test/scala/com/rockymadden/stringmetric/AlphabetSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/AlphabetSpec.scala index 25b7283..5bb503a 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/AlphabetSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/AlphabetSpec.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric -import com.rockymadden.stringmetric.Alphabet.{ Alpha, Vowel } +import com.rockymadden.stringmetric.Alphabet.{Alpha, Vowel} import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner diff --git a/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala index c6a210c..e900f83 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala @@ -8,7 +8,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class FilterDecoratedSpec extends ScalaTest { - import FilterDecoratedSpec.{ Algorithm, Metric } + import FilterDecoratedSpec.{Algorithm, Metric} "Filter decorated metrics" should provide { "compare method" when passed { diff --git a/core/source/test/scala/com/rockymadden/stringmetric/ScalaTest.scala b/core/source/test/scala/com/rockymadden/stringmetric/ScalaTest.scala index 9e4b4a9..5f4ab62 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/ScalaTest.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/ScalaTest.scala @@ -1,6 +1,6 @@ package com.rockymadden.stringmetric -import org.scalatest.{ BeforeAndAfter, ParallelTestExecution, WordSpec } +import org.scalatest.{BeforeAndAfter, ParallelTestExecution, WordSpec} import org.scalatest.matchers.ShouldMatchers trait ScalaTest extends WordSpec with ShouldMatchers with BeforeAndAfter with ParallelTestExecution { diff --git a/core/source/test/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricSpec.scala index 0d4e246..9c46c89 100755 --- a/core/source/test/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricSpec.scala +++ b/core/source/test/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetricSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) final class WeightedLevenshteinMetricSpec extends ScalaTest { - import WeightedLevenshteinMetricSpec.{ Metric, Options } + import WeightedLevenshteinMetricSpec.{Metric, Options} "WeightedLevenshteinMetric" should provide { "compare method" when passed { |