From d02d8190f08608ae99ecde1525d5792d9885cf85 Mon Sep 17 00:00:00 2001
From: Ruediger Ludwig <github@savinien.de>
Date: Mon, 16 Jan 2023 20:29:59 +0100
Subject: [PATCH] day15 a bit simpler

---
 advent/days/day15/data/example01.txt |  2 +-
 advent/days/day15/data/input.txt     |  2 +-
 advent/days/day15/solution.py        | 19 ++++++++-----------
 advent/days/day15/test_solution.py   |  2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/advent/days/day15/data/example01.txt b/advent/days/day15/data/example01.txt
index 19d5711..6d6c325 100644
--- a/advent/days/day15/data/example01.txt
+++ b/advent/days/day15/data/example01.txt
@@ -1,4 +1,4 @@
-10/20
+10
 Sensor at x=2, y=18: closest beacon is at x=-2, y=15
 Sensor at x=9, y=16: closest beacon is at x=10, y=16
 Sensor at x=13, y=2: closest beacon is at x=15, y=3
diff --git a/advent/days/day15/data/input.txt b/advent/days/day15/data/input.txt
index 3ee5618..e388c19 100644
--- a/advent/days/day15/data/input.txt
+++ b/advent/days/day15/data/input.txt
@@ -1,4 +1,4 @@
-2000000/4000000
+2000000
 Sensor at x=3859432, y=2304903: closest beacon is at x=3677247, y=3140958
 Sensor at x=2488890, y=2695345: closest beacon is at x=1934788, y=2667279
 Sensor at x=3901948, y=701878: closest beacon is at x=4095477, y=368031
diff --git a/advent/days/day15/solution.py b/advent/days/day15/solution.py
index 3f906ab..ff14f82 100644
--- a/advent/days/day15/solution.py
+++ b/advent/days/day15/solution.py
@@ -4,21 +4,21 @@ from itertools import combinations
 
 from typing import Iterator, Self
 
-from advent.common.position import ORIGIN, Position
+from advent.common.position import Position
 
 day_num = 15
 
 
 def part1(lines: Iterator[str]) -> int:
-    row, _ = next(lines).split('/')
+    row = int(next(lines))
     sensor_map = SensorMap.parse(lines)
-    return sensor_map.count_impossible(int(row))
+    return sensor_map.count_impossible(row)
 
 
 def part2(lines: Iterator[str]) -> int:
-    _, max_range = next(lines).split('/')
+    next(lines)
     sensor_map = SensorMap.parse(lines)
-    return sensor_map.get_possible_frequency(int(max_range))
+    return sensor_map.get_possible_frequency()
 
 
 ColRange = tuple[int, int]
@@ -173,8 +173,7 @@ class SensorMap:
                                             Position(sensor2.position.x - sensor2.distance - 1,
                                                      sensor2.position.y))
 
-    def get_possible_frequency(self, max_range: int) -> int:
-        max_point = Position.splat(max_range)
+    def get_possible_frequency(self) -> int:
         midlines: list[ManhattenLine] = []
         for sensor1, sensor2 in combinations(self.sensors, 2):
             midline = SensorMap.get_midline(sensor1, sensor2)
@@ -182,9 +181,7 @@ class SensorMap:
                 midlines.append(midline)
         for line1, line2 in combinations(midlines, 2):
             point = line1.crosspoint(line2)
-            if point is not None:
-                if (point.is_within(ORIGIN, max_point)
-                        and all(not sensor.is_within(point) for sensor in self.sensors)):
-                    return SensorMap.tuning_frequency(point)
+            if point is not None and all(not sensor.is_within(point) for sensor in self.sensors):
+                return SensorMap.tuning_frequency(point)
 
         raise Exception("No point found")
diff --git a/advent/days/day15/test_solution.py b/advent/days/day15/test_solution.py
index 33d0ea5..6240541 100644
--- a/advent/days/day15/test_solution.py
+++ b/advent/days/day15/test_solution.py
@@ -46,5 +46,5 @@ def test_possible():
     next(lines)
     sensor_map = SensorMap.parse(lines)
     expected = 56000011
-    result = sensor_map.get_possible_frequency(20)
+    result = sensor_map.get_possible_frequency()
     assert result == expected