Algorithms/JavaAlgorithms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Niklas Hoefflin 2023-12-11 19:58:56 +01:00 committed by GitHub
parent b8b1dea38d
commit 4aa8e6a0eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/thealgorithms/datastructures/crdt/TwoPSet.java
View File

@ -15,9 +15,9 @@ import java.util.Set;
* @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 class 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 class TwoPSet {
*
* @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 class TwoPSet {
*
* @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 class TwoPSet {
* @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 class TwoPSet {
* @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);

14
src/test/java/com/thealgorithms/datastructures/crdt/TwoPSetTest.java
View File

@ -7,11 +7,11 @@ import org.junit.jupiter.api.Test;
class TwoPSetTest {
private TwoPSet set;
private TwoPSet<String> set;
@BeforeEach
void setUp() {
set = new TwoPSet();
set = new TwoPSet<>();
}
@Test
@ -38,10 +38,10 @@ class TwoPSetTest {
@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 @@ class TwoPSetTest {
@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"));