moved defaults from abstract base class to interfaces

cicirello · cicirello · commit d8df8512f148 · 2021-04-02T13:08:32.000-04:00
#117
diff --git a/src/org/cicirello/permutations/distance/AbstractPermutationDistanceMeasurer.java b/src/org/cicirello/permutations/distance/AbstractPermutationDistanceMeasurer.java
@@ -30,17 +30,6 @@
  * @version 4.2.2021
  *
  */
-abstract class AbstractPermutationDistanceMeasurer implements PermutationDistanceMeasurer, NormalizedPermutationDistanceMeasurer {
+abstract class AbstractPermutationDistanceMeasurer implements NormalizedPermutationDistanceMeasurer {
 	
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @throws IllegalArgumentException if p1.length() is not equal to p2.length().
-	 */
-	@Override
-	public final double normalizedDistance(Permutation p1, Permutation p2) {
-		int m = max(p1.length());
-		if (m==0) return 0;
-		return 1.0 * distance(p1,p2) / m;
-	}
 }
diff --git a/src/org/cicirello/permutations/distance/AcyclicEdgeDistance.java b/src/org/cicirello/permutations/distance/AcyclicEdgeDistance.java
@@ -42,9 +42,9 @@
  * S. Ronald, "Distance functions for order-based encodings," in Proc. IEEE CEC. IEEE Press, 1997, pp. 49–54.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  */
-public final class AcyclicEdgeDistance extends AbstractPermutationDistanceMeasurer {
+public final class AcyclicEdgeDistance implements NormalizedPermutationDistanceMeasurer {
 	
 	/**
 	 * Constructs the distance measurer as specified in the class documentation.
diff --git a/src/org/cicirello/permutations/distance/BlockInterchangeDistance.java b/src/org/cicirello/permutations/distance/BlockInterchangeDistance.java
@@ -40,9 +40,9 @@
  * <p>Runtime: O(n), where n is the permutation length.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  */
-public class BlockInterchangeDistance extends AbstractPermutationDistanceMeasurer {
+public class BlockInterchangeDistance implements NormalizedPermutationDistanceMeasurer {
 	
 	/**
 	 * Constructs the distance measurer as specified in the class documentation.
diff --git a/src/org/cicirello/permutations/distance/CyclicEdgeDistance.java b/src/org/cicirello/permutations/distance/CyclicEdgeDistance.java
@@ -42,9 +42,9 @@
  * S. Ronald, "Distance functions for order-based encodings," in Proc. IEEE CEC. IEEE Press, 1997, pp. 49–54.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  */
-public final class CyclicEdgeDistance extends AbstractPermutationDistanceMeasurer {
+public final class CyclicEdgeDistance implements NormalizedPermutationDistanceMeasurer {
 	
 	/**
 	 * Constructs the distance measurer as specified in the class documentation.
diff --git a/src/org/cicirello/permutations/distance/CyclicIndependentDistance.java b/src/org/cicirello/permutations/distance/CyclicIndependentDistance.java
@@ -32,7 +32,7 @@
  * the constructor.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  *  
  */
 public final class CyclicIndependentDistance implements PermutationDistanceMeasurer {
@@ -68,19 +68,4 @@ public int distance(Permutation p1, Permutation p2) {
 		}
 		return result;
 	}
-	
-	/**
-	 * Measures the distance between two permutations, with cyclic independence:
-	 * distance = min_{i in [0,N)} distance(p1,rotate(p2,i))
-	 * 
-	 * @param p1 first permutation
-	 * @param p2 second permutation 
-	 * @return distance between p1 and p2 
-	 * @throws IllegalArgumentException if p1.length() is not equal to p2.length().
-	 */
-	@Override
-	public final double distancef(Permutation p1, Permutation p2) {
-		return distance(p1,p2);
-	}
-	
 }
diff --git a/src/org/cicirello/permutations/distance/CyclicRTypeDistance.java b/src/org/cicirello/permutations/distance/CyclicRTypeDistance.java
@@ -44,9 +44,9 @@
  * IEEE Transactions on Evolutionary Computation, 20(3):434-446, June 2016.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  */
-public final class CyclicRTypeDistance extends AbstractPermutationDistanceMeasurer {
+public final class CyclicRTypeDistance implements NormalizedPermutationDistanceMeasurer {
 	
 	/**
 	 * Constructs the distance measurer as specified in the class documentation.
diff --git a/src/org/cicirello/permutations/distance/CyclicReversalIndependentDistance.java b/src/org/cicirello/permutations/distance/CyclicReversalIndependentDistance.java
@@ -33,7 +33,7 @@
  * the constructor.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  *  
  */
 public final class CyclicReversalIndependentDistance implements PermutationDistanceMeasurer {
@@ -83,19 +83,4 @@ public int distance(Permutation p1, Permutation p2) {
 		}
 		return result;
 	}
-	
-	/**
-	 * Measures the distance between two permutations, with cyclic and reversal independence:
-	 * distance = min_{i in [0,N)} { distance(p1,rotate(p2,i)), distance(p1,rotate(reverse(p2),i)) }
-	 * 
-	 * @param p1 first permutation
-	 * @param p2 second permutation 
-	 * @return distance between p1 and p2 
-	 * @throws IllegalArgumentException if p1.length() is not equal to p2.length().
-	 */
-	@Override
-	public final double distancef(Permutation p1, Permutation p2) {
-		return distance(p1,p2);
-	}
-	
 }
diff --git a/src/org/cicirello/permutations/distance/DeviationDistance.java b/src/org/cicirello/permutations/distance/DeviationDistance.java
@@ -42,10 +42,10 @@
  * S. Ronald, "More distance functions for order-based encodings," in Proc. IEEE CEC. IEEE Press, 1998, pp. 558–563.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  * 
  */
-public final class DeviationDistance extends AbstractPermutationDistanceMeasurer {
+public final class DeviationDistance implements NormalizedPermutationDistanceMeasurer {
 	
 	/**
 	 * Constructs the distance measurer as specified in the class documentation.
diff --git a/src/org/cicirello/permutations/distance/DeviationDistanceNormalized.java b/src/org/cicirello/permutations/distance/DeviationDistanceNormalized.java
@@ -48,10 +48,10 @@
  * Proc. IEEE CEC. IEEE Press, 1998, pp. 558–563.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  * 
  */
-public final class DeviationDistanceNormalized implements PermutationDistanceMeasurerDouble, NormalizedPermutationDistanceMeasurerDouble  {
+public final class DeviationDistanceNormalized implements NormalizedPermutationDistanceMeasurerDouble  {
 
 	private DeviationDistance devDistance;
 	
@@ -81,17 +81,4 @@ public double maxf(int length) {
 		if (length <= 1) return 0;
 		return (length * length - (length & 1)) / (2.0 * (length-1));
 	}
-	
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @throws IllegalArgumentException if p1.length() is not equal to p2.length().
-	 */
-	@Override
-	public double normalizedDistance(Permutation p1, Permutation p2) {
-		double m = maxf(p1.length());
-		if (m == 0.0) return 0;
-		return distancef(p1,p2) / m; 
-	}
-	
 }
diff --git a/src/org/cicirello/permutations/distance/DeviationDistanceNormalized2005.java b/src/org/cicirello/permutations/distance/DeviationDistanceNormalized2005.java
@@ -62,10 +62,10 @@
  * management," in Proc. of MIC2005, 2005.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021  
+ * @version 4.2.2021  
  * 
  */
-public final class DeviationDistanceNormalized2005 implements PermutationDistanceMeasurerDouble, NormalizedPermutationDistanceMeasurerDouble  {
+public final class DeviationDistanceNormalized2005 implements NormalizedPermutationDistanceMeasurerDouble  {
 
 	private DeviationDistance devDistance;
 	
diff --git a/src/org/cicirello/permutations/distance/ExactMatchDistance.java b/src/org/cicirello/permutations/distance/ExactMatchDistance.java
@@ -33,9 +33,9 @@
  * S. Ronald, "More distance functions for order-based encodings," in Proc. IEEE CEC. IEEE Press, 1998, pp. 558–563.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  */
-public final class ExactMatchDistance extends AbstractPermutationDistanceMeasurer {
+public final class ExactMatchDistance implements NormalizedPermutationDistanceMeasurer {
   
 	/**
 	 * Constructs the distance measurer as specified in the class documentation.
diff --git a/src/org/cicirello/permutations/distance/InterchangeDistance.java b/src/org/cicirello/permutations/distance/InterchangeDistance.java
@@ -40,9 +40,9 @@
  * IEEE Transactions on Evolutionary Computation, 20(3):434-446, June 2016.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  */
-public final class InterchangeDistance extends AbstractPermutationDistanceMeasurer {
+public final class InterchangeDistance implements NormalizedPermutationDistanceMeasurer {
 	
 	/**
 	 * Constructs the distance measurer as specified in the class documentation.
diff --git a/src/org/cicirello/permutations/distance/KendallTauDistance.java b/src/org/cicirello/permutations/distance/KendallTauDistance.java
@@ -48,10 +48,10 @@
  * M. G. Kendall, "A new measure of rank correlation," Biometrika, vol. 30, no. 1/2, pp. 81–93, June 1938.</p>
  * 
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  * 
  */
-public final class KendallTauDistance extends AbstractPermutationDistanceMeasurer {
+public final class KendallTauDistance implements NormalizedPermutationDistanceMeasurer {
 	
 	/**
 	 * Constructs the distance measurer as specified in the class documentation.
diff --git a/src/org/cicirello/permutations/distance/LeeDistance.java b/src/org/cicirello/permutations/distance/LeeDistance.java
@@ -43,10 +43,10 @@
  * C. Lee, "Some properties of nonbinary error-correcting codes," in IRE Transactions on Information Theory, vol. 4, no. 2, pp. 77-82, June 1958.</p>
  * 
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  * 
  */
-public final class LeeDistance extends AbstractPermutationDistanceMeasurer {
+public final class LeeDistance implements NormalizedPermutationDistanceMeasurer {
 	
 	/**
 	 * Constructs the distance measurer as specified in the class documentation.
diff --git a/src/org/cicirello/permutations/distance/NormalizedPermutationDistanceMeasurer.java b/src/org/cicirello/permutations/distance/NormalizedPermutationDistanceMeasurer.java
@@ -29,7 +29,7 @@
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
  * @version 4.2.2021
  */
-public interface NormalizedPermutationDistanceMeasurer extends NormalizedPermutationDistanceMeasurerDouble {
+public interface NormalizedPermutationDistanceMeasurer extends NormalizedPermutationDistanceMeasurerDouble, PermutationDistanceMeasurer {
 	
 	/**
 	 * Computes the maximum possible distance between permutations
@@ -44,4 +44,16 @@ public interface NormalizedPermutationDistanceMeasurer extends NormalizedPermuta
 	default double maxf(int length) {
 		return max(length);
 	}
+	
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @throws IllegalArgumentException if p1.length() is not equal to p2.length().
+	 */
+	@Override
+	default double normalizedDistance(Permutation p1, Permutation p2) {
+		int m = max(p1.length());
+		if (m==0) return 0;
+		return distance(p1,p2) / ((double)m);
+	}
 }
diff --git a/src/org/cicirello/permutations/distance/NormalizedPermutationDistanceMeasurerDouble.java b/src/org/cicirello/permutations/distance/NormalizedPermutationDistanceMeasurerDouble.java
@@ -27,19 +27,9 @@
  * normalizing the distance to the interval [0,1].
  * 
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  */
-public interface NormalizedPermutationDistanceMeasurerDouble {
-	
-	/**
-	 * <p>Measures the distance between two permutations, normalized to the interval [0.0, 1.0].</p>
-	 * 
-	 * @param p1 first permutation
-	 * @param p2 second permutation 
-	 * @return distance between p1 and p2 normalized to the interval [0.0, 1.0] 
-	 * @throws IllegalArgumentException if p1.length() is not equal to p2.length().
-	 */
-	double normalizedDistance(Permutation p1, Permutation p2);
+public interface NormalizedPermutationDistanceMeasurerDouble extends PermutationDistanceMeasurerDouble {
 	
 	/**
 	 * Computes the maximum possible distance between permutations
@@ -49,4 +39,18 @@ public interface NormalizedPermutationDistanceMeasurerDouble {
 	 * @return the maximum distance between a pair of permutations of the specified length.
 	 */
 	double maxf(int length);
+	
+	/**
+	 * <p>Measures the distance between two permutations, normalized to the interval [0.0, 1.0].</p>
+	 * 
+	 * @param p1 first permutation
+	 * @param p2 second permutation 
+	 * @return distance between p1 and p2 normalized to the interval [0.0, 1.0] 
+	 * @throws IllegalArgumentException if p1.length() is not equal to p2.length().
+	 */
+	default double normalizedDistance(Permutation p1, Permutation p2) {
+		double m = maxf(p1.length());
+		if (m==0) return 0;
+		return distancef(p1,p2) / m;
+	}
 }
diff --git a/src/org/cicirello/permutations/distance/RTypeDistance.java b/src/org/cicirello/permutations/distance/RTypeDistance.java
@@ -44,9 +44,9 @@
  * INFORMS Journal on Computing, vol. 17, no. 1, pp. 111–122, 2005.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  */
-public final class RTypeDistance extends AbstractPermutationDistanceMeasurer {
+public final class RTypeDistance implements NormalizedPermutationDistanceMeasurer {
 	
 	/**
 	 * Constructs the distance measurer as specified in the class documentation.
diff --git a/src/org/cicirello/permutations/distance/ReinsertionDistance.java b/src/org/cicirello/permutations/distance/ReinsertionDistance.java
@@ -57,10 +57,10 @@
  * Communications of the ACM, 20(5):350-353, May, 1977.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  *
  */
-public final class ReinsertionDistance extends AbstractPermutationDistanceMeasurer {
+public final class ReinsertionDistance implements NormalizedPermutationDistanceMeasurer {
 	
 	/**
 	 * Constructs the distance measurer as specified in the class documentation.
diff --git a/src/org/cicirello/permutations/distance/ReversalDistance.java b/src/org/cicirello/permutations/distance/ReversalDistance.java
@@ -48,9 +48,9 @@
 * <p>We have not used this for N &gt; 10.  Warning: time to construct distance measure increases factorially.</p>
 *
 * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
-* @version 2.11.2021
+* @version 4.2.2021
 */
-public final class ReversalDistance extends AbstractPermutationDistanceMeasurer {
+public final class ReversalDistance implements NormalizedPermutationDistanceMeasurer {
 
 	private byte[] dist;
 	private final int PERM_LENGTH;
diff --git a/src/org/cicirello/permutations/distance/ReversalIndependentDistance.java b/src/org/cicirello/permutations/distance/ReversalIndependentDistance.java
@@ -32,7 +32,7 @@
  * to the constructor.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  *  
  */
 public final class ReversalIndependentDistance implements PermutationDistanceMeasurer {
@@ -67,19 +67,4 @@ public int distance(Permutation p1, Permutation p2) {
 		}
 		return result;
 	}
-	
-	/**
-	 * Measures the distance between two permutations, with reversal independence:
-	 * distance = min { distance(p1,p2), distance(p1,reverse(p2)) }
-	 * 
-	 * @param p1 first permutation
-	 * @param p2 second permutation 
-	 * @return distance between p1 and p2 
-	 * @throws IllegalArgumentException if p1.length() is not equal to p2.length().
-	 */
-	@Override
-	public final double distancef(Permutation p1, Permutation p2) {
-		return distance(p1,p2);
-	}
-	
 }
diff --git a/src/org/cicirello/permutations/distance/ScrambleDistance.java b/src/org/cicirello/permutations/distance/ScrambleDistance.java
@@ -32,9 +32,9 @@
  * <p>Runtime: O(n), where n is the permutation length.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  */
-public final class ScrambleDistance extends AbstractPermutationDistanceMeasurer {
+public final class ScrambleDistance implements NormalizedPermutationDistanceMeasurer {
 	
 	/**
 	 * Constructs the distance measurer as specified in the class documentation.
diff --git a/src/org/cicirello/permutations/distance/SquaredDeviationDistance.java b/src/org/cicirello/permutations/distance/SquaredDeviationDistance.java
@@ -44,10 +44,10 @@
  * The 6th Metaheuristics International Conference, August, 2005.</p>
  *
  * @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
- * @version 1.28.2021
+ * @version 4.2.2021
  * 
  */
-public final class SquaredDeviationDistance extends AbstractPermutationDistanceMeasurer {
+public final class SquaredDeviationDistance implements NormalizedPermutationDistanceMeasurer {
 	
 	/**
 	 * Constructs the distance measurer as specified in the class documentation.

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`* the constructor.</p>`
`33`	`33`	`*`
`34`	`34`	`* @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>`
`35`		`- * @version 1.28.2021`
	`35`	`+ * @version 4.2.2021`
`36`	`36`	`*`
`37`	`37`	`*/`
`38`	`38`	`public final class CyclicIndependentDistance implements PermutationDistanceMeasurer {`
`@@ -68,19 +68,4 @@ public int distance(Permutation p1, Permutation p2) {`
`68`	`68`	`}`
`69`	`69`	`return result;`
`70`	`70`	`}`
`71`		`-`
`72`		`- /**`
`73`		`- * Measures the distance between two permutations, with cyclic independence:`
`74`		`- * distance = min_{i in [0,N)} distance(p1,rotate(p2,i))`
`75`		`- *`
`76`		`- * @param p1 first permutation`
`77`		`- * @param p2 second permutation`
`78`		`- * @return distance between p1 and p2`
`79`		`- * @throws IllegalArgumentException if p1.length() is not equal to p2.length().`
`80`		`- */`
`81`		`- @Override`
`82`		`- public final double distancef(Permutation p1, Permutation p2) {`
`83`		`- return distance(p1,p2);`
`84`		`- }`
`85`		`-`
`86`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`* the constructor.</p>`
`34`	`34`	`*`
`35`	`35`	`* @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>`
`36`		`- * @version 1.28.2021`
	`36`	`+ * @version 4.2.2021`
`37`	`37`	`*`
`38`	`38`	`*/`
`39`	`39`	`public final class CyclicReversalIndependentDistance implements PermutationDistanceMeasurer {`
`@@ -83,19 +83,4 @@ public int distance(Permutation p1, Permutation p2) {`
`83`	`83`	`}`
`84`	`84`	`return result;`
`85`	`85`	`}`
`86`		`-`
`87`		`- /**`
`88`		`- * Measures the distance between two permutations, with cyclic and reversal independence:`
`89`		`- * distance = min_{i in [0,N)} { distance(p1,rotate(p2,i)), distance(p1,rotate(reverse(p2),i)) }`
`90`		`- *`
`91`		`- * @param p1 first permutation`
`92`		`- * @param p2 second permutation`
`93`		`- * @return distance between p1 and p2`
`94`		`- * @throws IllegalArgumentException if p1.length() is not equal to p2.length().`
`95`		`- */`
`96`		`- @Override`
`97`		`- public final double distancef(Permutation p1, Permutation p2) {`
`98`		`- return distance(p1,p2);`
`99`		`- }`
`100`		`-`
`101`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,10 @@`
`42`	`42`	`* S. Ronald, "More distance functions for order-based encodings," in Proc. IEEE CEC. IEEE Press, 1998, pp. 558–563.</p>`
`43`	`43`	`*`
`44`	`44`	`* @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>`
`45`		`- * @version 1.28.2021`
	`45`	`+ * @version 4.2.2021`
`46`	`46`	`*`
`47`	`47`	`*/`
`48`		`-public final class DeviationDistance extends AbstractPermutationDistanceMeasurer {`
	`48`	`+public final class DeviationDistance implements NormalizedPermutationDistanceMeasurer {`
`49`	`49`
`50`	`50`	`/**`
`51`	`51`	`* Constructs the distance measurer as specified in the class documentation.`
Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,10 @@`
`62`	`62`	`* management," in Proc. of MIC2005, 2005.</p>`
`63`	`63`	`*`
`64`	`64`	`* @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>`
`65`		`- * @version 1.28.2021`
	`65`	`+ * @version 4.2.2021`
`66`	`66`	`*`
`67`	`67`	`*/`
`68`		`-public final class DeviationDistanceNormalized2005 implements PermutationDistanceMeasurerDouble, NormalizedPermutationDistanceMeasurerDouble {`
	`68`	`+public final class DeviationDistanceNormalized2005 implements NormalizedPermutationDistanceMeasurerDouble {`
`69`	`69`
`70`	`70`	`private DeviationDistance devDistance;`
`71`	`71`