From 703e572896ca53d914cccb58cf86f232e86c1978 Mon Sep 17 00:00:00 2001 From: Anisha Sunkerneni Date: Tue, 14 Apr 2020 14:20:28 -0700 Subject: [PATCH 1/2] day 1 mvp --- .../iterative_sorting.cpython-37.pyc | Bin 815 -> 856 bytes src/iterative_sorting/iterative_sorting.py | 24 ++++++------- src/recursive_sorting/recursive_sorting.py | 33 ------------------ 3 files changed, 12 insertions(+), 45 deletions(-) diff --git a/src/iterative_sorting/__pycache__/iterative_sorting.cpython-37.pyc b/src/iterative_sorting/__pycache__/iterative_sorting.cpython-37.pyc index 7176fe6aa9951159b6a50bac8891d62dd4090bdc..a39d3bff2e7ec6cfc3db2002d3a5f0e3ae0c10aa 100644 GIT binary patch literal 856 zcmZWn&2AGh5FXpR$tG>Xk1CN$sE1zAUf2T?rwAeF301jNsL~=5HfuLsW!Is$w+fPT zN_hp&aO6dJh`n;kD{z6a6QT-cd3A8m1(Y98zKotRfS=C!E9k>ZT>2Ol z2TpDw1x`7`o$!c74rc!KE_thk(n%%@eU<52&V-Ue7Rl*6uPY&qPR_Dw!n5Rju1q1PiB@@17@;y# z+=#K>M*oXE{rIWrX;F&Y6m#kCQ3TWvQ336f0KY@hCHwwUdl=nu9-y=1oTIZCSun`U zip-cAEzS(V4j|8WI`AAj0G1p9b^&+CKibSv%VvQ(v1n1uU8oTt#u9+RlzpH9;vZ4R)oNUK!8iM!D&0_9pdYQf|1pj{)671*Av% zB*MRq$T3m(FtYxQk~=sjZg=>8&>Ws012Xi9W9qTfc9kuPs;>Tp?B?@Y8qe}$e5!p? psve*{jEQnp#LScIk^RA)9BvepuRR)6b6%I?h0CB_8Bs6V{{uX`yTSkf literal 815 zcmZXS&2G~`5P)ZPoyKXCDu)Oq9C|=p%mMenfkT8U;D~}mi;yf(alA`o>YsMjK|yj( z?E~-{JO%IJE2lgF7cMZn4lRPQc6MiGcW35XKOGEqf#uuLkGEeWz;|o>5w_uohdE%S zK;bn+poEe-{?#yRazEqpWq~B z$O^<5J@n)Vhv?&hPxei2fO>3Ls1E1{Uaa2V0(HP<3=?Xc00Tt^`lyyloO^Uq3-(Ke zV{jNxZY{f-y4Yi2wD%aE+shz_Hz3JYNG(XRe*@WC0*`Dtw8JX$DxF_Y*V>j@t9ra@ z_U6m^JZp)J+0k~2Bks_{yWDA?KicES<`+w1b6K&oP3hXT`P{4G%v~J_mpkg_@hZ)i z`M*hblX6*9j_!RvYTTuQ2E3jHNPV6I>F~PDF7VeKt_4@UKg~ right: + arr[i], arr[i+1] = right, left return arr + # STRETCH: implement the Count Sort function below def count_sort( arr, maximum=-1 ): diff --git a/src/recursive_sorting/recursive_sorting.py b/src/recursive_sorting/recursive_sorting.py index dcbf3757..e69de29b 100644 --- a/src/recursive_sorting/recursive_sorting.py +++ b/src/recursive_sorting/recursive_sorting.py @@ -1,33 +0,0 @@ -# TO-DO: complete the helpe function below to merge 2 sorted arrays -def merge( arrA, arrB ): - elements = len( arrA ) + len( arrB ) - merged_arr = [0] * elements - # TO-DO - - return merged_arr - - -# TO-DO: implement the Merge Sort function below USING RECURSION -def merge_sort( arr ): - # TO-DO - - return arr - - -# STRETCH: implement an in-place merge sort algorithm -def merge_in_place(arr, start, mid, end): - # TO-DO - - return arr - -def merge_sort_in_place(arr, l, r): - # TO-DO - - return arr - - -# STRETCH: implement the Timsort function below -# hint: check out https://github.com/python/cpython/blob/master/Objects/listsort.txt -def timsort( arr ): - - return arr From 70f4ac097c79430835e44e349814dc5f77cebd9d Mon Sep 17 00:00:00 2001 From: Anisha Sunkerneni Date: Thu, 16 Apr 2020 15:01:15 -0700 Subject: [PATCH 2/2] mvp 2 --- src/recursive_sorting/recursive_sorting.py | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/recursive_sorting/recursive_sorting.py b/src/recursive_sorting/recursive_sorting.py index e69de29b..ebeba2c3 100644 --- a/src/recursive_sorting/recursive_sorting.py +++ b/src/recursive_sorting/recursive_sorting.py @@ -0,0 +1,52 @@ +# TO-DO: complete the helper function below to merge 2 sorted arrays +def merge( arrA, arrB ): + elem = len( arrA ) + len( arrB ) + merged_arr = [0] * elem + # TO-DO + while ((len(arrA) > 0) | (len(arrB) > 0)): + if not arrA: + merged_arr.append(arrB[0]) + arrB.pop(0) + elif not arrB: + merged_arr.append(arrA[0]) + arrA.pop(0) + elif (arrA[0] < arrB[0]): + merged_arr.append(arrA[0]) + arrA.pop(0) + elif (arrB[0] < arrA[0]): + merged_arr.append(arrB[0]) + arrB.pop(0) + merged_arr.pop(0) + + return merged_arr + + +# TO-DO: implement the Merge Sort function below USING RECURSION +def merge_sort( arr ): + # TO-DO + if len(arr) > 1: + mid = len(arr) // 2 + left = arr[0:mid] + right = arr[mid: ] + arr = merge(merge_sort(left), merge_sort(right)) + + return arr + + +# STRETCH: implement an in-place merge sort algorithm +def merge_in_place(arr, start, mid, end): + # TO-DO + + return arr + +def merge_sort_in_place(arr, l, r): + # TO-DO + + return arr + + +# STRETCH: implement the Timsort function below +# hint: check out https://github.com/python/cpython/blob/master/Objects/listsort.txt +def timsort( arr ): + + return arr