Refactor Day08 to improve readability and speed
This commit is contained in:
parent
04d9b2fd45
commit
b60db3c78a
|
|
@ -23,30 +23,10 @@ public class Day08
|
|||
public long SolvePart1(string pathToPuzzleInput, int amountToConnect)
|
||||
{
|
||||
var points = ParsePuzzleInput(pathToPuzzleInput);
|
||||
Dictionary<Coordinate, HashSet<Coordinate>> connected = points.ToDictionary(p => p, p => new HashSet<Coordinate>());
|
||||
var pointsWithClosest = points.Select(point =>
|
||||
{
|
||||
var closest = GetClosestPoint(point, points, connected);
|
||||
return (point, closest: closest.point, closest.distance);
|
||||
})
|
||||
.OrderBy(x => x.distance)
|
||||
.ToArray();
|
||||
|
||||
List<List<Coordinate>> circuits = [];
|
||||
for (var i = 0; i < amountToConnect; i++)
|
||||
{
|
||||
var next = pointsWithClosest[0];
|
||||
_ = AddToCircuits(next.point, next.closest, circuits);
|
||||
connected[next.point].Add(next.closest);
|
||||
connected[next.closest].Add(next.point);
|
||||
pointsWithClosest = points.Select(point =>
|
||||
{
|
||||
var closest = GetClosestPoint(point, points, connected);
|
||||
return (point, closest: closest.point, closest.distance);
|
||||
})
|
||||
.OrderBy(x => x.distance)
|
||||
.ToArray();
|
||||
}
|
||||
var pointPairs = GetAllCombinationsSortedByDistance(points);
|
||||
|
||||
var circuits = CombineCircuits(amountToConnect, points, pointPairs);
|
||||
|
||||
return circuits
|
||||
.Select(circuit => circuit.Count)
|
||||
|
|
@ -58,54 +38,41 @@ public class Day08
|
|||
public long SolvePart2(string pathToPuzzleInput)
|
||||
{
|
||||
var points = ParsePuzzleInput(pathToPuzzleInput);
|
||||
Dictionary<Coordinate, HashSet<Coordinate>> connected = points.ToDictionary(p => p, p => new HashSet<Coordinate>());
|
||||
var pointsWithClosest = points.Select(point =>
|
||||
{
|
||||
var closest = GetClosestPoint(point, points, connected);
|
||||
return (point, closest: closest.point, closest.distance);
|
||||
})
|
||||
.OrderBy(x => x.distance)
|
||||
.ToArray();
|
||||
|
||||
List<List<Coordinate>> circuits = points.Select(p => new List<Coordinate>() { p }).ToList();
|
||||
(Coordinate a, Coordinate b) lastConnected = ((0, 0, 0), (0, 0, 0));
|
||||
while(circuits.Count > 1)
|
||||
{
|
||||
var next = pointsWithClosest[0];
|
||||
_ = AddToCircuits(next.point, next.closest, circuits);
|
||||
connected[next.point].Add(next.closest);
|
||||
connected[next.closest].Add(next.point);
|
||||
lastConnected = (next.point, next.closest);
|
||||
pointsWithClosest = points.Select(point =>
|
||||
{
|
||||
var closest = GetClosestPoint(point, points, connected);
|
||||
return (point, closest: closest.point, closest.distance);
|
||||
})
|
||||
.OrderBy(x => x.distance)
|
||||
.ToArray();
|
||||
}
|
||||
var pointPairs = GetAllCombinationsSortedByDistance(points);
|
||||
|
||||
var lastConnected = LastCombinedConnectAllCircuits(points, pointPairs);
|
||||
|
||||
return lastConnected.a.x * lastConnected.b.x;
|
||||
}
|
||||
|
||||
private (Coordinate point, double distance) GetClosestPoint(Coordinate a, Coordinate[] points, Dictionary<Coordinate, HashSet<Coordinate>> connections)
|
||||
private List<List<Coordinate>> CombineCircuits(int amountToConnect, Coordinate[] points,
|
||||
(Coordinate pointA, Coordinate pointB)[] pointPairs)
|
||||
{
|
||||
var minDistance = double.MaxValue;
|
||||
var minIndex = -1;
|
||||
for (var i = 0; i < points.Length; i++)
|
||||
var circuits = points.Select(p => new List<Coordinate>() { p }).ToList();
|
||||
for (var i = 0; i < amountToConnect; i++)
|
||||
{
|
||||
if(a == points[i]) continue;
|
||||
if(connections[a].Contains(points[i])) continue;
|
||||
|
||||
var distance = GetDistance(a, points[i]);
|
||||
if (minDistance > distance)
|
||||
{
|
||||
minIndex = i;
|
||||
minDistance = GetDistance(a, points[i]);
|
||||
}
|
||||
var next = pointPairs[i];
|
||||
circuits = AddToCircuits(next.pointA, next.pointB, circuits);
|
||||
}
|
||||
|
||||
return (points[minIndex], minDistance);
|
||||
return circuits;
|
||||
}
|
||||
|
||||
private (Coordinate a, Coordinate b) LastCombinedConnectAllCircuits(Coordinate[] points,
|
||||
(Coordinate pointA, Coordinate pointB)[] pointPairs)
|
||||
{
|
||||
var circuits = points.Select(p => new List<Coordinate>() { p }).ToList();
|
||||
(Coordinate a, Coordinate b) lastConnected = ((0, 0, 0), (0, 0, 0));
|
||||
var i = 0;
|
||||
while(circuits.Count > 1)
|
||||
{
|
||||
var next = pointPairs[i++];
|
||||
circuits = AddToCircuits(next.pointA, next.pointB, circuits);
|
||||
lastConnected = (next.pointA, next.pointB);
|
||||
}
|
||||
|
||||
return lastConnected;
|
||||
}
|
||||
|
||||
private double GetDistance(Coordinate a, Coordinate b)
|
||||
|
|
@ -113,19 +80,19 @@ public class Day08
|
|||
return Math.Sqrt(Math.Pow(a.x - b.x, 2) + Math.Pow(a.y - b.y, 2) + Math.Pow(a.z - b.z, 2));
|
||||
}
|
||||
|
||||
private int AddToCircuits(Coordinate a, Coordinate b, List<List<Coordinate>> circuits)
|
||||
private List<List<Coordinate>> AddToCircuits(Coordinate a, Coordinate b, List<List<Coordinate>> circuits)
|
||||
{
|
||||
var circuitToAddBTo = circuits.FirstOrDefault(circuit => circuit.Contains(a));
|
||||
var circuitToAddATo = circuits.FirstOrDefault(circuit => circuit.Contains(b));
|
||||
if (circuitToAddATo == null && circuitToAddBTo == null)
|
||||
{
|
||||
circuits.Add([a, b]);
|
||||
return 2;
|
||||
return circuits;
|
||||
}
|
||||
|
||||
if (circuitToAddATo == circuitToAddBTo)
|
||||
{
|
||||
return 0;
|
||||
return circuits;
|
||||
}
|
||||
|
||||
if (circuitToAddATo != null && circuitToAddBTo != null)
|
||||
|
|
@ -133,7 +100,7 @@ public class Day08
|
|||
circuits.Remove(circuitToAddATo);
|
||||
circuits.Remove(circuitToAddBTo);
|
||||
circuits.Add([..circuitToAddATo, ..circuitToAddBTo]);
|
||||
return 0;
|
||||
return circuits;
|
||||
}
|
||||
|
||||
if (circuitToAddATo != null)
|
||||
|
|
@ -142,19 +109,24 @@ public class Day08
|
|||
}
|
||||
else
|
||||
{
|
||||
circuitToAddBTo.Add(b);
|
||||
circuitToAddBTo!.Add(b);
|
||||
}
|
||||
|
||||
return 1;
|
||||
return circuits;
|
||||
}
|
||||
|
||||
private IEnumerable<(Coordinate pointA, Coordinate pointB, double distance)> GetAllDistances(Coordinate[] coordinates)
|
||||
private (Coordinate pointA, Coordinate pointB)[] GetAllCombinationsSortedByDistance(Coordinate[] coordinates)
|
||||
{
|
||||
var combinations = coordinates
|
||||
.SelectMany((coord, ix) =>
|
||||
coordinates.Skip(ix + 1).Select(coordB => (coord, coordB, distance: GetDistance(coord, coordB))))
|
||||
.OrderBy(x => x.distance)
|
||||
var combinations = Combinations(coordinates)
|
||||
.OrderBy(x => GetDistance(x.a, x.b))
|
||||
.ToArray();
|
||||
return combinations;
|
||||
}
|
||||
|
||||
private IEnumerable<(TValue a, TValue b)> Combinations<TValue>(IEnumerable<TValue> values)
|
||||
{
|
||||
var enumerated = values.ToArray();
|
||||
return enumerated
|
||||
.SelectMany((valueA, ix) => enumerated.Skip(ix + 1).Select(valueB => (valueA, valueB)));
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue