From 1e43bd2173fbbc355f5b268b33a116d5a778e16f Mon Sep 17 00:00:00 2001 From: Paridhi0309 <56124266+Paridhi0309@users.noreply.github.com> Date: Wed, 9 Oct 2019 08:52:14 +0530 Subject: [PATCH 1/2] Update MergeSort.py --- MergeSort.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MergeSort.py b/MergeSort.py index eee084a..673f739 100644 --- a/MergeSort.py +++ b/MergeSort.py @@ -3,9 +3,9 @@ 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) @@ -13,7 +13,7 @@ def mergeSort(arr): 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 @@ -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 From eb5337aa13e86feb37cc56518b53e45ee4c92652 Mon Sep 17 00:00:00 2001 From: Paridhi0309 <56124266+Paridhi0309@users.noreply.github.com> Date: Wed, 23 Oct 2019 13:24:18 +0530 Subject: [PATCH 2/2] Update Knapsack.py --- Knapsack.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Knapsack.py b/Knapsack.py index 9a84edc..14800dd 100644 --- a/Knapsack.py +++ b/Knapsack.py @@ -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"))