From ea4651818a5132d1e08046ddd1ae9e62f0bbe9c6 Mon Sep 17 00:00:00 2001 From: Marcus <104601262+MarcusCody@users.noreply.github.com> Date: Thu, 4 Aug 2022 01:41:42 +0800 Subject: [PATCH 1/5] Create a new StrandSort Algorithm --- .../com/thealgorithms/sorts/StrandSort.java | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/main/java/com/thealgorithms/sorts/StrandSort.java diff --git a/src/main/java/com/thealgorithms/sorts/StrandSort.java b/src/main/java/com/thealgorithms/sorts/StrandSort.java new file mode 100644 index 000000000000..8b31f7c4ec77 --- /dev/null +++ b/src/main/java/com/thealgorithms/sorts/StrandSort.java @@ -0,0 +1,42 @@ +package com.thealgorithms.sorts; +import java.util.Iterator; +import java.util.LinkedList; + +public class StrandSort{ + // note: the input list is destroyed + public static > + LinkedList strandSort(LinkedList list){ + if(list.size() <= 1) return list; + + LinkedList result = new LinkedList(); + while(list.size() > 0){ + LinkedList sorted = new LinkedList(); + sorted.add(list.removeFirst()); //same as remove() or remove(0) + for(Iterator it = list.iterator(); it.hasNext(); ){ + E elem = it.next(); + if(sorted.peekLast().compareTo(elem) <= 0){ + sorted.addLast(elem); //same as add(elem) or add(0, elem) + it.remove(); + } + } + result = merge(sorted, result); + } + return result; + } + + private static > + LinkedList merge(LinkedList left, LinkedList right){ + LinkedList result = new LinkedList(); + while(!left.isEmpty() && !right.isEmpty()){ + //change the direction of this comparison to change the direction of the sort + if(left.peek().compareTo(right.peek()) <= 0) + result.add(left.remove()); + else + result.add(right.remove()); + } + result.addAll(left); + result.addAll(right); + return result; + } + +} From f26c44d8b8212cff2afff4a99d63bf81c1017852 Mon Sep 17 00:00:00 2001 From: Marcus <104601262+MarcusCody@users.noreply.github.com> Date: Thu, 4 Aug 2022 01:44:37 +0800 Subject: [PATCH 2/5] Create JUnit tests for Strand Sort Algorithm --- .../thealgorithms/sorts/StrandSortTest.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/test/java/com/thealgorithms/sorts/StrandSortTest.java diff --git a/src/test/java/com/thealgorithms/sorts/StrandSortTest.java b/src/test/java/com/thealgorithms/sorts/StrandSortTest.java new file mode 100644 index 000000000000..c995087a2f71 --- /dev/null +++ b/src/test/java/com/thealgorithms/sorts/StrandSortTest.java @@ -0,0 +1,37 @@ +import static org.junit.Assert.assertArrayEquals; + +package com.thealgorithms.sorts; +import java.util.Arrays; +import java.util.LinkedList; + +import org.junit.jupiter.api.Test; + +public class StrandSortTest { + @Test + // valid test case + public void StrandSortNonDuplicateTest() { + StrandSort strand = new StrandSort(); + int[] expectedArray = {1,2,3,4,5}; + LinkedList actualList = strand.strandSort(new LinkedList(Arrays.asList(3,1,2,4,5))); + int[] actualArray = new int[actualList.size()]; + for(int i=0; i actualList = strand.strandSort(new LinkedList(Arrays.asList(7, 2, 2, 2, 5))); + int[] actualArray = new int[actualList.size()]; + for(int i=0; i Date: Thu, 4 Aug 2022 01:53:17 +0800 Subject: [PATCH 3/5] Package updated Build failed due to wrong package location but updated now. --- src/test/java/com/thealgorithms/sorts/StrandSortTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/thealgorithms/sorts/StrandSortTest.java b/src/test/java/com/thealgorithms/sorts/StrandSortTest.java index c995087a2f71..7b1fd20c5cfa 100644 --- a/src/test/java/com/thealgorithms/sorts/StrandSortTest.java +++ b/src/test/java/com/thealgorithms/sorts/StrandSortTest.java @@ -1,6 +1,7 @@ +package com.thealgorithms.sorts; + import static org.junit.Assert.assertArrayEquals; -package com.thealgorithms.sorts; import java.util.Arrays; import java.util.LinkedList; From eeaf70b343ad0342e140a566d74d3d7ad486a674 Mon Sep 17 00:00:00 2001 From: Marcus <104601262+MarcusCody@users.noreply.github.com> Date: Thu, 4 Aug 2022 02:07:05 +0800 Subject: [PATCH 4/5] Change access to static using StrandSort --- .../thealgorithms/sorts/StrandSortTest.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/test/java/com/thealgorithms/sorts/StrandSortTest.java b/src/test/java/com/thealgorithms/sorts/StrandSortTest.java index 7b1fd20c5cfa..8c211584eb4c 100644 --- a/src/test/java/com/thealgorithms/sorts/StrandSortTest.java +++ b/src/test/java/com/thealgorithms/sorts/StrandSortTest.java @@ -9,26 +9,25 @@ public class StrandSortTest { @Test - // valid test case - public void StrandSortNonDuplicateTest() { - StrandSort strand = new StrandSort(); - int[] expectedArray = {1,2,3,4,5}; - LinkedList actualList = strand.strandSort(new LinkedList(Arrays.asList(3,1,2,4,5))); + // valid test case + public void StrandSortNonDuplicateTest() { + int[] expectedArray = { 1, 2, 3, 4, 5 }; + LinkedList actualList = StrandSort.strandSort(new LinkedList(Arrays.asList(3, 1, 2, 4, 5))); int[] actualArray = new int[actualList.size()]; - for(int i=0; i actualList = strand.strandSort(new LinkedList(Arrays.asList(7, 2, 2, 2, 5))); + int[] expectedArray = { 2, 2, 2, 5, 7 }; + LinkedList actualList = StrandSort.strandSort(new LinkedList(Arrays.asList(7, 2, 2, 2, 5))); int[] actualArray = new int[actualList.size()]; - for(int i=0; i Date: Thu, 4 Aug 2022 02:14:05 +0800 Subject: [PATCH 5/5] import updated --- src/test/java/com/thealgorithms/sorts/StrandSortTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/thealgorithms/sorts/StrandSortTest.java b/src/test/java/com/thealgorithms/sorts/StrandSortTest.java index 8c211584eb4c..f24596e706c4 100644 --- a/src/test/java/com/thealgorithms/sorts/StrandSortTest.java +++ b/src/test/java/com/thealgorithms/sorts/StrandSortTest.java @@ -1,13 +1,13 @@ package com.thealgorithms.sorts; -import static org.junit.Assert.assertArrayEquals; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; import java.util.Arrays; import java.util.LinkedList; -import org.junit.jupiter.api.Test; -public class StrandSortTest { +class StrandSortTest { @Test // valid test case public void StrandSortNonDuplicateTest() {