2018 day6

3 files changed, 19 insertions, 6 deletions

diff --git a/src/2018/day6/aoc.cpp b/src/2018/day6/aoc.cpp
index df42be0..620be8d 100644
--- a/src/2018/day6/aoc.cpp
+++ b/src/2018/day6/aoc.cpp
@@ -3,7 +3,7 @@
 
 namespace aoc2018 {
 
-int day6(line_view file) {
+std::pair<int, int> day6(line_view file, int sd) {
   std::vector<coordinate> cs;
   int maxx{INT32_MIN};
   int maxy{INT32_MIN};
@@ -18,7 +18,7 @@ int day6(line_view file) {
 
   std::sort(cs.begin(), cs.end());
   space_board b{maxx + 1, maxy + 1};
-  //printf("%d %d\n", b.width, b.height);
+  // printf("%d %d\n", b.width, b.height);
 
   for (size_t i = 0; i < cs.size(); i++) {
     coordinate& c = cs[i];
@@ -68,7 +68,7 @@ int day6(line_view file) {
       max = x;
     }
   }
-  return max;
+  return {max, b.safe(sd, cs)};
 }
 
 } // namespace aoc2018
diff --git a/src/2018/day6/aoc.h b/src/2018/day6/aoc.h
index 2f83842..f79702c 100644
--- a/src/2018/day6/aoc.h
+++ b/src/2018/day6/aoc.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "common.h"
+#include <algorithm>
 #include <math.h>
 #include <utility>
 #include <vector>
@@ -98,6 +99,17 @@ struct space_board {
     }
   }
 
+  int safe(int d, const std::vector<coordinate>& cs) {
+    int total{0};
+    for (size_t i = 0; i < ps.size(); i++) {
+      coordinate c{int(i % width), int(i / width)};
+      int sum{0};
+      std::for_each(cs.begin(), cs.end(), [&sum, &c](coordinate x) { sum += c.distance(x); });
+      total += int(sum < d);
+    }
+    return total;
+  }
+
   void count(std::vector<int>& area) const noexcept {
     for (int y = 0; y < height; y++) {
       for (int x = 0; x < width; x++) {
@@ -116,6 +128,6 @@ struct space_board {
   }
 };
 
-int day6(line_view);
+std::pair<int, int> day6(line_view, int);
 
 } // namespace aoc2018
diff --git a/test/test_2018.cpp b/test/test_2018.cpp
index 6af2350..4747706 100644
--- a/test/test_2018.cpp
+++ b/test/test_2018.cpp
@@ -48,6 +48,7 @@ TEST_CASE("Alchemical Reduction", "[2018]") {
 
 TEST_CASE("Chronal Coordinates", "[2018]") {
   line_view lv = load_file("../src/2018/day6/input");
-  auto p = aoc2018::day6(lv);
-  REQUIRE(3260 == p);
+  auto p = aoc2018::day6(lv, 10000);
+  REQUIRE(3260 == p.first);
+  REQUIRE(42535 == p.second);
 }