Skip to content

Update MergeSort.py #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Paridhi0309 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update MergeSort.py #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e43bd2
Update MergeSort.py
Paridhi0309 Oct 9, 2019
eb5337a
Update Knapsack.py
Paridhi0309 Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Knapsack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/usr/bin/python3

"""This program uses the greedy approach to solve the knapsack problem"""
import mysql.connector
import datetime
capacity=int(input("Enter the capacity of your knapsack:\n"))
Expand Down
10 changes: 5 additions & 5 deletions MergeSort.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
import datetime
a = datetime.datetime.now()
def mergeSort(arr):
if len(arr) >1:
if (len(arr) >1):
mid = len(arr)//2
L = arr[:mid]
L = arr[0:mid]
R = arr[mid:]

mergeSort(L)
mergeSort(R)

i = j = k = 0

while i < len(L) and j < len(R):
while (i < len(L) and j < len(R)):
if L[i] < R[j]:
arr[k] = L[i]
i+=1
Expand All @@ -23,12 +23,12 @@ def mergeSort(arr):
k+=1


while i < len(L):
while (i < len(L)):
arr[k] = L[i]
i+=1
k+=1

while j < len(R):
while (j < len(R)):
arr[k] = R[j]
j+=1
k+=1
Expand Down