Use short notation for creating points

Corniel · Corniel · commit 6df3cab5004a · 2025-01-15T17:46:31.000+01:00
diff --git a/LoC.md b/LoC.md
@@ -34,7 +34,7 @@
 | [2015-15](src/AdventOfCode/2015/Day_15.cs) |  34 |    1.61 kb |
 | [2015-16](src/AdventOfCode/2015/Day_16.cs) |  21 |    1.09 kb |
 | [2015-17](src/AdventOfCode/2015/Day_17.cs) |  24 |    0.75 kb |
-| [2015-18](src/AdventOfCode/2015/Day_18.cs) |  17 |    0.82 kb |
+| [2015-18](src/AdventOfCode/2015/Day_18.cs) |  17 |    0.77 kb |
 | [2015-23](src/AdventOfCode/2015/Day_23.cs) |  17 |    0.77 kb |
 | [2015-25](src/AdventOfCode/2015/Day_25.cs) |   3 |    0.24 kb |
 | [2016-01](src/AdventOfCode/2016/Day_01.cs) |  14 |    0.55 kb |
@@ -47,10 +47,10 @@
 | [2016-08](src/AdventOfCode/2016/Day_08.cs) |  30 |    1.66 kb |
 | [2016-09](src/AdventOfCode/2016/Day_09.cs) |  18 |    0.51 kb |
 | [2016-12](src/AdventOfCode/2016/Day_12.cs) |  38 |    1.24 kb |
-| [2016-13](src/AdventOfCode/2016/Day_13.cs) |  13 |    0.81 kb |
+| [2016-13](src/AdventOfCode/2016/Day_13.cs) |  13 |    0.79 kb |
 | [2016-15](src/AdventOfCode/2016/Day_15.cs) |   8 |    0.31 kb |
 | [2016-16](src/AdventOfCode/2016/Day_16.cs) |  12 |    0.46 kb |
-| [2016-17](src/AdventOfCode/2016/Day_17.cs) |  18 |    1.12 kb |
+| [2016-17](src/AdventOfCode/2016/Day_17.cs) |  18 |    1.11 kb |
 | [2016-18](src/AdventOfCode/2016/Day_18.cs) |  10 |    0.39 kb |
 | [2016-20](src/AdventOfCode/2016/Day_20.cs) |   5 |    0.30 kb |
 | [2017-01](src/AdventOfCode/2017/Day_01.cs) |   6 |    0.33 kb |
@@ -97,11 +97,11 @@
 | [2019-07](src/AdventOfCode/2019/Day_07.cs) |  31 |    0.97 kb |
 | [2019-08](src/AdventOfCode/2019/Day_08.cs) |  37 |    1.24 kb |
 | [2019-09](src/AdventOfCode/2019/Day_09.cs) |   2 |    0.18 kb |
-| [2019-10](src/AdventOfCode/2019/Day_10.cs) | 140 |    2.95 kb |
+| [2019-10](src/AdventOfCode/2019/Day_10.cs) | 140 |    2.94 kb |
 | [2019-11](src/AdventOfCode/2019/Day_11.cs) |  17 |    0.81 kb |
 | [2019-12](src/AdventOfCode/2019/Day_12.cs) |  68 |    2.27 kb |
-| [2019-13](src/AdventOfCode/2019/Day_13.cs) |  28 |    1.12 kb |
-| [2019-15](src/AdventOfCode/2019/Day_15.cs) |  56 |    2.45 kb |
+| [2019-13](src/AdventOfCode/2019/Day_13.cs) |  28 |    1.11 kb |
+| [2019-15](src/AdventOfCode/2019/Day_15.cs) |  56 |    2.44 kb |
 | [2020-01](src/AdventOfCode/2020/Day_01.cs) |  10 |    0.43 kb |
 | [2020-02](src/AdventOfCode/2020/Day_02.cs) |  17 |    0.73 kb |
 | [2020-03](src/AdventOfCode/2020/Day_03.cs) |  25 |    0.97 kb |
@@ -113,7 +113,7 @@
 | [2020-09](src/AdventOfCode/2020/Day_09.cs) |  33 |    0.78 kb |
 | [2020-10](src/AdventOfCode/2020/Day_10.cs) |  19 |    0.53 kb |
 | [2020-11](src/AdventOfCode/2020/Day_11.cs) |  47 |    1.94 kb |
