2023 Day03 Refactored

smabuk · Dec 3, 2023 · b1c6a71 · b1c6a71
1 parent 9a50d64
commit b1c6a71
Showing 1 changed file with 44 additions and 49 deletions.
diff --git a/Solutions/2023/Day03.cs b/Solutions/2023/Day03.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using PartNoAndAPosition = (int PartNo, Smab.Helpers.Point Position);
 
 namespace AdventOfCode.Solutions._2023;
 
@@ -12,70 +12,65 @@ public sealed partial class Day03 {
 	public static string Part1(string[] input, params object[]? _) => Solution1(input).ToString();
 	public static string Part2(string[] input, params object[]? _) => Solution2(input).ToString();
 
-	private static int Solution1(string[] input) {
-		List<int> partNos = [];
+	private static int Solution1(string[] input) => FindPartNosAndGears(input, 1).Select(p => p.PartNo).Sum();
 
-		char[,] engine = string.Join("", input).To2dArray<char>(input[0].Length);
-		int maxX = input[0].Length - 1;
-		int maxY = input.Length - 1;
-		for (int row = 0; row < input.Length; row++) {
-			string engineLine = input[row].Replace('.', ' ');
-			MatchCollection possibleParts = Regex.Matches(engineLine, @"(?<number>\d+)");
-			foreach (Match number in possibleParts) {
-				bool foundPart = false;
-				for (int y = Math.Max(row - 1, 0); y <= Math.Min(row + 1, maxY); y++) {
-					for (int x = Math.Max(number.Index - 1, 0); x < Math.Min(number.Index + number.Length + 1, maxX); x++) {
-						char cell = engine[x, y];
-						if (!char.IsDigit(cell) && cell is not '.') {
-							partNos.Add(number.Value.AsInt());
-							foundPart = true;
-							break;
-						}
-					}
-					if (foundPart) {
-						break;
-					}
-				}
-			}
+	private static int Solution2(string[] input) {
+		List<PartNoAndAPosition> possibleGears = FindPartNosAndGears(input, 2);
+
+		IEnumerable<Point> gearPositions = possibleGears
+			.GroupBy(p => p.Position)
+			.Where(p => p.Count() == 2)
+			.Select(g => g.Key);
+
+		int sumOfGearRatios = 0;
+		foreach (Point position in gearPositions) {
+			sumOfGearRatios += possibleGears
+				.Where(g => g.Position == position)
+				.Select(g => g.PartNo)
+				.Aggregate(1, (x, y) => x * y);
 		}
 
-		return partNos.Sum();
+		return sumOfGearRatios;
 	}
 
-	private static int Solution2(string[] input) {
-		List<(int PartNo, Point Position)> possibleGears = [];
+	private static List<PartNoAndAPosition> FindPartNosAndGears(string[] input, int solutionPartNo)
+	{
+		const char GEAR  = '*';
+		const char SPACE = '.';
 
-		char[,] engine = string.Join("", input).To2dArray<char>(input[0].Length);
+		char[,] engineSchematic = string.Join("", input).To2dArray(input[0].Length);
 		int maxX = input[0].Length - 1;
 		int maxY = input.Length - 1;
+
+		List<PartNoAndAPosition> list = [];
+
 		for (int row = 0; row < input.Length; row++) {
-			string engineLine = input[row].Replace('.', ' ');
-			MatchCollection possibleParts = Regex.Matches(engineLine, @"(?<number>\d+)");
-			foreach (Match number in possibleParts) {
+			foreach (Match number in NumberRegex().Matches(input[row])) {
+				bool foundPart = false;
+				// Check cells in the rectangle bounding the number
 				for (int y = Math.Max(row - 1, 0); y <= Math.Min(row + 1, maxY); y++) {
 					for (int x = Math.Max(number.Index - 1, 0); x < Math.Min(number.Index + number.Length + 1, maxX); x++) {
-						char cell = engine[x, y];
-						if (cell is '*') {
-							possibleGears.Add((number.Value.AsInt(), new(x, y)));
+						char cell = engineSchematic[x, y];
+						if (solutionPartNo == 1) {
+							if (!(char.IsDigit(cell) || cell is SPACE)) {
+								list.Add((number.Value.AsInt(), new(x, y)));
+								foundPart = true;
+								break;
+							}
+						} else if (cell is GEAR) { // Part2
+							list.Add((number.Value.AsInt(), new(x, y)));
 						}
 					}
+					if (foundPart) {
+						break;
+					}
 				}
 			}
 		}
 
-		IEnumerable<Point> gearPositions = possibleGears
-			.GroupBy(p => p.Position)
-			.Where(p => p.Count() == 2)
-			.Select(g => g.Key);
-
-		int sumOfGearRatios = 0;
-		foreach (var position in gearPositions) {
-			sumOfGearRatios += possibleGears
-				.Where(g => g.Position == position)
-				.Select(g => g.PartNo)
-				.Aggregate(1, (x, y) => x * y);
-		}
-
-		return sumOfGearRatios;
+		return list;
 	}
+
+	[GeneratedRegex(@"\d+")]
+	private static partial Regex NumberRegex();
 }