Commit 346f5b6

committed

resolve

2 parents 791f343 + 7488e4d commit 346f5b6Copy full SHA for 346f5b6

File tree

+23

-0

lines changed

+23

-0

lines changed

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,10 @@`
`3`	`3`	`"""`
`4`	`4`
`5`	`5`	`<<<<<<< HEAD`
	`6`	`+<<<<<<< HEAD`
	`7`	`+=======`
	`8`	`+`
	`9`	`+>>>>>>> 7488e4d602261a8615cebaf51ea6ebaac4ccb207`
`6`	`10`	`=======`
`7`	`11`
`8`	`12`	`>>>>>>> 7488e4d602261a8615cebaf51ea6ebaac4ccb207`
`@@ -19,12 +23,28 @@ def cc(n, denoms):`
`19`	`23`	`#globalMin= minCoins`
`20`	`24`	`return globalMin`
`21`	`25`
	`26`	`+<<<<<<< HEAD`
`22`	`27`	`# print(cc(5, [1, 5, 10, 25]))`
`23`	`28`	`# print(cc(33, [1, 5, 10, 25]))`
`24`	`29`
`25`	`30`	`# greedy algorithm, always pick the largest possible coin, subtract from n`
`26`	`31`	`def greedyCC(n, denoms):`
`27`	`32`	`pass`
	`33`	`+=======`
	`34`	`+print(cc(5, [1, 5, 10, 25]))`
	`35`	`+print(cc(33, [1, 5, 10, 25]))`
	`36`	`+`
	`37`	`+# greedy algorithm, always pick the largest possible coin, subtract from n`
	`38`	`+def greedyCC(n, denoms):`
	`39`	`+ prev =0`
	`40`	`+ count =0`
	`41`	`+ while n != 0:`
	`42`	`+ n -= max(denoms) if max(denoms)<n`
	`43`	`+ count +=1`
	`44`	`+ return count`
	`45`	`+`
	`46`	`+`
	`47`	`+>>>>>>> 7488e4d602261a8615cebaf51ea6ebaac4ccb207`
`28`	`48`
`29`	`49`
`30`	`50`	`"""`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,13 @@ def partition_opt(arr, i):`
`51`	`51`	`and update the array to represent N+1.`
`52`	`52`	`"""`
`53`	`53`	`<<<<<<< HEAD`
	`54`	`+<<<<<<< HEAD`
`54`	`55`
`55`	`56`
`56`	`57`	`def knapsack(items, weights, W):`
`57`	`58`
`58`	`59`	`=======`
`59`	`60`	`>>>>>>> 7488e4d602261a8615cebaf51ea6ebaac4ccb207`
	`61`	`+=======`
	`62`	`+>>>>>>> 7488e4d602261a8615cebaf51ea6ebaac4ccb207`
`60`	`63`

Comments

(0)