From 7b215453579cb72249f318c8c7ee5084d7927e38 Mon Sep 17 00:00:00 2001 From: shellhub Date: Mon, 12 Apr 2021 18:48:15 +0800 Subject: [PATCH 1/2] udpate insertion sort --- Sorts/InsertionSort.java | 49 +++++++++++++++------------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/Sorts/InsertionSort.java b/Sorts/InsertionSort.java index d2dd1c93e409..353cec37541a 100644 --- a/Sorts/InsertionSort.java +++ b/Sorts/InsertionSort.java @@ -3,53 +3,40 @@ import static Sorts.SortUtils.less; import static Sorts.SortUtils.print; -/** - * @author Varun Upadhyay (https://github.com/varunu28) - * @author Podshivalov Nikita (https://github.com/nikitap492) - */ class InsertionSort implements SortAlgorithm { /** - * This method implements the Generic Insertion Sort Sorts the array in increasing order - * - * @param array The array to be sorted + * Generic insertion sort algorithm in increasing order. + * @param array the array to be sorted. + * @param the class of array. + * @return sorted array. */ @Override public > T[] sort(T[] array) { - for (int j = 1; j < array.length; j++) { - - // Picking up the key(Card) - T key = array[j]; - int i = j - 1; - - while (i >= 0 && less(key, array[i])) { - array[i + 1] = array[i]; - i--; + for (int i = 1; i < array.length; i++) { + T insertValue = array[i]; + int j; + for (j = i - 1; j >= 0 && less(insertValue, array[j]); j--) { + array[j + 1] = array[j]; + } + if (j != i - 1) { + array[j + 1] = insertValue; } - // Placing the key (Card) at its correct position in the sorted subarray - array[i + 1] = key; } return array; } - // Driver Program + /** + * Driver Code + */ public static void main(String[] args) { - // Integer Input Integer[] integers = {4, 23, 6, 78, 1, 54, 231, 9, 12}; - InsertionSort sort = new InsertionSort(); - sort.sort(integers); + print(integers); /* [1, 4, 6, 9, 12, 23, 54, 78, 231] */ - // Output => 1 4 6 9 12 23 54 78 231 - print(integers); - - // String Input String[] strings = {"c", "a", "e", "b", "d"}; - sort.sort(strings); - - // Output => a b c d e - print(strings); + print(strings); /* [a, b, c, d, e] */ } -} +} \ No newline at end of file From b005ff9db0bc67b6101d19c18bb90025ee9d2d8d Mon Sep 17 00:00:00 2001 From: github-actions <${GITHUB_ACTOR}@users.noreply.github.com> Date: Mon, 12 Apr 2021 10:49:28 +0000 Subject: [PATCH 2/2] Formatted with Google Java Formatter --- Sorts/InsertionSort.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Sorts/InsertionSort.java b/Sorts/InsertionSort.java index 353cec37541a..2114067ab692 100644 --- a/Sorts/InsertionSort.java +++ b/Sorts/InsertionSort.java @@ -7,6 +7,7 @@ class InsertionSort implements SortAlgorithm { /** * Generic insertion sort algorithm in increasing order. + * * @param array the array to be sorted. * @param the class of array. * @return sorted array. @@ -26,9 +27,7 @@ public > T[] sort(T[] array) { return array; } - /** - * Driver Code - */ + /** Driver Code */ public static void main(String[] args) { Integer[] integers = {4, 23, 6, 78, 1, 54, 231, 9, 12}; InsertionSort sort = new InsertionSort(); @@ -39,4 +38,4 @@ public static void main(String[] args) { sort.sort(strings); print(strings); /* [a, b, c, d, e] */ } -} \ No newline at end of file +}