From fca18d7a77b66208309929955fa3a8e72ca5e766 Mon Sep 17 00:00:00 2001 From: Rocky Madden Date: Sun, 11 Nov 2012 10:48:24 -0700 Subject: Removed ASCII letter case filter. It was undocumented and was likely an unwelcome addition to each CLI. --- .../stringmetric/cli/similarity/diceSorensenMetric.scala | 3 +-- .../hashtree/stringmetric/cli/similarity/hammingMetric.scala | 3 +-- .../org/hashtree/stringmetric/cli/similarity/jaroMetric.scala | 3 +-- .../stringmetric/cli/similarity/jaroWinklerMetric.scala | 3 +-- .../stringmetric/cli/similarity/levenshteinMetric.scala | 3 +-- .../hashtree/stringmetric/cli/similarity/nGramAlgorithm.scala | 4 +--- .../org/hashtree/stringmetric/cli/similarity/nGramMetric.scala | 3 +-- .../cli/similarity/weightedLevenshteinMetric.scala | 3 +-- .../stringmetric/cli/phonetic/metaphoneAlgorithmSpec.scala | 2 +- .../stringmetric/cli/phonetic/metaphoneMetricSpec.scala | 4 ++-- .../stringmetric/cli/phonetic/nysiisAlgorithmSpec.scala | 2 +- .../hashtree/stringmetric/cli/phonetic/nysiisMetricSpec.scala | 4 ++-- .../cli/phonetic/refinedSoundexAlgorithmSpec.scala | 2 +- .../stringmetric/cli/phonetic/refinedSoundexMetricSpec.scala | 4 ++-- .../stringmetric/cli/phonetic/soundexAlgorithmSpec.scala | 2 +- .../hashtree/stringmetric/cli/phonetic/soundexMetricSpec.scala | 4 ++-- .../stringmetric/cli/similarity/diceSorensenMetricSpec.scala | 4 ++-- .../stringmetric/cli/similarity/hammingMetricSpec.scala | 4 ++-- .../hashtree/stringmetric/cli/similarity/jaroMetricSpec.scala | 4 ++-- .../stringmetric/cli/similarity/jaroWinklerMetricSpec.scala | 4 ++-- .../stringmetric/cli/similarity/levenshteinMetricSpec.scala | 4 ++-- .../stringmetric/cli/similarity/nGramAlgorithmSpec.scala | 10 +++++----- .../hashtree/stringmetric/cli/similarity/nGramMetricSpec.scala | 6 +++--- .../cli/similarity/weightedLevenshteinMetricSpec.scala | 8 ++++---- 24 files changed, 42 insertions(+), 51 deletions(-) (limited to 'cli/source') diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetric.scala index de0b302..3c5a8b1 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetric.scala @@ -2,7 +2,6 @@ package org.hashtree.stringmetric.cli.similarity import org.hashtree.stringmetric.StringFilterDelegate import org.hashtree.stringmetric.cli._ -import org.hashtree.stringmetric.filter.AsciiLetterCaseStringFilter import org.hashtree.stringmetric.similarity.DiceSorensenMetric /** @@ -55,7 +54,7 @@ object diceSorensenMetric extends Command { DiceSorensenMetric.compare( strings(0), strings(1) - )(n)(new StringFilterDelegate with AsciiLetterCaseStringFilter).getOrElse("not comparable").toString + )(n)(new StringFilterDelegate).getOrElse("not comparable").toString ) } } \ No newline at end of file diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/hammingMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/hammingMetric.scala index a9d73d3..fc3b476 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/hammingMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/hammingMetric.scala @@ -2,7 +2,6 @@ package org.hashtree.stringmetric.cli.similarity import org.hashtree.stringmetric.StringFilterDelegate import org.hashtree.stringmetric.cli._ -import org.hashtree.stringmetric.filter.AsciiLetterCaseStringFilter import org.hashtree.stringmetric.similarity.HammingMetric /** @@ -50,7 +49,7 @@ object hammingMetric extends Command { HammingMetric.compare( strings(0), strings(1) - )(new StringFilterDelegate with AsciiLetterCaseStringFilter).getOrElse("not comparable").toString + )(new StringFilterDelegate).getOrElse("not comparable").toString ) } } \ No newline at end of file diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroMetric.scala index 8ebf9f1..64979ba 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroMetric.scala @@ -2,7 +2,6 @@ package org.hashtree.stringmetric.cli.similarity import org.hashtree.stringmetric.StringFilterDelegate import org.hashtree.stringmetric.cli._ -import org.hashtree.stringmetric.filter.AsciiLetterCaseStringFilter import org.hashtree.stringmetric.similarity.JaroMetric /** The jaroMetric [[org.hashtree.stringmetric.cli.Command]]. Compares two strings to calculate the Jaro distance. */ @@ -47,7 +46,7 @@ object jaroMetric extends Command { JaroMetric.compare( strings(0), strings(1) - )(new StringFilterDelegate with AsciiLetterCaseStringFilter).getOrElse("not comparable").toString + )(new StringFilterDelegate).getOrElse("not comparable").toString ) } } \ No newline at end of file diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetric.scala index 3c30715..09d875b 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetric.scala @@ -2,7 +2,6 @@ package org.hashtree.stringmetric.cli.similarity import org.hashtree.stringmetric.StringFilterDelegate import org.hashtree.stringmetric.cli._ -import org.hashtree.stringmetric.filter.AsciiLetterCaseStringFilter import org.hashtree.stringmetric.similarity.JaroWinklerMetric /** @@ -50,7 +49,7 @@ object jaroWinklerMetric extends Command { JaroWinklerMetric.compare( strings(0), strings(1) - )(new StringFilterDelegate with AsciiLetterCaseStringFilter).getOrElse("not comparable").toString + )(new StringFilterDelegate).getOrElse("not comparable").toString ) } } \ No newline at end of file diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetric.scala index 277898d..900edc0 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetric.scala @@ -2,7 +2,6 @@ package org.hashtree.stringmetric.cli.similarity import org.hashtree.stringmetric.StringFilterDelegate import org.hashtree.stringmetric.cli._ -import org.hashtree.stringmetric.filter.AsciiLetterCaseStringFilter import org.hashtree.stringmetric.similarity.LevenshteinMetric /** @@ -51,7 +50,7 @@ object levenshteinMetric extends Command { LevenshteinMetric.compare( strings(0), strings(1) - )(new StringFilterDelegate with AsciiLetterCaseStringFilter).getOrElse("not comparable").toString + )(new StringFilterDelegate).getOrElse("not comparable").toString ) } } \ No newline at end of file diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithm.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithm.scala index 7bdd9aa..3aae788 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithm.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithm.scala @@ -2,7 +2,6 @@ package org.hashtree.stringmetric.cli.similarity import org.hashtree.stringmetric.StringFilterDelegate import org.hashtree.stringmetric.cli._ -import org.hashtree.stringmetric.filter.AsciiLetterCaseStringFilter import org.hashtree.stringmetric.similarity.NGramAlgorithm /** @@ -48,8 +47,7 @@ object nGramAlgorithm extends Command { override def execute(options: OptionMap): Unit = { val n = ParseUtility.parseInt(options('n)).get - val ngram = NGramAlgorithm.compute(options('dashless))(n) - (new StringFilterDelegate with AsciiLetterCaseStringFilter) + val ngram = NGramAlgorithm.compute(options('dashless))(n)(new StringFilterDelegate) ngram match { case Some(a) => println(a.mkString("|")) diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramMetric.scala index 39ca1b6..964a11a 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramMetric.scala @@ -2,7 +2,6 @@ package org.hashtree.stringmetric.cli.similarity import org.hashtree.stringmetric.StringFilterDelegate import org.hashtree.stringmetric.cli._ -import org.hashtree.stringmetric.filter.AsciiLetterCaseStringFilter import org.hashtree.stringmetric.similarity.NGramMetric /** @@ -55,7 +54,7 @@ object nGramMetric extends Command { NGramMetric.compare( strings(0), strings(1) - )(n)(new StringFilterDelegate with AsciiLetterCaseStringFilter).getOrElse("not comparable").toString + )(n)(new StringFilterDelegate).getOrElse("not comparable").toString ) } } \ No newline at end of file diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetric.scala index ac10754..60056e3 100755 --- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetric.scala +++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetric.scala @@ -2,7 +2,6 @@ package org.hashtree.stringmetric.cli.similarity import org.hashtree.stringmetric.StringFilterDelegate import org.hashtree.stringmetric.cli._ -import org.hashtree.stringmetric.filter.AsciiLetterCaseStringFilter import org.hashtree.stringmetric.similarity.WeightedLevenshteinMetric import scala.math.BigDecimal @@ -68,7 +67,7 @@ object weightedLevenshteinMetric extends Command { WeightedLevenshteinMetric.compare( strings(0), strings(1) - )(weights)(new StringFilterDelegate with AsciiLetterCaseStringFilter).getOrElse("not comparable").toString + )(weights)(new StringFilterDelegate).getOrElse("not comparable").toString ) } } \ No newline at end of file diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneAlgorithmSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneAlgorithmSpec.scala index abf81eb..72258c5 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneAlgorithmSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneAlgorithmSpec.scala @@ -13,7 +13,7 @@ final class metaphoneAlgorithmSpec extends ScalaTest { val out = new java.io.ByteArrayOutputStream() Console.withOut(out)( - metaphoneAlgorithm.main(Array("--unitTest", "--debug", "aBc")) + metaphoneAlgorithm.main(Array("--unitTest", "--debug", "abc")) ) out.toString should equal ("abk\n") diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneMetricSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneMetricSpec.scala index 58ce5e0..2f72e39 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneMetricSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneMetricSpec.scala @@ -13,14 +13,14 @@ final class metaphoneMetricSpec extends ScalaTest { val out = new java.io.ByteArrayOutputStream() Console.withOut(out)( - metaphoneMetric.main(Array("--unitTest", "--debug", "aBc", "abc")) + metaphoneMetric.main(Array("--unitTest", "--debug", "abc", "abc")) ) out.toString should equal ("true\n") out.reset() Console.withOut(out)( - metaphoneMetric.main(Array("--unitTest", "--debug", "aBc", "xyz")) + metaphoneMetric.main(Array("--unitTest", "--debug", "abc", "xyz")) ) out.toString should equal ("false\n") diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/nysiisAlgorithmSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/nysiisAlgorithmSpec.scala index 7a5d224..caaa3e9 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/nysiisAlgorithmSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/nysiisAlgorithmSpec.scala @@ -13,7 +13,7 @@ final class nysiisAlgorithmSpec extends ScalaTest { val out = new java.io.ByteArrayOutputStream() Console.withOut(out)( - nysiisAlgorithm.main(Array("--unitTest", "--debug", "aBc")) + nysiisAlgorithm.main(Array("--unitTest", "--debug", "abc")) ) out.toString should equal ("abc\n") diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/nysiisMetricSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/nysiisMetricSpec.scala index dfa6c22..3f5a346 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/nysiisMetricSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/nysiisMetricSpec.scala @@ -13,14 +13,14 @@ final class nysiisMetricSpec extends ScalaTest { val out = new java.io.ByteArrayOutputStream() Console.withOut(out)( - nysiisMetric.main(Array("--unitTest", "--debug", "aBc", "abc")) + nysiisMetric.main(Array("--unitTest", "--debug", "abc", "abc")) ) out.toString should equal ("true\n") out.reset() Console.withOut(out)( - nysiisMetric.main(Array("--unitTest", "--debug", "aBc", "xyz")) + nysiisMetric.main(Array("--unitTest", "--debug", "abc", "xyz")) ) out.toString should equal ("false\n") diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexAlgorithmSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexAlgorithmSpec.scala index 8db2b1f..a3265b7 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexAlgorithmSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexAlgorithmSpec.scala @@ -13,7 +13,7 @@ final class refinedSoundexAlgorithmSpec extends ScalaTest { val out = new java.io.ByteArrayOutputStream() Console.withOut(out)( - refinedSoundexAlgorithm.main(Array("--unitTest", "--debug", "aBc")) + refinedSoundexAlgorithm.main(Array("--unitTest", "--debug", "abc")) ) out.toString should equal ("a013\n") diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexMetricSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexMetricSpec.scala index 029842f..9588f4f 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexMetricSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexMetricSpec.scala @@ -13,14 +13,14 @@ final class refinedSoundexMetricSpec extends ScalaTest { val out = new java.io.ByteArrayOutputStream() Console.withOut(out)( - refinedSoundexMetric.main(Array("--unitTest", "--debug", "aBc", "abc")) + refinedSoundexMetric.main(Array("--unitTest", "--debug", "abc", "abc")) ) out.toString should equal ("true\n") out.reset() Console.withOut(out)( - refinedSoundexMetric.main(Array("--unitTest", "--debug", "aBc", "xyz")) + refinedSoundexMetric.main(Array("--unitTest", "--debug", "abc", "xyz")) ) out.toString should equal ("false\n") diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/soundexAlgorithmSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/soundexAlgorithmSpec.scala index cc9c28a..16ce3be 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/soundexAlgorithmSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/soundexAlgorithmSpec.scala @@ -13,7 +13,7 @@ final class soundexAlgorithmSpec extends ScalaTest { val out = new java.io.ByteArrayOutputStream() Console.withOut(out)( - soundexAlgorithm.main(Array("--unitTest", "--debug", "aBc")) + soundexAlgorithm.main(Array("--unitTest", "--debug", "abc")) ) out.toString should equal ("a120\n") diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/soundexMetricSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/soundexMetricSpec.scala index e26b74f..b245996 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/soundexMetricSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/phonetic/soundexMetricSpec.scala @@ -13,14 +13,14 @@ final class soundexMetricSpec extends ScalaTest { val out = new java.io.ByteArrayOutputStream() Console.withOut(out)( - soundexMetric.main(Array("--unitTest", "--debug", "aBc", "abc")) + soundexMetric.main(Array("--unitTest", "--debug", "abc", "abc")) ) out.toString should equal ("true\n") out.reset() Console.withOut(out)( - soundexMetric.main(Array("--unitTest", "--debug", "aBc", "xyz")) + soundexMetric.main(Array("--unitTest", "--debug", "abc", "xyz")) ) out.toString should equal ("false\n") diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetricSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetricSpec.scala index 1e2c286..8d59172 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetricSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetricSpec.scala @@ -13,14 +13,14 @@ final class diceSorensenMetricSpec extends ScalaTest { val out = new java.io.ByteArrayOutputStream() Console.withOut(out)( - diceSorensenMetric.main(Array("--unitTest", "--debug", "--n=2", "aBc", "abc")) + diceSorensenMetric.main(Array("--unitTest", "--debug", "--n=2", "abc", "abc")) ) out.toString should equal ("1.0\n") out.reset() Console.withOut(out)( - diceSorensenMetric.main(Array("--unitTest", "--debug", "--n=2", "aBc", "xyz")) + diceSorensenMetric.main(Array("--unitTest", "--debug", "--n=2", "abc", "xyz")) ) out.toString should equal ("0.0\n") diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/hammingMetricSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/hammingMetricSpec.scala index 3108090..ac54e0e 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/hammingMetricSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/hammingMetricSpec.scala @@ -13,14 +13,14 @@ final class hammingMetricSpec extends ScalaTest { val out = new java.io.ByteArrayOutputStream() Console.withOut(out)( - hammingMetric.main(Array("--unitTest", "--debug", "aBc", "abc")) + hammingMetric.main(Array("--unitTest", "--debug", "abc", "abc")) ) out.toString should equal ("0\n") out.reset() Console.withOut(out)( - hammingMetric.main(Array("--unitTest", "--debug", "aBc", "xyz")) + hammingMetric.main(Array("--unitTest", "--debug", "abc", "xyz")) ) out.toString should equal ("3\n") diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/jaroMetricSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/jaroMetricSpec.scala index c85a8c7..192007b 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/jaroMetricSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/jaroMetricSpec.scala @@ -13,14 +13,14 @@ final class jaroMetricSpec extends ScalaTest { val out = new java.io.ByteArrayOutputStream() Console.withOut(out)( - jaroMetric.main(Array("--unitTest", "--debug", "aBc", "abc")) + jaroMetric.main(Array("--unitTest", "--debug", "abc", "abc")) ) out.toString should equal ("1.0\n") out.reset() Console.withOut(out)( - jaroMetric.main(Array("--unitTest", "--debug", "aBc", "xyz")) + jaroMetric.main(Array("--unitTest", "--debug", "abc", "xyz")) ) out.toString should equal ("0.0\n") diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetricSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetricSpec.scala index 4755f37..e5c8427 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetricSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetricSpec.scala @@ -13,14 +13,14 @@ final class jaroWinklerMetricSpec extends ScalaTest { val out = new java.io.ByteArrayOutputStream() Console.withOut(out)( - jaroWinklerMetric.main(Array("--unitTest", "--debug", "aBc", "abc")) + jaroWinklerMetric.main(Array("--unitTest", "--debug", "abc", "abc")) ) out.toString should equal ("1.0\n") out.reset() Console.withOut(out)( - jaroWinklerMetric.main(Array("--unitTest", "--debug", "aBc", "xyz")) + jaroWinklerMetric.main(Array("--unitTest", "--debug", "abc", "xyz")) ) out.toString should equal ("0.0\n") diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetricSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetricSpec.scala index 0a19550..5f5f900 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetricSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetricSpec.scala @@ -13,14 +13,14 @@ final class levenshteinMetricSpec extends ScalaTest { val out = new java.io.ByteArrayOutputStream() Console.withOut(out)( - levenshteinMetric.main(Array("--unitTest", "--debug", "aBc", "abc")) + levenshteinMetric.main(Array("--unitTest", "--debug", "abc", "abc")) ) out.toString should equal ("0\n") out.reset() Console.withOut(out)( - levenshteinMetric.main(Array("--unitTest", "--debug", "aBc", "xyz")) + levenshteinMetric.main(Array("--unitTest", "--debug", "abc", "xyz")) ) out.toString should equal ("3\n") diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithmSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithmSpec.scala index 5997a9c..b041e14 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithmSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithmSpec.scala @@ -18,12 +18,12 @@ final class nGramAlgorithmSpec extends ScalaTest { "--unitTest", "--debug", "--n=1", - "aBc" + "abc" ) ) ) - out.toString should equal ("a|B|c\n") + out.toString should equal ("a|b|c\n") out.reset() Console.withOut(out)( @@ -32,12 +32,12 @@ final class nGramAlgorithmSpec extends ScalaTest { "--unitTest", "--debug", "--n=2", - "aBc" + "abc" ) ) ) - out.toString should equal ("aB|Bc\n") + out.toString should equal ("ab|bc\n") out.reset() } } @@ -47,7 +47,7 @@ final class nGramAlgorithmSpec extends ScalaTest { nGramAlgorithm.main( Array( "--unitTest", - "aBc", + "abc", "abc" ) ) diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/nGramMetricSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/nGramMetricSpec.scala index 18e8a50..c4f5689 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/nGramMetricSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/nGramMetricSpec.scala @@ -18,7 +18,7 @@ final class nGramMetricSpec extends ScalaTest { "--unitTest", "--debug", "--n=1", - "aBc", + "abc", "abc" ) ) @@ -33,7 +33,7 @@ final class nGramMetricSpec extends ScalaTest { "--unitTest", "--debug", "--n=1", - "aBc", + "abc", "xyz" ) ) @@ -49,7 +49,7 @@ final class nGramMetricSpec extends ScalaTest { nGramMetric.main( Array( "--unitTest", - "aBc", + "abc", "abc" ) ) diff --git a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetricSpec.scala b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetricSpec.scala index 43e22c4..dc3e898 100755 --- a/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetricSpec.scala +++ b/cli/source/test/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetricSpec.scala @@ -20,7 +20,7 @@ final class weightedLevenshteinMetricSpec extends ScalaTest { "--deleteWeight=1", "--insertWeight=1", "--substituteWeight=1", - "aBc", + "abc", "abc" ) ) @@ -37,7 +37,7 @@ final class weightedLevenshteinMetricSpec extends ScalaTest { "--deleteWeight=2", "--insertWeight=2", "--substituteWeight=1", - "aBc", + "abc", "xyz" ) ) @@ -90,7 +90,7 @@ final class weightedLevenshteinMetricSpec extends ScalaTest { "--debug", "--deleteWeight=1", "--substituteWeight=1", - "aBc", + "abc", "abc" ) ) @@ -104,7 +104,7 @@ final class weightedLevenshteinMetricSpec extends ScalaTest { "--deleteWeight=1", "--insertWeight=q", "--substituteWeight=1", - "aBc", + "abc", "abc" ) ) -- cgit v1.2.3