Updated TwoPSet to use Generics instead of Strings (TheAlgorithms#4981)

itakurah · web-flow · commit 4aa8e6a0eb65 · 2023-12-11T20:58:56.000+02:00
diff --git a/src/main/java/com/thealgorithms/datastructures/crdt/TwoPSet.java b/src/main/java/com/thealgorithms/datastructures/crdt/TwoPSet.java
@@ -15,9 +15,9 @@
  * @author itakurah (Niklas Hoefflin) (https://github.com/itakurah)
  */
 
-public class TwoPSet {
-    private Set<String> setA;
-    private Set<String> setR;
+public class TwoPSet<T> {
+    private final Set<T> setA;
+    private final Set<T> setR;
 
     /**
      * Constructs an empty Two-Phase Set.
@@ -33,7 +33,7 @@ public TwoPSet() {
      * @param element The element to be checked.
      * @return True if the element is in the set and has not been removed, otherwise false.
      */
-    public boolean lookup(String element) {
+    public boolean lookup(T element) {
         return setA.contains(element) && !setR.contains(element);
     }
 
@@ -42,7 +42,7 @@ public boolean lookup(String element) {
      *
      * @param element The element to be added.
      */
-    public void add(String element) {
+    public void add(T element) {
         setA.add(element);
     }
 
@@ -51,7 +51,7 @@ public void add(String element) {
      *
      * @param element The element to be removed.
      */
-    public void remove(String element) {
+    public void remove(T element) {
         if (lookup(element)) {
             setR.add(element);
         }
@@ -63,7 +63,7 @@ public void remove(String element) {
      * @param otherSet The other 2P-Set to compare with.
      * @return True if both SetA and SetR are subset, otherwise false.
      */
-    public boolean compare(TwoPSet otherSet) {
+    public boolean compare(TwoPSet<T> otherSet) {
         return otherSet.setA.containsAll(setA) && otherSet.setR.containsAll(setR);
     }
 
@@ -73,8 +73,8 @@ public boolean compare(TwoPSet otherSet) {
      * @param otherSet The other 2P-Set to merge with.
      * @return A new 2P-Set containing the merged elements.
      */
-    public TwoPSet merge(TwoPSet otherSet) {
-        TwoPSet mergedSet = new TwoPSet();
+    public TwoPSet<T> merge(TwoPSet<T> otherSet) {
+        TwoPSet<T> mergedSet = new TwoPSet<>();
         mergedSet.setA.addAll(this.setA);
         mergedSet.setA.addAll(otherSet.setA);
         mergedSet.setR.addAll(this.setR);
diff --git a/src/test/java/com/thealgorithms/datastructures/crdt/TwoPSetTest.java b/src/test/java/com/thealgorithms/datastructures/crdt/TwoPSetTest.java
@@ -7,11 +7,11 @@
 
 class TwoPSetTest {
 
-    private TwoPSet set;
+    private TwoPSet<String> set;
 
     @BeforeEach
     void setUp() {
-        set = new TwoPSet();
+        set = new TwoPSet<>();
     }
 
     @Test
@@ -38,10 +38,10 @@ void testRemove() {
 
     @Test
     void testCompare() {
-        TwoPSet set1 = new TwoPSet();
+        TwoPSet<String> set1 = new TwoPSet<>();
         set1.add("A");
         set1.add("B");
-        TwoPSet set2 = new TwoPSet();
+        TwoPSet<String> set2 = new TwoPSet<>();
         set2.add("A");
         assertFalse(set1.compare(set2));
         set2.add("B");
@@ -54,13 +54,13 @@ void testCompare() {
 
     @Test
     void testMerge() {
-        TwoPSet set1 = new TwoPSet();
+        TwoPSet<String> set1 = new TwoPSet<>();
         set1.add("A");
         set1.add("B");
-        TwoPSet set2 = new TwoPSet();
+        TwoPSet<String> set2 = new TwoPSet<>();
         set2.add("B");
         set2.add("C");
-        TwoPSet mergedSet = set1.merge(set2);
+        TwoPSet<String> mergedSet = set1.merge(set2);
         assertTrue(mergedSet.lookup("A"));
         assertTrue(mergedSet.lookup("B"));
         assertTrue(mergedSet.lookup("C"));