-| [2020-12](src/AdventOfCode/2020/Day_12.cs) |  36 |    1.33 kb |
+| [2020-12](src/AdventOfCode/2020/Day_12.cs) |  36 |    1.32 kb |
 | [2020-13](src/AdventOfCode/2020/Day_13.cs) |  23 |    0.87 kb |
 | [2020-14](src/AdventOfCode/2020/Day_14.cs) |  38 |    1.60 kb |
 | [2020-15](src/AdventOfCode/2020/Day_15.cs) |  17 |    0.53 kb |
@@ -143,11 +143,11 @@
 | [2021-14](src/AdventOfCode/2021/Day_14.cs) |  18 |    0.97 kb |
 | [2021-15](src/AdventOfCode/2021/Day_15.cs) |  27 |    1.21 kb |
 | [2021-16](src/AdventOfCode/2021/Day_16.cs) |  41 |    1.97 kb |
-| [2021-17](src/AdventOfCode/2021/Day_17.cs) |  18 |    0.72 kb |
+| [2021-17](src/AdventOfCode/2021/Day_17.cs) |  18 |    0.70 kb |
 | [2021-18](src/AdventOfCode/2021/Day_18.cs) |  84 |    2.99 kb |
 | [2021-19](src/AdventOfCode/2021/Day_19.cs) |  45 |    2.16 kb |
 | [2021-20](src/AdventOfCode/2021/Day_20.cs) |  31 |    1.44 kb |
-| [2021-21](src/AdventOfCode/2021/Day_21.cs) |  44 |    1.76 kb |
+| [2021-21](src/AdventOfCode/2021/Day_21.cs) |  44 |    1.73 kb |
 | [2021-22](src/AdventOfCode/2021/Day_22.cs) |  42 |    1.94 kb |
 | [2021-24](src/AdventOfCode/2021/Day_24.cs) |  66 |    3.33 kb |
 | [2021-25](src/AdventOfCode/2021/Day_25.cs) |  26 |    0.94 kb |
@@ -165,14 +165,14 @@
 | [2022-12](src/AdventOfCode/2022/Day_12.cs) |  29 |    0.94 kb |
 | [2022-13](src/AdventOfCode/2022/Day_13.cs) |  31 |    1.49 kb |
 | [2022-14](src/AdventOfCode/2022/Day_14.cs) |  27 |    1.14 kb |
-| [2022-15](src/AdventOfCode/2022/Day_15.cs) |  18 |    0.78 kb |
+| [2022-15](src/AdventOfCode/2022/Day_15.cs) |  18 |    0.77 kb |
 | [2022-16](src/AdventOfCode/2022/Day_16.cs) |  58 |    3.20 kb |
 | [2022-17](src/AdventOfCode/2022/Day_17.cs) |  62 |    2.97 kb |
 | [2022-18](src/AdventOfCode/2022/Day_18.cs) |  13 |    1.01 kb |
 | [2022-19](src/AdventOfCode/2022/Day_19.cs) |  36 |    2.39 kb |
 | [2022-20](src/AdventOfCode/2022/Day_20.cs) |   7 |    0.44 kb |
 | [2022-21](src/AdventOfCode/2022/Day_21.cs) |  11 |    0.51 kb |
-| [2022-22](src/AdventOfCode/2022/Day_22.cs) |  51 |    2.37 kb |
+| [2022-22](src/AdventOfCode/2022/Day_22.cs) |  51 |    2.36 kb |
 | [2022-23](src/AdventOfCode/2022/Day_23.cs) |  28 |    1.21 kb |
 | [2022-24](src/AdventOfCode/2022/Day_24.cs) |  50 |    1.71 kb |
 | [2022-25](src/AdventOfCode/2022/Day_25.cs) |  13 |    0.37 kb |
diff --git a/src/AdventOfCode/2015/Day_18.cs b/src/AdventOfCode/2015/Day_18.cs
@@ -15,11 +15,11 @@ public int part_one(CharPixels chars)
     public int part_two(CharPixels chars)
     {
         var simulation = new GameOfLife(chars.Grid(ch => ch == '#'));
-        simulation.AddRange([Point.O, new Point(0, 99), new Point(99, 0), new Point(99, 99)]);
+        simulation.AddRange([(0, 0), (0, 99), (99, 0), (99, 99)]);
         for (var step = 1; step <= 100; step++)
         {
             simulation.NextGeneration();
-            simulation.AddRange([Point.O, new Point(0, 99), new Point(99, 0), new Point(99, 99)]);
+            simulation.AddRange([(0, 0), (0, 99), (99, 0), (99, 99)]);
         }
         return simulation.Count;
     }
