Algorithm and metric companion objects now have pass-through compute/compare methods, which are backed by lazy vals.

19 files changed, 19 insertions, 19 deletions

diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/metaphoneAlgorithm.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/metaphoneAlgorithm.scala
index d2ae05c..8ef925b 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/metaphoneAlgorithm.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/metaphoneAlgorithm.scala
@@ -39,5 +39,5 @@ object metaphoneAlgorithm extends Command {
 	}
 
 	override def execute(options: OptionMap): Unit =
-		println(MetaphoneAlgorithm().compute(options('dashless)).getOrElse("not computable"))
+		println(MetaphoneAlgorithm.compute(options('dashless)).getOrElse("not computable"))
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/metaphoneMetric.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/metaphoneMetric.scala
index 89acbb9..d3cd7f0 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/metaphoneMetric.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/metaphoneMetric.scala
@@ -41,6 +41,6 @@ object metaphoneMetric extends Command {
 	override def execute(options: OptionMap): Unit = {
 		val strings: OptionMapArray = options('dashless)
 
-		println(MetaphoneMetric().compare(strings(0), strings(1)).getOrElse("not comparable"))
+		println(MetaphoneMetric.compare(strings(0), strings(1)).getOrElse("not comparable"))
 	}
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisAlgorithm.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisAlgorithm.scala
index c0226b0..33a9d82 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisAlgorithm.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisAlgorithm.scala
@@ -39,5 +39,5 @@ object nysiisAlgorithm extends Command {
 	}
 
 	override def execute(options: OptionMap): Unit =
-		println(NysiisAlgorithm().compute(options('dashless)).getOrElse("not computable"))
+		println(NysiisAlgorithm.compute(options('dashless)).getOrElse("not computable"))
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisMetric.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisMetric.scala
index d5d31a8..f051bed 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisMetric.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/nysiisMetric.scala
@@ -41,6 +41,6 @@ object nysiisMetric extends Command {
 	override def execute(options: OptionMap): Unit = {
 		val strings: OptionMapArray = options('dashless)
 
-		println(NysiisMetric().compare(strings(0), strings(1)).getOrElse("not comparable"))
+		println(NysiisMetric.compare(strings(0), strings(1)).getOrElse("not comparable"))
 	}
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedNysiisAlgorithm.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedNysiisAlgorithm.scala
index 2760e42..a2a18e4 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedNysiisAlgorithm.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedNysiisAlgorithm.scala
@@ -39,5 +39,5 @@ object refinedNysiisAlgorithm extends Command {
 	}
 
 	override def execute(options: OptionMap): Unit =
-		println(RefinedNysiisAlgorithm().compute(options('dashless)).getOrElse("not computable"))
+		println(RefinedNysiisAlgorithm.compute(options('dashless)).getOrElse("not computable"))
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedNysiisMetric.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedNysiisMetric.scala
index e669853..00a078e 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedNysiisMetric.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedNysiisMetric.scala
@@ -41,6 +41,6 @@ object refinedNysiisMetric extends Command {
 	override def execute(options: OptionMap): Unit = {
 		val strings: OptionMapArray = options('dashless)
 
-		println(RefinedNysiisMetric().compare(strings(0), strings(1)).getOrElse("not comparable"))
+		println(RefinedNysiisMetric.compare(strings(0), strings(1)).getOrElse("not comparable"))
 	}
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedSoundexAlgorithm.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedSoundexAlgorithm.scala
index 38cec2f..3fe6ed3 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedSoundexAlgorithm.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedSoundexAlgorithm.scala
@@ -39,5 +39,5 @@ object refinedSoundexAlgorithm extends Command {
 	}
 
 	override def execute(options: OptionMap): Unit =
-		println(RefinedSoundexAlgorithm().compute(options('dashless)).getOrElse("not computable"))
+		println(RefinedSoundexAlgorithm.compute(options('dashless)).getOrElse("not computable"))
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedSoundexMetric.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedSoundexMetric.scala
index 3420ad2..2a0dbf5 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedSoundexMetric.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/refinedSoundexMetric.scala
@@ -41,6 +41,6 @@ object refinedSoundexMetric extends Command {
 	override def execute(options: OptionMap): Unit = {
 		val strings: OptionMapArray = options('dashless)
 
-		println(RefinedSoundexMetric().compare(strings(0), strings(1)).getOrElse("not comparable"))
+		println(RefinedSoundexMetric.compare(strings(0), strings(1)).getOrElse("not comparable"))
 	}
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/soundexAlgorithm.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/soundexAlgorithm.scala
index 9d1e225..45e78d3 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/soundexAlgorithm.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/soundexAlgorithm.scala
@@ -39,5 +39,5 @@ object soundexAlgorithm extends Command {
 	}
 
 	override def execute(options: OptionMap): Unit =
-		println(SoundexAlgorithm().compute(options('dashless)).getOrElse("not computable"))
+		println(SoundexAlgorithm.compute(options('dashless)).getOrElse("not computable"))
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/soundexMetric.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/soundexMetric.scala
index ec48d01..9e6c21d 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/soundexMetric.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/phonetic/soundexMetric.scala
@@ -41,6 +41,6 @@ object soundexMetric extends Command {
 	override def execute(options: OptionMap): Unit = {
 		val strings: OptionMapArray = options('dashless)
 
-		println(SoundexMetric().compare(strings(0), strings(1)).getOrElse("not comparable"))
+		println(SoundexMetric.compare(strings(0), strings(1)).getOrElse("not comparable"))
 	}
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/diceSorensenMetric.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/diceSorensenMetric.scala
index e89c745..02b4b09 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/diceSorensenMetric.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/diceSorensenMetric.scala
@@ -46,6 +46,6 @@ object diceSorensenMetric extends Command {
 		val strings: OptionMapArray = options('dashless)
 		val n: OptionMapInt = options('n)
 
-		println(DiceSorensenMetric().compare(strings(0), strings(1))(n).getOrElse("not comparable"))
+		println(DiceSorensenMetric.compare(strings(0), strings(1))(n).getOrElse("not comparable"))
 	}
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/hammingMetric.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/hammingMetric.scala
index 66abe83..c5373d2 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/hammingMetric.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/hammingMetric.scala
@@ -41,6 +41,6 @@ object hammingMetric extends Command {
 	override def execute(options: OptionMap): Unit = {
 		val strings: OptionMapArray = options('dashless)
 
-		println(HammingMetric().compare(strings(0), strings(1)).getOrElse("not comparable"))
+		println(HammingMetric.compare(strings(0), strings(1)).getOrElse("not comparable"))
 	}
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/jaroMetric.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/jaroMetric.scala
index f95cb50..7e54c61 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/jaroMetric.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/jaroMetric.scala
@@ -38,6 +38,6 @@ object jaroMetric extends Command {
 	override def execute(options: OptionMap): Unit = {
 		val strings: OptionMapArray = options('dashless)
 
-		println(JaroMetric().compare(strings(0), strings(1)).getOrElse("not comparable"))
+		println(JaroMetric.compare(strings(0), strings(1)).getOrElse("not comparable"))
 	}
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/jaroWinklerMetric.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/jaroWinklerMetric.scala
index c5dc3c8..287e6f6 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/jaroWinklerMetric.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/jaroWinklerMetric.scala
@@ -41,6 +41,6 @@ object jaroWinklerMetric extends Command {
 	override def execute(options: OptionMap): Unit = {
 		val strings: OptionMapArray = options('dashless)
 
-		println(JaroWinklerMetric().compare(strings(0), strings(1)).getOrElse("not comparable"))
+		println(JaroWinklerMetric.compare(strings(0), strings(1)).getOrElse("not comparable"))
 	}
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinMetric.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinMetric.scala
index 4277822..c8e65a5 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinMetric.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/levenshteinMetric.scala
@@ -42,6 +42,6 @@ object levenshteinMetric extends Command {
 	override def execute(options: OptionMap): Unit = {
 		val strings: OptionMapArray = options('dashless)
 
-		println(LevenshteinMetric().compare(strings(0), strings(1)).getOrElse("not comparable"))
+		println(LevenshteinMetric.compare(strings(0), strings(1)).getOrElse("not comparable"))
 	}
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/nGramAlgorithm.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/nGramAlgorithm.scala
index 4fdfc39..f684514 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/nGramAlgorithm.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/nGramAlgorithm.scala
@@ -45,6 +45,6 @@ object nGramAlgorithm extends Command {
 	override def execute(options: OptionMap): Unit = {
 		val n: OptionMapInt = options('n)
 
-		println(NGramAlgorithm().compute(options('dashless))(n).map(_.mkString("|")).getOrElse("not computable"))
+		println(NGramAlgorithm.compute(options('dashless))(n).map(_.mkString("|")).getOrElse("not computable"))
 	}
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/nGramMetric.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/nGramMetric.scala
index b5faea4..5236dc3 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/nGramMetric.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/nGramMetric.scala
@@ -46,6 +46,6 @@ object nGramMetric extends Command {
 		val strings: OptionMapArray = options('dashless)
 		val n: OptionMapInt = options('n)
 
-		println(NGramMetric().compare(strings(0), strings(1))(n).getOrElse("not comparable"))
+		println(NGramMetric.compare(strings(0), strings(1))(n).getOrElse("not comparable"))
 	}
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffObershelpMetric.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffObershelpMetric.scala
index b72f832..c477122 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffObershelpMetric.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/ratcliffObershelpMetric.scala
@@ -41,6 +41,6 @@ object ratcliffObershelpMetric extends Command {
 	override def execute(options: OptionMap): Unit = {
 		val strings: OptionMapArray = options('dashless)
 
-		println(RatcliffObershelpMetric().compare(strings(0), strings(1)).getOrElse("not comparable"))
+		println(RatcliffObershelpMetric.compare(strings(0), strings(1)).getOrElse("not comparable"))
 	}
 }
diff --git a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/weightedLevenshteinMetric.scala b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/weightedLevenshteinMetric.scala
index f809031..09f83ff 100755
--- a/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/weightedLevenshteinMetric.scala
+++ b/cli/source/core/scala/com/rockymadden/stringmetric/cli/similarity/weightedLevenshteinMetric.scala
@@ -59,6 +59,6 @@ object weightedLevenshteinMetric extends Command {
 			(options('substituteWeight): OptionMapBigDecimal)
 		)
 
-		println(WeightedLevenshteinMetric().compare(strings(0), strings(1))(weights).getOrElse("not comparable"))
+		println(WeightedLevenshteinMetric.compare(strings(0), strings(1))(weights).getOrElse("not comparable"))
 	}
 }