Merge pull request TheAlgorithms#1247 from BanQiaoGeXia/Development

StepfenShawn · web-flow · commit 4690efbea4c4 · 2020-05-06T16:45:34.000+08:00
Optimize method flip in SortUtils TheAlgorithms#1246
diff --git a/src/main/java/com/sorts/CycleSort.java b/src/main/java/com/sorts/CycleSort.java
@@ -15,7 +15,7 @@ public <T extends Comparable<T>> T[] sort(T[] arr) {
         int count = 0;
 
         // Traverse array and put the elements on their respective right places
-        for (int i = 0; i < n - 2; i++) {
+        for (int i = 0; i < n - 1; i++) {
 
             // Initialize item as the starting point
             T item = arr[i];
diff --git a/src/main/java/com/sorts/SortUtils.java b/src/main/java/com/sorts/SortUtils.java
@@ -38,7 +38,7 @@ static <T extends Comparable<T>> boolean less(T v, T w) {
      * @param right is a right flip border of the array
      */
     static <T extends Comparable<T>> void flip(T[] array, int left, int right) {
-        while (left <= right) {
+        while (left < right) {
             swap(array, left++, right--);
         }
     }
diff --git a/src/test/java/com/dataStructures/StackTest.java b/src/test/java/com/dataStructures/StackTest.java
@@ -36,7 +36,7 @@ void testPeekWithElements() {
         myStack.push(30);
         myStack.push(40);
 
-        Assertions.assertEquals(40, myStack.peek());
+        Assertions.assertEquals(40, (int) myStack.peek());
     }
 
     @Test
@@ -57,7 +57,7 @@ void testPopWithElements() {
         myStack.push(40);
         myStack.push(50);
 
-        Assertions.assertEquals(50, myStack.pop());
+        Assertions.assertEquals(50, (int) myStack.pop());
 
     }
 
diff --git a/src/test/java/com/sorts/CycleSortTest.java b/src/test/java/com/sorts/CycleSortTest.java
@@ -30,5 +30,8 @@ void cycleSortIntegerTest() {
         String[] sortedStr = new String[]{"Alan", "David", "Dennis", "Edward", "Ken", "Linus", "Robert"};
         Assertions.assertArrayEquals(sortedStr, cycleSort.sort(unsortedStr));
 
+        Integer[] unsortedShortInt = new Integer[]{29, 11};
+        Integer[] sortedShortInt = new Integer[]{11, 29};
+        Assertions.assertArrayEquals(sortedShortInt, cycleSort.sort(unsortedShortInt));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ static <T extends Comparable<T>> boolean less(T v, T w) {`
`38`	`38`	`* @param right is a right flip border of the array`
`39`	`39`	`*/`
`40`	`40`	`static <T extends Comparable<T>> void flip(T[] array, int left, int right) {`
`41`		`- while (left <= right) {`
	`41`	`+ while (left < right) {`
`42`	`42`	`swap(array, left++, right--);`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ void testPeekWithElements() {`
`36`	`36`	`myStack.push(30);`
`37`	`37`	`myStack.push(40);`
`38`	`38`
`39`		`- Assertions.assertEquals(40, myStack.peek());`
	`39`	`+ Assertions.assertEquals(40, (int) myStack.peek());`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Test`
`@@ -57,7 +57,7 @@ void testPopWithElements() {`
`57`	`57`	`myStack.push(40);`
`58`	`58`	`myStack.push(50);`
`59`	`59`
`60`		`- Assertions.assertEquals(50, myStack.pop());`
	`60`	`+ Assertions.assertEquals(50, (int) myStack.pop());`
`61`	`61`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,8 @@ void cycleSortIntegerTest() {`
`30`	`30`	`String[] sortedStr = new String[]{"Alan", "David", "Dennis", "Edward", "Ken", "Linus", "Robert"};`
`31`	`31`	`Assertions.assertArrayEquals(sortedStr, cycleSort.sort(unsortedStr));`
`32`	`32`
	`33`	`+ Integer[] unsortedShortInt = new Integer[]{29, 11};`
	`34`	`+ Integer[] sortedShortInt = new Integer[]{11, 29};`
	`35`	`+ Assertions.assertArrayEquals(sortedShortInt, cycleSort.sort(unsortedShortInt));`
`33`	`36`	`}`
`34`	`37`	`}`