Commit cd1b76c

authored

Merge pull request #3 from markjfisher/main

Fix early exit from validation before all terms are used

2 parents 037ab67 + 25ebadb commit cd1b76cCopy full SHA for cd1b76c

File tree

+20

-4

lines changed

+20

-4

lines changed

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,17 @@ pub fn part2(input: &Input) -> u64 {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`fn valid(terms: &[u64], test_value: u64, index: usize, concat: bool) -> bool {`
`84`		`- (test_value == 0)`
`85`		`- \|\| (concat`
`86`		`- && test_value % next_power_of_ten(terms[index]) == terms[index]`
`87`		`- && valid(terms, test_value / next_power_of_ten(terms[index]), index - 1, concat))`
	`84`	`+ if test_value == 0 {`
	`85`	`+ return index == 0;`
	`86`	`+ }`
	`87`	`+`
	`88`	`+ if index == 0 {`
	`89`	`+ return false;`
	`90`	`+ }`
	`91`	`+`
	`92`	`+ (concat`
	`93`	`+ && test_value % next_power_of_ten(terms[index]) == terms[index]`
	`94`	`+ && valid(terms, test_value / next_power_of_ten(terms[index]), index - 1, concat))`
`88`	`95`	`\|\| (test_value % terms[index] == 0`
`89`	`96`	`&& valid(terms, test_value / terms[index], index - 1, concat))`
`90`	`97`	`\|\| (test_value >= terms[index]`

Lines changed: 9 additions & 0 deletions

Comments

(0)