Syntax updates, ~nothing important~

Author: Ian Doarn

pygorithm/dynamic_programming/__init__.py

@@ -6,5 +6,5 @@
 
 __all__ = [
     'binary_knapsack',
-    'lis',
+    'lis'
 ]

pygorithm/dynamic_programming/binary_knapsack.py

@@ -1,16 +1,17 @@
-'''
+"""
 Author: Omkar Pathak
 Created At: 25th August 2017
-'''
-
+"""
 import inspect
+# TODO: Explain how this works / Explain what a knapsack is
+
 
-def knapsack(W, value, weight):
-    '''
-        :param W: maximum weight capacity
-        :param value: an array of values of items in the knapsack
-        :param weight: an array of weights of items in the knapsack
-    '''
+def knapsack(w, value, weight):
+    """
+    :param w: maximum weight capacity
+    :param value: an array of values of items in the knapsack
+    :param weight: an array of weights of items in the knapsack
+    """
     if type(value) is not list:
         raise TypeError("binary knapsack only accepts lists, not {}".format(str(type(value))))
     if type(weight) is not list:
@@ -22,13 +23,13 @@ def knapsack(W, value, weight):
     # n = number of items
     n = len(value)
 
-    knap_sack = [[0 for x in range(W+1)] for x in range(n+1)]
+    knap_sack = [[0 for _ in range(w+1)] for _ in range(n+1)]
 
-    for j in range(W + 1):
+    for j in range(w + 1):
         knap_sack[0][j] = 0
 
     for i in range(n + 1):
-        for w in range(W + 1):
+        for w in range(w + 1):
             if weight[i - 1] <= w:
                 knap_sack[i][w] = max(value[i - 1] + knap_sack[i - 1][w - weight[i - 1]], knap_sack[i - 1][w])
             else:

pygorithm/dynamic_programming/lis.py

@@ -1,28 +1,29 @@
-'''
+"""
 Author: Omkar Pathak
 Created At: 25th August 2017
-'''
+"""
+
 
 def longest_increasing_subsequence(_list):
-    '''
+    """
     The Longest Increasing Subsequence (LIS) problem is to find the length of the longest subsequence of a
     given sequence such that all elements of the subsequence are sorted in increasing order. For example,
     the length of LIS for {10, 22, 9, 33, 21, 50, 41, 60, 80} is 6 and LIS is {10, 22, 33, 50, 60, 80}.
-    '''
+    :param _list:
+    :return:
+    """
     # Initialize list with some value
     lis = [1] * len(_list)
     # list for storing the elements in an lis
     elements = [0] * len(_list)
 
     # Compute optimized LIS values in bottom up manner
-    for i in range (1 , len(_list)):
-        for j in range(0 , i):
-            if _list[i] > _list[j] and lis[i]< lis[j] + 1:
+    for i in range(1, len(_list)):
+        for j in range(0, i):
+            if _list[i] > _list[j] and lis[i] < lis[j] + 1:
                 lis[i] = lis[j]+1
                 elements[i] = j
 
-    idx = 0
-
     # find the maximum of the whole list and get its index in idx
     maximum = max(lis)
     idx = lis.index(maximum)
@@ -35,6 +36,7 @@ def longest_increasing_subsequence(_list):
 
     return (maximum, seq[::-1])
 
+
 def get_code():
     """
     returns the code for the longest_increasing_subsequence function

pygorithm/greedy_algorithm/__init__.py

@@ -5,5 +5,5 @@
 
 __all__ = [
     'fractional_knapsack',
-    'activity_selection',
+    'activity_selection'
 ]

pygorithm/greedy_algorithm/activity_selection.py

@@ -2,8 +2,9 @@
 Author: OMKAR PATHAK
 Created On: 26th August 2017
 """
-
 import inspect
+# TODO: Explain what this is / how it works
+
 
 def activity_selection(start_times, finish_times):
     """
@@ -37,6 +38,7 @@ def activity_selection(start_times, finish_times):
 
     return activity
 
+
 def get_code():
     """
     returns the code for the activity_selection function

pygorithm/greedy_algorithm/fractional_knapsack.py

@@ -2,12 +2,13 @@
 Author: SHARAD BHAT
 Created On: 22nd August 2017
 """
-
 import inspect
+# TODO: Explain how this works / Explain what a knapsack is
+
 
-def knapsack(W, item_values, item_weights):
+def knapsack(w, item_values, item_weights):
     """
-    :param W: maximum weight capacity
+    :param w: maximum weight capacity
     :param item_values: a list of values of items in the knapsack
     :param item_weights: a list of weights of items in the knapsack
     """
@@ -38,21 +39,19 @@ def knapsack(W, item_values, item_weights):
         item_weights[i], item_weights[maximum] = item_weights[maximum], item_weights[i]
 
     # Placing items in knapsack
-    remaining_space = W
+    remaining_space = w
     profit = 0
     for i in range(0, n):
         if remaining_space > item_weights[i]:
             profit += item_values[i]
             remaining_space -= item_weights[i]
         else:
             profit += fractional_weights[i] * remaining_space
-            remaining_space = 0
             break
 
     return profit
 
 
-
 def get_code():
     """
     returns the code for the knapsack function