diff --git a/src/AdventOfCode/2016/Day_13.cs b/src/AdventOfCode/2016/Day_13.cs
@@ -4,15 +4,15 @@ namespace Advent_of_Code_2016;
 public class Day_13
 {
     [Puzzle(answer: 82, 1362, O.μs10)]
-    public int part_one(int number) => Navigate(number, int.MaxValue, p => p == new Point(31, 39));
+    public int part_one(int number) => Navigate(number, int.MaxValue, p => p == (31, 39));
 
     [Puzzle(answer: 138, 1362, O.μs10)]
     public int part_two(int number) => Navigate(number, 50, p => false);
 
     static int Navigate(int number, int turns, Predicate<Point> exit)
     {
         var turn = 0; var map = new HashSet<Point>();
-        var q = new Queue<Point>().EnqueueRange(new Point(1, 1));
+        var q = new Queue<Point>().EnqueueRange((1, 1));
 
         while (turn++ < turns)
         {
diff --git a/src/AdventOfCode/2016/Day_17.cs b/src/AdventOfCode/2016/Day_17.cs
@@ -21,7 +21,7 @@ static string Navigate(string str, Func<State, int> prio)
 
         while (q.TryDequeue(out var curr, out _))
         {
-            if (curr.Point == new Point(3, 3)) return curr.Path[str.Length..];
+            if (curr.Point == (3, 3)) return curr.Path[str.Length..];
             foreach (var next in States(curr).Where(s => map.OnGrid(s.Point))) q.Enqueue(next, prio(next));
         }
         throw new NoAnswer();
diff --git a/src/AdventOfCode/2019/Day_10.cs b/src/AdventOfCode/2019/Day_10.cs
@@ -172,7 +172,7 @@ public static List<Point> Parse(string str)
                 switch (ch)
                 {
                     case '#':
-                        astroids.Add(new Point(x++, y));
+                        astroids.Add((x++, y));
                         break;
                     case '.':
                         x++;
diff --git a/src/AdventOfCode/2019/Day_13.cs b/src/AdventOfCode/2019/Day_13.cs
@@ -37,7 +37,7 @@ public Arcade Update(IReadOnlyList<Int> output)
             var index = 0;
             while (index < output.Count)
             {
-                var loc = new Point((int)output[index++], (int)output[index++]);
+                Point loc = ((int)output[index++], (int)output[index++]);
                 var val = (int)output[index++];
                 if (OnGrid(loc)) this[loc] = (Tile)val;
                 else Score = val;
diff --git a/src/AdventOfCode/2019/Day_15.cs b/src/AdventOfCode/2019/Day_15.cs
@@ -12,8 +12,8 @@ public class Day_15
     class Space : Dictionary<Point, Tile>
     {
         public Space() => Add(default, Tile.Empty);
-        public int O2Distance => Navigate(Point.O, [O2]).Distance;
-        public int O2Spreading => Navigate(new Point(short.MaxValue, short.MaxValue), [O2]).Distance;
+        public int O2Distance => Navigate((0, 0), [O2]).Distance;
+        public int O2Spreading => Navigate((short.MaxValue, short.MaxValue), [O2]).Distance;
         Point O2 => this.Single(t => t.Value == Tile.Oxygen).Key;
         IEnumerable<Point> Empties => this.Where(kvp => kvp.Value != Tile.Wall).Select(kvp => kvp.Key);
         IEnumerable<Point> Unknowns => Empties.SelectMany(Neighbors).Where(tile => !ContainsKey(tile));
diff --git a/src/AdventOfCode/2020/Day_12.cs b/src/AdventOfCode/2020/Day_12.cs
@@ -23,8 +23,8 @@ public int part_one(Lines lines)
     [Puzzle(answer: 58606, O.μs10)]
     public int part_two(Lines lines)
     {
-        var ferry = Point.O;
-        var waypoint = new Point(+10, -1);
+        Point ferry = (0, 0);
+        Point waypoint = (+10, -1);
 
         foreach (var i in lines.As(Instruction.Parse))
         {
diff --git a/src/AdventOfCode/2021/Day_15.cs b/src/AdventOfCode/2021/Day_15.cs
@@ -17,7 +17,7 @@ static int Run(Grid<int> costs)
         var distances = new Grid<int>(costs.Cols, costs.Rows);
         distances.Set(short.MaxValue, distances.Positions());
         distances[Point.O] = 0;
-        var target = new Point(costs.Cols - 1, costs.Rows - 1);
+        Point target = (costs.Cols - 1, costs.Rows - 1);
         var tiles = new Queue<Point>();
         tiles.Enqueue(Point.O);
 
diff --git a/src/AdventOfCode/2021/Day_17.cs b/src/AdventOfCode/2021/Day_17.cs
@@ -18,7 +18,7 @@ public int part_two(string str)
         var area = Area.Parse(str);
         var x_lo = (((8 * area.X_lo + 1).Sqrt() - 1) / 2).Ceil();
         return Points
-            .Range(new Point(x_lo, area.Y_lo), new Point(area.X_hi, -area.Y_lo))
+            .Range((x_lo, area.Y_lo), (area.X_hi, -area.Y_lo))
             .Count(v => Hits(v.Vector(), area));
     }
 
diff --git a/src/AdventOfCode/2021/Day_21.cs b/src/AdventOfCode/2021/Day_21.cs
@@ -74,10 +74,10 @@ public long part_two(Ints numbers)
         return wins.Max();
     }
 
-    static Point Score(Point points, int player, int add) => player == 0 ? new(points.X + add, points.Y) : new Point(points.X, points.Y + add);
+    static Point Score(Point points, int player, int add) => player == 0 ? (points.X + add, points.Y) : (points.X, points.Y + add);
 
     static readonly int[] Modulo10 = [.. Range(0, 110).Select(n => ((n - 1) % 10) + 1)];
     static readonly int[] Modulo100 = [.. Range(0, 200).Select(n => ((n - 1) % 100) + 1)];
     static readonly int[] Weight = [0, 0, 0, 1, 3, 6, 7, 6, 3, 1];
-    static readonly Point[] Setups = [.. Points.Range(new Point(1, 1), new Point(10, 10))];
+    static readonly Point[] Setups = [.. Points.Range((1, 1), (10, 10))];
 }
diff --git a/src/AdventOfCode/2022/Day_15.cs b/src/AdventOfCode/2022/Day_15.cs
@@ -34,8 +34,8 @@ public Int32Range Range(int y)
         public static Instruction Parse(string line)
         {
             int[] ns = [..line.Int32s()];
-            var s = new Point(ns[0], ns[1]);
-            var b = new Point(ns[2], ns[3]);
+            Point s = (ns[0], ns[1]);
+            Point b = (ns[2], ns[3]);
             return new(s, b, s.ManhattanDistance(b));
         }
     }
diff --git a/src/AdventOfCode/2022/Day_22.cs b/src/AdventOfCode/2022/Day_22.cs
@@ -40,7 +40,7 @@ static Cursor Donut(CharGrid map, Cursor cursor)
 
     static Cursor Cube(CharGrid map, Cursor cursor)
     {
-        var face = new Point(cursor.Pos.X / RibbonSize, cursor.Pos.Y / RibbonSize);
+        Point face = (cursor.Pos.X / RibbonSize, cursor.Pos.Y / RibbonSize);
         var ribbon = new Ribbon(face, cursor.Dir.CompassPoint());
 
         var pos = ribbon.Direction == CompassPoint.N || ribbon.Direction == CompassPoint.S
diff --git a/src/AdventOfCode/SmartAss/ConsoleLogger.cs b/src/AdventOfCode/SmartAss/ConsoleLogger.cs
@@ -49,8 +49,8 @@ public static Grid<int> Console(this Grid<int> grid, int width = 1)
 
     public static HashSet<Point> Console(this HashSet<Point> grid, string chars = "#.")
     {
-        var min = new Point(int.MaxValue, int.MaxValue);
-        var max = new Point(int.MinValue, int.MinValue);
+        Point min = (int.MaxValue, int.MaxValue);
+        Point max = (int.MinValue, int.MinValue);
 
         foreach (var point in grid)
         {

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@ public int part_one(CharPixels chars)`
`15`	`15`	`public int part_two(CharPixels chars)`
`16`	`16`	`{`
`17`	`17`	`var simulation = new GameOfLife(chars.Grid(ch => ch == '#'));`
`18`		`- simulation.AddRange([Point.O, new Point(0, 99), new Point(99, 0), new Point(99, 99)]);`
	`18`	`+ simulation.AddRange([(0, 0), (0, 99), (99, 0), (99, 99)]);`
`19`	`19`	`for (var step = 1; step <= 100; step++)`
`20`	`20`	`{`
`21`	`21`	`simulation.NextGeneration();`
`22`		`- simulation.AddRange([Point.O, new Point(0, 99), new Point(99, 0), new Point(99, 99)]);`
	`22`	`+ simulation.AddRange([(0, 0), (0, 99), (99, 0), (99, 99)]);`
`23`	`23`	`}`
`24`	`24`	`return simulation.Count;`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,15 @@ namespace Advent_of_Code_2016;`
`4`	`4`	`public class Day_13`
`5`	`5`	`{`
`6`	`6`	`[Puzzle(answer: 82, 1362, O.μs10)]`
`7`		`- public int part_one(int number) => Navigate(number, int.MaxValue, p => p == new Point(31, 39));`
	`7`	`+ public int part_one(int number) => Navigate(number, int.MaxValue, p => p == (31, 39));`
`8`	`8`
`9`	`9`	`[Puzzle(answer: 138, 1362, O.μs10)]`
`10`	`10`	`public int part_two(int number) => Navigate(number, 50, p => false);`
`11`	`11`
`12`	`12`	`static int Navigate(int number, int turns, Predicate<Point> exit)`
`13`	`13`	`{`
`14`	`14`	`var turn = 0; var map = new HashSet<Point>();`
`15`		`- var q = new Queue<Point>().EnqueueRange(new Point(1, 1));`
	`15`	`+ var q = new Queue<Point>().EnqueueRange((1, 1));`
`16`	`16`
`17`	`17`	`while (turn++ < turns)`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ static string Navigate(string str, Func<State, int> prio)`
`21`	`21`
`22`	`22`	`while (q.TryDequeue(out var curr, out _))`
`23`	`23`	`{`
`24`		`- if (curr.Point == new Point(3, 3)) return curr.Path[str.Length..];`
	`24`	`+ if (curr.Point == (3, 3)) return curr.Path[str.Length..];`
`25`	`25`	`foreach (var next in States(curr).Where(s => map.OnGrid(s.Point))) q.Enqueue(next, prio(next));`
`26`	`26`	`}`
`27`	`27`	`throw new NoAnswer();`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public static List<Point> Parse(string str)`
`172`	`172`	`switch (ch)`
`173`	`173`	`{`
`174`	`174`	`case '#':`
`175`		`- astroids.Add(new Point(x++, y));`
	`175`	`+ astroids.Add((x++, y));`
`176`	`176`	`break;`
`177`	`177`	`case '.':`
`178`	`178`	`x++;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public Arcade Update(IReadOnlyList<Int> output)`
`37`	`37`	`var index = 0;`
`38`	`38`	`while (index < output.Count)`
`39`	`39`	`{`
`40`		`- var loc = new Point((int)output[index++], (int)output[index++]);`
	`40`	`+ Point loc = ((int)output[index++], (int)output[index++]);`
`41`	`41`	`var val = (int)output[index++];`
`42`	`42`	`if (OnGrid(loc)) this[loc] = (Tile)val;`
`43`	`43`	`else Score = val;`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ public int part_one(Lines lines)`
`23`	`23`	`[Puzzle(answer: 58606, O.μs10)]`
`24`	`24`	`public int part_two(Lines lines)`
`25`	`25`	`{`
`26`		`- var ferry = Point.O;`
`27`		`- var waypoint = new Point(+10, -1);`
	`26`	`+ Point ferry = (0, 0);`
	`27`	`+ Point waypoint = (+10, -1);`
`28`	`28`
`29`	`29`	`foreach (var i in lines.As(Instruction.Parse))`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public int part_two(string str)`
`18`	`18`	`var area = Area.Parse(str);`
`19`	`19`	`var x_lo = (((8 * area.X_lo + 1).Sqrt() - 1) / 2).Ceil();`
`20`	`20`	`return Points`
`21`		`- .Range(new Point(x_lo, area.Y_lo), new Point(area.X_hi, -area.Y_lo))`
	`21`	`+ .Range((x_lo, area.Y_lo), (area.X_hi, -area.Y_lo))`
`22`	`22`	`.Count(v => Hits(v.Vector(), area));`
`23`	`23`	`}`
`24`	`24`