From 411672d8c31e512fa5f15c94dc4169191457c9b1 Mon Sep 17 00:00:00 2001 From: Sebastian Lindemeier Date: Tue, 9 Dec 2025 11:41:41 +0100 Subject: [PATCH] Refactor Day08 and Day09 to update collection types and method names for improved consistency and clarity --- AoC_2025/Day08.cs | 14 +++++++------- AoC_2025/Day09.cs | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/AoC_2025/Day08.cs b/AoC_2025/Day08.cs index 5fde7e2..5f1bcef 100644 --- a/AoC_2025/Day08.cs +++ b/AoC_2025/Day08.cs @@ -44,12 +44,12 @@ public class Day08 : IPuzzleSolver return lastConnected.a.x * lastConnected.b.x; } - private List> CreateCircuits(IEnumerable jBoxes) + private List> CreateCircuits(IEnumerable jBoxes) { - return jBoxes.Select(p => new List { p }).ToList(); + return jBoxes.Select(p => new HashSet { p }).ToList(); } - private List> CombineCircuits(List> circuits, + private List> CombineCircuits(List> circuits, IEnumerable<(Coordinate boxA, Coordinate boxB)> jBoxPairs, int amountToConnect) { circuits = jBoxPairs @@ -58,7 +58,7 @@ public class Day08 : IPuzzleSolver return circuits; } - private (Coordinate a, Coordinate b) LastCombinedConnectAllCircuits(List> circuits, + private (Coordinate a, Coordinate b) LastCombinedConnectAllCircuits(List> circuits, IEnumerable<(Coordinate boxA, Coordinate boxB)> jBoxPairs) { foreach (var jBoxPair in jBoxPairs) @@ -75,7 +75,7 @@ public class Day08 : IPuzzleSolver return (a.x - b.x) * (a.x - b.x) + (a.y - b.y) * (a.y - b.y) + (a.z - b.z) * (a.z - b.z); } - private List> ConnectJBoxes(Coordinate a, Coordinate b, List> circuits) + private List> ConnectJBoxes(Coordinate a, Coordinate b, List> circuits) { var circuitToAddBTo = circuits.First(circuit => circuit.Contains(a)); var circuitToAddATo = circuits.First(circuit => circuit.Contains(b)); @@ -85,7 +85,7 @@ public class Day08 : IPuzzleSolver return circuits; } - circuitToAddBTo.AddRange(circuitToAddATo); + circuitToAddBTo.UnionWith(circuitToAddATo); circuits.Remove(circuitToAddATo); return circuits; } @@ -108,7 +108,7 @@ public class Day08 : IPuzzleSolver return pairs; } - private long MultiplyLargestCircuitLength(List> circuits, int amountMultiply) + private long MultiplyLargestCircuitLength(List> circuits, int amountMultiply) { return circuits .Select(circuit => (long)circuit.Count) diff --git a/AoC_2025/Day09.cs b/AoC_2025/Day09.cs index 3775f10..5d3c543 100644 --- a/AoC_2025/Day09.cs +++ b/AoC_2025/Day09.cs @@ -54,12 +54,12 @@ public class Day09 : IPuzzleSolver private IEnumerable GetAllPossibleRectanglesAsPairs(Coordinate[] redTiles) { - return Combinations(redTiles).Select(x => AsMinMax(x.a, x.b)); + return Combinations(redTiles).Select(x => AsPair(x.a, x.b)); } private CoordinatePair[] GetBordersAsPairs(Coordinate[] redTiles) { - return GetBorders(redTiles).Select(x => AsMinMax(x.a, x.b)).ToArray(); + return GetBorders(redTiles).Select(x => AsPair(x.a, x.b)).ToArray(); } private bool IsRectangleInsideBorders(CoordinatePair[] borders, CoordinatePair rectangle) @@ -67,7 +67,7 @@ public class Day09 : IPuzzleSolver return !borders.Any(border => RectangleCrossesBorder(rectangle, border)); } - private CoordinatePair AsMinMax(Coordinate a, Coordinate b) + private CoordinatePair AsPair(Coordinate a, Coordinate b) { return (Math.Min(a.x, b.x), Math.Min(a.y, b.y), Math.Max(a.x, b.x), Math.Max(a.y, b.y)); }