resolve

kanglicheng · kanglicheng · commit 346f5b62720c · 2019-08-24T18:16:15.000-05:00
diff --git a/EPI/EPI.py b/EPI/EPI.py
@@ -3,6 +3,10 @@
 """
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+
+>>>>>>> 7488e4d602261a8615cebaf51ea6ebaac4ccb207
 =======
 
 >>>>>>> 7488e4d602261a8615cebaf51ea6ebaac4ccb207
@@ -19,12 +23,28 @@ def cc(n, denoms):
 			#globalMin= minCoins
 	return globalMin
 
+<<<<<<< HEAD
 # print(cc(5, [1, 5, 10, 25]))
 # print(cc(33, [1, 5, 10, 25]))
 
 # greedy algorithm, always pick the largest possible coin, subtract from n
 def greedyCC(n, denoms):
     pass 
+=======
+print(cc(5, [1, 5, 10, 25]))
+print(cc(33, [1, 5, 10, 25]))
+
+# greedy algorithm, always pick the largest possible coin, subtract from n
+def greedyCC(n, denoms):
+	prev =0
+	count =0
+	while n != 0:
+		n -= max(denoms) if max(denoms)<n 
+		count +=1 
+	return count
+
+
+>>>>>>> 7488e4d602261a8615cebaf51ea6ebaac4ccb207
 
 
 """
diff --git a/EPI/EPI_ch5_arrays.py b/EPI/EPI_ch5_arrays.py
@@ -51,10 +51,13 @@ def partition_opt(arr, i):
 and update the array to represent N+1.
 """
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 
 def knapsack(items, weights, W):
 	
 =======
 >>>>>>> 7488e4d602261a8615cebaf51ea6ebaac4ccb207
+=======
+>>>>>>> 7488e4d602261a8615cebaf51ea6ebaac4ccb207
 
