diff options
| -rwxr-xr-x | cli/source/core/scala/org/hashtree/stringmetric/cli/command/diceSorensenMetric.scala | 4 | ||||
| -rwxr-xr-x | cli/source/core/scala/org/hashtree/stringmetric/cli/command/hammingMetric.scala | 4 | ||||
| -rwxr-xr-x | cli/source/core/scala/org/hashtree/stringmetric/cli/command/jaroMetric.scala | 4 | ||||
| -rwxr-xr-x | cli/source/core/scala/org/hashtree/stringmetric/cli/command/jaroWinklerMetric.scala | 4 | ||||
| -rwxr-xr-x | cli/source/core/scala/org/hashtree/stringmetric/cli/command/levenshteinMetric.scala | 4 | ||||
| -rwxr-xr-x | core/source/core/scala/org/hashtree/stringmetric/AsciiCaseStringCleaner.scala (renamed from core/source/core/scala/org/hashtree/stringmetric/CaseStringCleaner.scala) | 2 | ||||
| -rwxr-xr-x | core/source/test/scala/org/hashtree/stringmetric/AsciiCaseStringCleanerSpec.scala (renamed from core/source/test/scala/org/hashtree/stringmetric/CaseStringCleanerSpec.scala) | 6 |
7 files changed, 14 insertions, 14 deletions
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/command/diceSorensenMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/command/diceSorensenMetric.scala index 1e21a2d..3cb40a5 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/command/diceSorensenMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/command/diceSorensenMetric.scala @@ -1,6 +1,6 @@ package org.hashtree.stringmetric.cli.command -import org.hashtree.stringmetric.{ CaseStringCleaner, StringCleanerDelegate } +import org.hashtree.stringmetric.{ AsciiCaseStringCleaner, StringCleanerDelegate } import org.hashtree.stringmetric.cli._ import org.hashtree.stringmetric.cli.command._ import org.hashtree.stringmetric.distance.DiceSorensenMetric @@ -52,7 +52,7 @@ object diceSorensenMetric extends Command { DiceSorensenMetric.compare( strings(0), strings(1) - )(new StringCleanerDelegate with CaseStringCleaner).getOrElse("not comparable").toString + )(new StringCleanerDelegate with AsciiCaseStringCleaner).getOrElse("not comparable").toString ) } }
\ No newline at end of file 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 d0e121a..2de9e8e 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,6 +1,6 @@ package org.hashtree.stringmetric.cli.command -import org.hashtree.stringmetric.{ CaseStringCleaner, StringCleanerDelegate } +import org.hashtree.stringmetric.{ AsciiCaseStringCleaner, StringCleanerDelegate } import org.hashtree.stringmetric.cli._ import org.hashtree.stringmetric.cli.command._ import org.hashtree.stringmetric.distance.HammingMetric @@ -52,7 +52,7 @@ object hammingMetric extends Command { HammingMetric.compare( strings(0), strings(1) - )(new StringCleanerDelegate with CaseStringCleaner).getOrElse("not comparable").toString + )(new StringCleanerDelegate with AsciiCaseStringCleaner).getOrElse("not comparable").toString ) } }
\ No newline at end of file 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 86abdd5..a784214 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,6 +1,6 @@ package org.hashtree.stringmetric.cli.command -import org.hashtree.stringmetric.{ CaseStringCleaner, StringCleanerDelegate } +import org.hashtree.stringmetric.{ AsciiCaseStringCleaner, StringCleanerDelegate } import org.hashtree.stringmetric.cli._ import org.hashtree.stringmetric.cli.command._ import org.hashtree.stringmetric.distance.JaroMetric @@ -52,7 +52,7 @@ object jaroMetric extends Command { JaroMetric.compare( strings(0), strings(1) - )(new StringCleanerDelegate with CaseStringCleaner).getOrElse("not comparable").toString + )(new StringCleanerDelegate with AsciiCaseStringCleaner).getOrElse("not comparable").toString ) } }
\ No newline at end of file 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 564024d..d6b225e 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,6 +1,6 @@ package org.hashtree.stringmetric.cli.command -import org.hashtree.stringmetric.{ CaseStringCleaner, StringCleanerDelegate } +import org.hashtree.stringmetric.{ AsciiCaseStringCleaner, StringCleanerDelegate } import org.hashtree.stringmetric.cli._ import org.hashtree.stringmetric.cli.command._ import org.hashtree.stringmetric.distance.JaroWinklerMetric @@ -52,7 +52,7 @@ object jaroWinklerMetric extends Command { JaroWinklerMetric.compare( strings(0), strings(1) - )(new StringCleanerDelegate with CaseStringCleaner).getOrElse("not comparable").toString + )(new StringCleanerDelegate with AsciiCaseStringCleaner).getOrElse("not comparable").toString ) } }
\ No newline at end of file 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 3c7682a..6f963f1 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,6 +1,6 @@ package org.hashtree.stringmetric.cli.command -import org.hashtree.stringmetric.{ CaseStringCleaner, StringCleanerDelegate } +import org.hashtree.stringmetric.{ AsciiCaseStringCleaner, StringCleanerDelegate } import org.hashtree.stringmetric.cli._ import org.hashtree.stringmetric.cli.command._ import org.hashtree.stringmetric.distance.LevenshteinMetric @@ -53,7 +53,7 @@ object levenshteinMetric extends Command { LevenshteinMetric.compare( strings(0), strings(1) - )(new StringCleanerDelegate with CaseStringCleaner).getOrElse("not comparable").toString + )(new StringCleanerDelegate with AsciiCaseStringCleaner).getOrElse("not comparable").toString ) } }
\ No newline at end of file diff --git a/core/source/core/scala/org/hashtree/stringmetric/CaseStringCleaner.scala b/core/source/core/scala/org/hashtree/stringmetric/AsciiCaseStringCleaner.scala index e0a35ed..b70f15c 100755 --- a/core/source/core/scala/org/hashtree/stringmetric/CaseStringCleaner.scala +++ b/core/source/core/scala/org/hashtree/stringmetric/AsciiCaseStringCleaner.scala @@ -1,7 +1,7 @@ package org.hashtree.stringmetric /** A decorator [[org.hashtree.stringmetric.StringCleaner]]. Ensures the input case-sensitivity does not matter. */ -trait CaseStringCleaner extends StringCleaner { +trait AsciiCaseStringCleaner extends StringCleaner { abstract override def clean(charArray: Array[Char]): Array[Char] = { super.clean( charArray.map { c => diff --git a/core/source/test/scala/org/hashtree/stringmetric/CaseStringCleanerSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/AsciiCaseStringCleanerSpec.scala index a628700..52239ba 100755 --- a/core/source/test/scala/org/hashtree/stringmetric/CaseStringCleanerSpec.scala +++ b/core/source/test/scala/org/hashtree/stringmetric/AsciiCaseStringCleanerSpec.scala @@ -4,10 +4,10 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) -final class CaseStringCleanerSpec extends ScalaTest { - private final val Cleaner = new StringCleanerDelegate with CaseStringCleaner +final class AsciiCaseStringCleanerSpec extends ScalaTest { + private final val Cleaner = new StringCleanerDelegate with AsciiCaseStringCleaner - "CaseStringCleaner" should provide { + "AsciiCaseStringCleaner" should provide { "overloaded clean method" when passed { "String with mixed case" should returns { "String with the same case" in { |