moved relabeler to internal package

Author: cicirello

src/main/java/org/cicirello/sequences/distance/KendallTauSequenceDistance.java

@@ -1,6 +1,6 @@
 /*
  * JavaPermutationTools: A Java library for computation on permutations and sequences
- * Copyright 2005-2023 Vincent A. Cicirello, <https://www.cicirello.org/>.
+ * Copyright 2005-2025 Vincent A. Cicirello, <https://www.cicirello.org/>.
  *
  * This file is part of JavaPermutationTools (https://jpt.cicirello.org/).
  *
@@ -23,6 +23,9 @@
 
 import java.util.Arrays;
 import java.util.List;
+import org.cicirello.sequences.distance.internal.KendallTauRelabeler;
+import org.cicirello.sequences.distance.internal.RelabelByHashing;
+import org.cicirello.sequences.distance.internal.RelabelBySorting;
 
 /**
  * Kendall Tau Sequence Distance is the minimum number of adjacent swaps necessary to transform one

…uences/distance/KendallTauRelabeler.java …stance/internal/KendallTauRelabeler.javasrc/main/java/org/cicirello/sequences/distance/KendallTauRelabeler.java renamed to src/main/java/org/cicirello/sequences/distance/internal/KendallTauRelabeler.java src/main/java/org/cicirello/sequences/distance/KendallTauRelabeler.java renamed to src/main/java/org/cicirello/sequences/distance/internal/KendallTauRelabeler.java

@@ -1,6 +1,6 @@
 /*
  * JavaPermutationTools: A Java library for computation on permutations and sequences
- * Copyright 2005-2022 Vincent A. Cicirello, <https://www.cicirello.org/>.
+ * Copyright 2005-2025 Vincent A. Cicirello, <https://www.cicirello.org/>.
  *
  * This file is part of JavaPermutationTools (https://jpt.cicirello.org/).
  *
@@ -19,7 +19,7 @@
  * You should have received a copy of the GNU General Public License
  * along with JavaPermutationTools.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.cicirello.sequences.distance;
+package org.cicirello.sequences.distance.internal;
 
 import java.util.List;
 
@@ -30,7 +30,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>
  */
