Commit bc491d5

committed

work with 2 numbers

1 parent 52e38fa commit bc491d5Copy full SHA for bc491d5

File tree

+30

-4

lines changed

+30

-4

lines changed

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,22 @@ function combinationSum(`
`17`	`17`
`18`	`18`	`let candidate = candidates[index];`
`19`	`19`	`let newSum = currentSum + candidate;`
	`20`	`+ let newCurrent = current.concat(candidate);`
`20`	`21`
`21`	`22`	`if (newSum <= target) {`
`22`		`- combinationSum(candidates, target, solution, current.concat(candidate), newSum, index);`
	`23`	`+ combinationSum(candidates, target, solution, newCurrent, newSum, index);`
`23`	`24`	`} else if (index < candidates.length - 1) {`
`24`	`25`	`const newIndex = index + 1;`
`25`		`- while (currentSum + candidates[newIndex] > target) current.pop();`
`26`	`26`	`candidate = candidates[newIndex];`
`27`		`- newSum = currentSum + candidate;`
`28`		`- combinationSum(candidates, target, solution, current.concat(candidate), newSum, newIndex);`
	`27`	`+ newSum = currentSum;`
	`28`	`+ const reducedCurrent = current.slice(); // clone current`
	`29`	`+ while (newSum + candidate > target) {`
	`30`	`+ const deletedCandidate = reducedCurrent.pop();`
	`31`	`+ newSum -= deletedCandidate;`
	`32`	`+ }`
	`33`	`+ newSum += candidate;`
	`34`	`+ newCurrent = reducedCurrent.concat(candidate);`
	`35`	`+ combinationSum(candidates, target, solution, newCurrent, newSum, newIndex);`
`29`	`36`	`}`
`30`	`37`
`31`	`38`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,23 @@ describe('combinationSum', () => {`
`4`	`4`	`it('should return empty', () => {`
`5`	`5`	`expect(combinationSum([], 0)).toEqual([[]]);`
`6`	`6`	`});`
	`7`	`+`
	`8`	`+ it('should find solution for one item', () => {`
	`9`	`+ expect(combinationSum([1], 1)).toEqual([[1]]);`
	`10`	`+ });`
	`11`	`+`
	`12`	`+ it('should use multiple times one value', () => {`
	`13`	`+ expect(combinationSum([1], 2)).toEqual([[1, 1]]);`
	`14`	`+ });`
	`15`	`+`
	`16`	`+ it('should not find solution', () => {`
	`17`	`+ expect(combinationSum([2], 1)).toEqual([]);`
	`18`	`+ });`
	`19`	`+`
	`20`	`+ fit('should not find solution', () => {`
	`21`	`+ expect(combinationSum([1, 2], 3)).toEqual([`
	`22`	`+ [1, 1, 1],`
	`23`	`+ [1, 2],`
	`24`	`+ ]);`
	`25`	`+ });`
`7`	`26`	`});`

Comments

(0)