Refactor Day08 to update data types, optimize method parameters, and improve test logic

This commit is contained in:
Sebastian Lindemeier 2025-12-08 16:55:19 +01:00
parent 9d8a611f76
commit 1b1c64b103
2 changed files with 35 additions and 23 deletions

View File

@ -4,19 +4,19 @@ namespace AoC_2025.Tests;
public class Day08Test public class Day08Test
{ {
private readonly Day08 _sut; private IPuzzleSolver<long> _sut;
private static readonly string rootPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); private static readonly string rootPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
private readonly string TestInputPath = @$"{rootPath}\AoC-PuzzleInputs\2025\Test\day08.txt"; private readonly string TestInputPath = @$"{rootPath}\AoC-PuzzleInputs\2025\Test\day08.txt";
private readonly string ProdInputPath = @$"{rootPath}\AoC-PuzzleInputs\2025\Prod\day08.txt"; private readonly string ProdInputPath = @$"{rootPath}\AoC-PuzzleInputs\2025\Prod\day08.txt";
public Day08Test() public Day08Test()
{ {
_sut = new Day08(); _sut = new Day08(10);
} }
[Fact] [Fact]
public void Part01_Test_equals_40() public void Part01_Test_equals_40()
{ {
var actual = _sut.SolvePart1(TestInputPath, 10); var actual = _sut.SolvePart1(TestInputPath);
Assert.Equal(40, actual); Assert.Equal(40, actual);
} }
@ -24,7 +24,9 @@ public class Day08Test
[Fact] [Fact]
public void Part01_Prod_equals_42840() public void Part01_Prod_equals_42840()
{ {
var actual = _sut.SolvePart1(ProdInputPath, 1000); _sut = new Day08(1000);
var actual = _sut.SolvePart1(ProdInputPath);
Assert.Equal(42840, actual); Assert.Equal(42840, actual);
} }

View File

@ -4,33 +4,35 @@ using System.Data.Common;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using AdvenOfCode.Contracts; using AdvenOfCode.Contracts;
using Coordinate = (int x, int y, int z); using Coordinate = (long x, long y, long z);
namespace AoC_2025; namespace AoC_2025;
public class Day08 public class Day08 : IPuzzleSolver<long>
{ {
private readonly int _amountToConnect;
public Day08(int amountToConnect)
{
_amountToConnect = amountToConnect;
}
private Coordinate[] ParsePuzzleInput(string path) private Coordinate[] ParsePuzzleInput(string path)
{ {
var puzzleInput = File.ReadAllLines(path) var puzzleInput = File.ReadAllLines(path)
.Where(line => !string.IsNullOrWhiteSpace(line)) .Where(line => !string.IsNullOrWhiteSpace(line))
.Select(line => line.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(str => int.Parse(str)).ToArray()) .Select(line => line.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(str => long.Parse(str)).ToArray())
.Select(numbers => (numbers[0], numbers[1], numbers[2])) .Select(numbers => (numbers[0], numbers[1], numbers[2]))
.ToArray(); .ToArray();
return puzzleInput; return puzzleInput;
} }
public long SolvePart1(string pathToPuzzleInput, int amountToConnect) public long SolvePart1(string pathToPuzzleInput)
{ {
var jBoxes = ParsePuzzleInput(pathToPuzzleInput); var jBoxes = ParsePuzzleInput(pathToPuzzleInput);
var jBoxPairs = GetAllCombinationsSortedByDistance(jBoxes); var jBoxPairs = GetAllCombinationsSortedByDistance(jBoxes);
var circuits = CreateCircuits(jBoxes); var circuits = CreateCircuits(jBoxes);
circuits = CombineCircuits(circuits, jBoxPairs, amountToConnect); circuits = CombineCircuits(circuits, jBoxPairs, _amountToConnect);
return circuits var checksum = MultiplyLargestCircuitLength(circuits, 3);
.Select(circuit => circuit.Count) return checksum;
.OrderDescending()
.Take(3)
.Aggregate((acc, next) => acc * next);
} }
public long SolvePart2(string pathToPuzzleInput) public long SolvePart2(string pathToPuzzleInput)
@ -42,13 +44,13 @@ public class Day08
return lastConnected.a.x * lastConnected.b.x; return lastConnected.a.x * lastConnected.b.x;
} }
private List<List<Coordinate>> CreateCircuits(Coordinate[] jBoxes) private List<List<Coordinate>> CreateCircuits(IEnumerable<Coordinate> jBoxes)
{ {
return jBoxes.Select(p => new List<Coordinate> { p }).ToList(); return jBoxes.Select(p => new List<Coordinate> { p }).ToList();
} }
private List<List<Coordinate>> CombineCircuits(List<List<Coordinate>> circuits, private List<List<Coordinate>> CombineCircuits(List<List<Coordinate>> circuits,
(Coordinate boxA, Coordinate boxB)[] jBoxPairs, int amountToConnect) IEnumerable<(Coordinate boxA, Coordinate boxB)> jBoxPairs, int amountToConnect)
{ {
circuits = jBoxPairs circuits = jBoxPairs
.Take(amountToConnect) .Take(amountToConnect)
@ -57,7 +59,7 @@ public class Day08
} }
private (Coordinate a, Coordinate b) LastCombinedConnectAllCircuits(List<List<Coordinate>> circuits, private (Coordinate a, Coordinate b) LastCombinedConnectAllCircuits(List<List<Coordinate>> circuits,
(Coordinate boxA, Coordinate boxB)[] jBoxPairs) IEnumerable<(Coordinate boxA, Coordinate boxB)> jBoxPairs)
{ {
foreach (var jBoxPair in jBoxPairs) foreach (var jBoxPair in jBoxPairs)
{ {
@ -65,12 +67,12 @@ public class Day08
if(circuits.Count <= 1) if(circuits.Count <= 1)
return jBoxPair; return jBoxPair;
} }
return jBoxPairs[^1]; return ((0,0,0), (0,0,0));
} }
private double GetDistance(Coordinate a, Coordinate b) private long GetDistance(Coordinate a, Coordinate b)
{ {
return Math.Sqrt(Math.Pow(a.x - b.x, 2) + Math.Pow(a.y - b.y, 2) + Math.Pow(a.z - b.z, 2)); 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<List<Coordinate>> ConnectJBoxes(Coordinate a, Coordinate b, List<List<Coordinate>> circuits) private List<List<Coordinate>> ConnectJBoxes(Coordinate a, Coordinate b, List<List<Coordinate>> circuits)
@ -88,11 +90,10 @@ public class Day08
return circuits; return circuits;
} }
private (Coordinate boxA, Coordinate boxB)[] GetAllCombinationsSortedByDistance(Coordinate[] jBoxes) private IEnumerable<(Coordinate boxA, Coordinate boxB)> GetAllCombinationsSortedByDistance(IEnumerable<Coordinate> jBoxes)
{ {
var combinations = Combinations(jBoxes) var combinations = Combinations(jBoxes)
.OrderBy(x => GetDistance(x.a, x.b)) .OrderBy(x => GetDistance(x.a, x.b));
.ToArray();
return combinations; return combinations;
} }
@ -106,4 +107,13 @@ public class Day08
select (a.Item, b.Item); select (a.Item, b.Item);
return pairs; return pairs;
} }
private long MultiplyLargestCircuitLength(List<List<Coordinate>> circuits, int amountMultiply)
{
return circuits
.Select(circuit => (long)circuit.Count)
.OrderDescending()
.Take(amountMultiply)
.Aggregate((acc, next) => acc * next);
}
} }