From 8032a2deb12c01190f102810510c8026f9dbb10e Mon Sep 17 00:00:00 2001 From: mamorales10 Date: Sat, 14 Oct 2017 13:04:53 -0600 Subject: [PATCH 1/2] Added merge sort --- SortingAlgorithms/merge_sort.py | 38 +++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 SortingAlgorithms/merge_sort.py diff --git a/SortingAlgorithms/merge_sort.py b/SortingAlgorithms/merge_sort.py new file mode 100644 index 0000000..cb643e9 --- /dev/null +++ b/SortingAlgorithms/merge_sort.py @@ -0,0 +1,38 @@ + +def mergeSort(listToSort): + if(len(listToSort) > 1): + mid = len(listToSort)//2 + lower = listToSort[:mid] + upper = listToSort[mid:] + + mergeSort(lower) + mergeSort(upper) + + i = 0 + j = 0 + k = 0 + while(i < len(lower) and j < len(upper)): + if(lower[i] < upper[j]): + listToSort[k] = lower[i] + i = i + 1 + else: + listToSort[k] = upper[j] + j = j + 1 + k = k + 1 + + while(i < len(lower)): + listToSort[k] = lower[i] + i = i + 1 + k = k + 1 + + while(j < len(upper)): + listToSort[k] = upper[j] + j = j + 1 + k = k + 1 + +print "Enter numbers to be sorted (separated by space)" + +userList = map(int, raw_input().split()) +mergeSort(userList) + +print userList From 27044a983075a5aa07bd1e6c4335c2cec1669362 Mon Sep 17 00:00:00 2001 From: mamorales10 Date: Sat, 14 Oct 2017 13:24:38 -0600 Subject: [PATCH 2/2] Added factorial in python --- Patterns/factorial.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Patterns/factorial.py diff --git a/Patterns/factorial.py b/Patterns/factorial.py new file mode 100644 index 0000000..19e33a8 --- /dev/null +++ b/Patterns/factorial.py @@ -0,0 +1,15 @@ + +print "Enter a number to get factorial." +userInput = map(int, raw_input().split()) + +i = 1 +answer = 1 +if(userInput[0] != 0): + while(i <= userInput[0]): + + tmp = answer + answer = i * tmp + i = i + 1 + +print answer +