More sensible type parameter ordering.

9 files changed, 9 insertions, 9 deletions

diff --git a/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableAlgorithm.scala b/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableAlgorithm.scala
index 6fa592f..dea1c42 100755
--- a/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableAlgorithm.scala
+++ b/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableAlgorithm.scala
@@ -1,5 +1,5 @@
 package com.rockymadden.stringmetric
 
-trait ConfigurableAlgorithm[T, R, O] {
+trait ConfigurableAlgorithm[T, O, R] {
 	def compute(t: T)(implicit o: O): Option[R]
 }
diff --git a/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableMetric.scala
index e05adf1..16137c2 100755
--- a/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableMetric.scala
+++ b/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableMetric.scala
@@ -1,5 +1,5 @@
 package com.rockymadden.stringmetric
 
-trait ConfigurableMetric[T, R, O] {
+trait ConfigurableMetric[T, O, R] {
 	def compare(t1: T, t2: T)(implicit o: O): Option[R]
 }
diff --git a/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableStringAlgorithm.scala b/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableStringAlgorithm.scala
index 38d8714..0a43b0c 100755
--- a/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableStringAlgorithm.scala
+++ b/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableStringAlgorithm.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric
 
-trait ConfigurableStringAlgorithm[R, O] extends ConfigurableAlgorithm[String, R, O] {
+trait ConfigurableStringAlgorithm[O, R] extends ConfigurableAlgorithm[String, O, R] {
 	def compute(charArray: Array[Char])(implicit o: O): Option[Array[_]]
 }
 
diff --git a/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableStringMetric.scala b/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableStringMetric.scala
index b2e933e..c17a668 100755
--- a/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableStringMetric.scala
+++ b/core/source/core/scala/com/rockymadden/stringmetric/ConfigurableStringMetric.scala
@@ -1,6 +1,6 @@
 package com.rockymadden.stringmetric
 
-trait ConfigurableStringMetric[R, O] extends ConfigurableMetric[String, R, O] {
+trait ConfigurableStringMetric[O, R] extends ConfigurableMetric[String, O, R] {
 	def compare(charArray1: Array[Char], charArray2: Array[Char])(implicit o: O): Option[R]
 }
 
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 9b3b975..912e2b3 100755
--- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetric.scala
+++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/DiceSorensenMetric.scala
@@ -7,7 +7,7 @@ import com.rockymadden.stringmetric.tokenization.NGramTokenizer
  * An implementation of the Dice/Sorensen metric. This implementation differs in that n-gram size is required.
  * Traditionally, the algorithm uses bigrams.
  */
-class DiceSorensenMetric extends ConfigurableStringMetric[Double, Int] { this: StringFilter =>
+class DiceSorensenMetric extends ConfigurableStringMetric[Int, Double] { this: StringFilter =>
 	final override def compare(charArray1: Array[Char], charArray2: Array[Char])(implicit n: Int): Option[Double] = {
 		if (n <= 0) throw new IllegalArgumentException("Expected valid n.")
 
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 f36333f..4547ba4 100755
--- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/JaccardMetric.scala
+++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/JaccardMetric.scala
@@ -4,7 +4,7 @@ import com.rockymadden.stringmetric.{ ConfigurableStringMetric, MatchTuple, Stri
 import com.rockymadden.stringmetric.tokenization.NGramTokenizer
 
 /* An implementation of the Jaccard metric. */
-class JaccardMetric extends ConfigurableStringMetric[Double, Int] { this: StringFilter =>
+class JaccardMetric extends ConfigurableStringMetric[Int, Double] { this: StringFilter =>
 	final override def compare(charArray1: Array[Char], charArray2: Array[Char])(implicit n: Int): Option[Double] = {
 		if (n <= 0) throw new IllegalArgumentException("Expected valid n.")
 
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 91cfa68..571e280 100755
--- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/NGramMetric.scala
+++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/NGramMetric.scala
@@ -5,7 +5,7 @@ import com.rockymadden.stringmetric.tokenization.NGramTokenizer
 import scala.math
 
 /** An implementation of the N-Gram metric. */
-class NGramMetric extends ConfigurableStringMetric[Double, Int] { this: StringFilter =>
+class NGramMetric extends ConfigurableStringMetric[Int, Double] { this: StringFilter =>
 	final override def compare(charArray1: Array[Char], charArray2: Array[Char])(implicit n: Int): Option[Double] = {
 		if (n <= 0) throw new IllegalArgumentException("Expected valid n.")
 
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 9f81109..593798f 100755
--- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/OverlapMetric.scala
+++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/OverlapMetric.scala
@@ -5,7 +5,7 @@ import com.rockymadden.stringmetric.tokenization.NGramTokenizer
 import scala.math
 
 /* An implementation of the overlap metric. */
-class OverlapMetric extends ConfigurableStringMetric[Double, Int] { this: StringFilter =>
+class OverlapMetric extends ConfigurableStringMetric[Int, Double] { this: StringFilter =>
 	final override def compare(charArray1: Array[Char], charArray2: Array[Char])(implicit n: Int): Option[Double] = {
 		if (n <= 0) throw new IllegalArgumentException("Expected valid n.")
 
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 cac3395..ecd66dc 100755
--- a/core/source/core/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetric.scala
+++ b/core/source/core/scala/com/rockymadden/stringmetric/similarity/WeightedLevenshteinMetric.scala
@@ -5,7 +5,7 @@ import scala.math.BigDecimal
 
 /** An implementation of a weighted Levenshtein metric. */
 class WeightedLevenshteinMetric
-	extends ConfigurableStringMetric[Double, (BigDecimal, BigDecimal, BigDecimal)] { this: StringFilter =>
+	extends ConfigurableStringMetric[(BigDecimal, BigDecimal, BigDecimal), Double] { this: StringFilter =>
 
 	/** Options order is delete, insert, then substitute weight. */
 	final override def compare(charArray1: Array[Char], charArray2: Array[Char])