Merge pull request #118 from cicirello/refactor-interfaces

Refactor permutation and sequence distance interfaces and classes

Author: cicirello

CHANGELOG.md

@@ -4,12 +4,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased] - 2021-03-31
+## [Unreleased] - 2021-04-02
 
 ### Added
 * Added the `Permutation.Mechanic.set(Permutation, int[], int, int, int)` method.
 
 ### Changed
+* Refactored the SequenceDistanceMeasurer and SequenceDistanceMeasurerDouble interfaces 
+  into a hierarchy, eliminated an abstract base class made obsolete by that change, and
+  changed all sequence distances in the library to use the new hierarchy. This is a non-breaking
+  change, as the only thing removed was a package-private abstract class, and the
+  change to the SequenceDistanceMeasurer interface was done in such a way that all inherited
+  methods have default implementations.
+* Refactored the PermutationDistanceMeasurer, PermutationDistanceMeasurerDouble,
+  NormalizedPermutationDistanceMeasurer, and NormalizedPermutationDistanceMeasurerDouble 
+  interfaces, and all of the classes that implement them, to move default implementations 
+  from an abstract base class into the appropriate subinterfaces in hierarchy. This is a 
+  non-breaking change, as the only thing removed was a package-private abstract class, and the
+  changes to interfaces were done in such a way that all inherited methods have default 
+  implementations.
 
 ### Deprecated
 

src/org/cicirello/permutations/distance/AbstractPermutationDistanceMeasurer.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.

src/org/cicirello/permutations/distance/AcyclicEdgeDistance.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.

src/org/cicirello/permutations/distance/BlockInterchangeDistance.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.

src/org/cicirello/permutations/distance/CyclicEdgeDistance.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);
-	}
-	
 }

src/org/cicirello/permutations/distance/CyclicIndependentDistance.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.

src/org/cicirello/permutations/distance/CyclicRTypeDistance.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);
-	}
-	
 }

src/org/cicirello/permutations/distance/CyclicReversalIndependentDistance.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.

src/org/cicirello/permutations/distance/DeviationDistance.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; 
-	}
-	
 }