-interface KendallTauRelabeler {
+public interface KendallTauRelabeler {
 
   /**
    * Relabels the elements of the sequence to integers from 0 to k where there are k+1 distinct

…sequences/distance/RelabelByHashing.java …/distance/internal/RelabelByHashing.javasrc/main/java/org/cicirello/sequences/distance/RelabelByHashing.java renamed to src/main/java/org/cicirello/sequences/distance/internal/RelabelByHashing.java src/main/java/org/cicirello/sequences/distance/RelabelByHashing.java renamed to src/main/java/org/cicirello/sequences/distance/internal/RelabelByHashing.java

@@ -1,6 +1,6 @@
 /*
  * JavaPermutationTools: A Java library for computation on permutations and sequences
- * Copyright 2005-2022 Vincent A. Cicirello, <https://www.cicirello.org/>.
+ * Copyright 2005-2025 Vincent A. Cicirello, <https://www.cicirello.org/>.
  *
  * This file is part of JavaPermutationTools (https://jpt.cicirello.org/).
  *
@@ -19,7 +19,7 @@
  * You should have received a copy of the GNU General Public License
  * along with JavaPermutationTools.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.cicirello.sequences.distance;
+package org.cicirello.sequences.distance.internal;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -31,7 +31,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>
  */
-final class RelabelByHashing implements KendallTauRelabeler {
+public final class RelabelByHashing implements KendallTauRelabeler {
 
   @Override
   public int relabel(Object[] s1, Object[] s2, int[][] relabeling) {

…sequences/distance/RelabelBySorting.java …/distance/internal/RelabelBySorting.javasrc/main/java/org/cicirello/sequences/distance/RelabelBySorting.java renamed to src/main/java/org/cicirello/sequences/distance/internal/RelabelBySorting.java src/main/java/org/cicirello/sequences/distance/RelabelBySorting.java renamed to src/main/java/org/cicirello/sequences/distance/internal/RelabelBySorting.java

@@ -1,6 +1,6 @@
 /*
  * JavaPermutationTools: A Java library for computation on permutations and sequences
- * Copyright 2005-2023 Vincent A. Cicirello, <https://www.cicirello.org/>.
+ * Copyright 2005-2025 Vincent A. Cicirello, <https://www.cicirello.org/>.
  *
  * This file is part of JavaPermutationTools (https://jpt.cicirello.org/).
  *
@@ -19,7 +19,7 @@
  * You should have received a copy of the GNU General Public License
  * along with JavaPermutationTools.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.cicirello.sequences.distance;
+package org.cicirello.sequences.distance.internal;
 
 import java.util.Arrays;
 import java.util.Iterator;
@@ -31,7 +31,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>
  */
-final class RelabelBySorting implements KendallTauRelabeler {
+public final class RelabelBySorting implements KendallTauRelabeler {
 
   @Override
   public int relabel(int[] s1, int[] s2, int[][] relabeling) {

src/test/java/org/cicirello/sequences/distance/KendallTauSequenceDistanceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 Vincent A. Cicirello, <https://www.cicirello.org/>.
+ * Copyright 2018-2025 Vincent A. Cicirello, <https://www.cicirello.org/>.
  *
  * This file is part of JavaPermutationTools (https://jpt.cicirello.org/).
  *
@@ -154,37 +154,6 @@ public void testKendallTauDistanceExceptions() {
     thrown = assertThrows(IllegalArgumentException.class, () -> d.distance(s1, s2));
   }
 
-  @Test
-  public void testKendallTauSequenceDistance_HashTableBaseClass() {
-    class TestHT extends RelabelByHashing.BaseHT {
-      TestHT(int min) {
-        super(32, min);
-      }
-    }
-    for (int n = 1; n <= 32; n *= 2) {
-      TestHT ht = new TestHT(n);
-      assertEquals(n, ht.minSize);
-      assertEquals(n - 1, ht.mask);
-    }
-    TestHT ht = new TestHT(3);
-    assertEquals(4, ht.minSize);
-    for (int n = 5; n < 8; n++) {
-      ht = new TestHT(n);
-      assertEquals(8, ht.minSize);
-      assertEquals(7, ht.mask);
-    }
-    for (int n = 9; n < 16; n++) {
-      ht = new TestHT(n);
-      assertEquals(16, ht.minSize);
-      assertEquals(15, ht.mask);
-    }
-    for (int n = 17; n <= 64; n++) {
-      ht = new TestHT(n);
-      assertEquals(32, ht.minSize);
-      assertEquals(31, ht.mask);
-    }
-  }
-
   @Test
   public void testKendallTauDistanceExceptionsDiffElements() {
     final KendallTauSequenceDistance d = new KendallTauSequenceDistance();

src/test/java/org/cicirello/sequences/distance/internal/KendallTauSequenceDistanceInternalTests.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2018-2025 Vincent A. Cicirello, <https://www.cicirello.org/>.
+ *
+ * This file is part of JavaPermutationTools (https://jpt.cicirello.org/).
+ *
+ * JavaPermutationTools is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * JavaPermutationTools is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with JavaPermutationTools.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.cicirello.sequences.distance.internal;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.*;
+
+/** JUnit tests for KendallTauSequenceDistance. */
+public class KendallTauSequenceDistanceInternalTests {
+
+  @Test
+  public void testKendallTauSequenceDistance_HashTableBaseClass() {
+    class TestHT extends RelabelByHashing.BaseHT {
+      TestHT(int min) {
+        super(32, min);
+      }
+    }
+    for (int n = 1; n <= 32; n *= 2) {
+      TestHT ht = new TestHT(n);
+      assertEquals(n, ht.minSize);
+      assertEquals(n - 1, ht.mask);
+    }
+    TestHT ht = new TestHT(3);
+    assertEquals(4, ht.minSize);
+    for (int n = 5; n < 8; n++) {
+      ht = new TestHT(n);
+      assertEquals(8, ht.minSize);
+      assertEquals(7, ht.mask);
+    }
+    for (int n = 9; n < 16; n++) {
+      ht = new TestHT(n);
+      assertEquals(16, ht.minSize);
+      assertEquals(15, ht.mask);
+    }
+    for (int n = 17; n <= 64; n++) {
+      ht = new TestHT(n);
+      assertEquals(32, ht.minSize);
+      assertEquals(31, ht.mask);
+    }
+  }
+}