Commit 88201f3

committed

day03 for AoC 2023 (part 2)

Took 11 minutes

1 parent 50b3add commit 88201f3Copy full SHA for 88201f3

File tree

+32

-4

lines changed

+32

-4

lines changed

Lines changed: 28 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,34 @@ public long solvePart1() {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public long solvePart2() {`
	`41`	`+ Pattern p = Pattern.compile("(?:mul\\((\\d{1,3}),(\\d{1,3})\\))\|(?:do\\(\\))\|(?:don't\\(\\))");`
`41`	`42`
`42`		`- return 0;`
	`43`	`+ long sum = 0L;`
	`44`	`+ boolean mulEnabled = true;`
	`45`	`+ for (String s : input) {`
	`46`	`+ Matcher matcher = p.matcher(s);`
	`47`	`+`
	`48`	`+ while (matcher.find()) {`
	`49`	`+ String fullMatch = matcher.group(0);`
	`50`	`+ if (fullMatch.startsWith("mul")) {`
	`51`	`+ if (mulEnabled) {`
	`52`	`+ LOGGER.info("Executing {}", fullMatch);`
	`53`	`+ Long a = Long.valueOf(matcher.group(1));`
	`54`	`+ Long b = Long.valueOf(matcher.group(2));`
	`55`	`+ sum += a * b;`
	`56`	`+ } else {`
	`57`	`+ LOGGER.info("Skipping {}", fullMatch);`
	`58`	`+ }`
	`59`	`+ } else if (fullMatch.startsWith("do()")) {`
	`60`	`+ LOGGER.info("Enabling {}", fullMatch);`
	`61`	`+ mulEnabled = true;`
	`62`	`+ } else if (fullMatch.startsWith("don't()")) {`
	`63`	`+ LOGGER.info("Disabling {}", fullMatch);`
	`64`	`+ mulEnabled = false;`
	`65`	`+ }`
	`66`	`+ }`
	`67`	`+ }`
	`68`	`+`
	`69`	`+ return sum;`
`43`	`70`	`}`
`44`	`71`	`}`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,21 +52,21 @@ void actualInputPart2() throws IOException {`
`52`	`52`	`long l = solver.solvePart2();`
`53`	`53`
`54`	`54`	`// then`
`55`		`- assertThat(l, is(0L));`
	`55`	`+ assertThat(l, is(80570939L));`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Test`
`59`	`59`	`void testInputPart2() throws IOException {`
`60`	`60`	`// given`
`61`		`- List<String> input = readLines(resourceToString("/day03/day03_input_test.txt", UTF_8));`
	`61`	`+ List<String> input = readLines(resourceToString("/day03/day03_input_test2.txt", UTF_8));`
`62`	`62`
`63`	`63`	`// when`
`64`	`64`	`Day03 solver = new Day03();`
`65`	`65`	`solver.parseInput(input);`
`66`	`66`	`long l = solver.solvePart2();`
`67`	`67`
`68`	`68`	`// then`
`69`		`- assertThat(l, is(0L));`
	`69`	`+ assertThat(l, is(48L));`
`70`	`70`	`}`
`71`	`71`
`72`	`72`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+xmul(2,4)&mul[3,7]!^don't()_mul(5,5)+mul(32,64](mul(11,8)undo()?mul(8,5))`

Comments

(0)