feiko/aoc25
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor Diagram structure to use mdspan for grid representation and update related functions

Browse source
This commit is contained in:
Feiko Wielsma 2025-12-04 15:47:55 +00:00
parent 0b2afd5993
commit c3a8206e55
1 changed files with 42 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

87
day4/main.cpp
View file

@ -20,14 +20,16 @@ struct Diagram {
size_t width; size_t width;
size_t height; size_t height;
auto mdspan() { return std::mdspan(data.data(), height, width); } using GridView = std::mdspan<int, std::dextents<size_t, 2>>;
auto grid() { return GridView(data.data(), height, width); }
}; };
auto printMap(Diagram &diagram) { auto printMap(Diagram &diagram) {
auto mdspan = diagram.mdspan(); auto grid = diagram.grid();
for (auto row = 0UZ; row != mdspan.extent(0); row++) { for (auto row = 0UZ; row != grid.extent(0); row++) {
for (auto col = 0UZ; col != mdspan.extent(1); col++) { for (auto col = 0UZ; col != grid.extent(1); col++) {
std::print("{}", mdspan[row, col]); std::print("{}", grid[row, col]);
} }
std::println(); std::println();
} }
@ -68,23 +70,23 @@ auto parseMap(const std::string &filename) -> std::expected<Diagram, std::string
auto countMovablePaper(Diagram &diagram) -> long { auto countMovablePaper(Diagram &diagram) -> long {
long nMovablePaper{}; long nMovablePaper{};
auto mdspan = diagram.mdspan(); auto grid = diagram.grid();
for (auto row = 1UZ; row != mdspan.extent(0) - 1; row++) { for (auto row = 1UZ; row != grid.extent(0) - 1; row++) {
for (auto col = 1UZ; col != mdspan.extent(1) - 1; col++) { for (auto col = 1UZ; col != grid.extent(1) - 1; col++) {
if (mdspan[row, col] == 1) { if (grid[row, col] == 1) {
// std::print("checking [{},{}]:", row, col); // std::print("checking [{},{}]:", row, col);
// shitty kernel // shitty kernel
int upLeft = mdspan[row - 1, col - 1]; int upLeft = grid[row - 1, col - 1];
int up = mdspan[row - 1, col]; int up = grid[row - 1, col];
int upRight = mdspan[row - 1, col + 1]; int upRight = grid[row - 1, col + 1];
int left = mdspan[row, col - 1]; int left = grid[row, col - 1];
int right = mdspan[row, col + 1]; int right = grid[row, col + 1];
int downLeft = mdspan[row + 1, col - 1]; int downLeft = grid[row + 1, col - 1];
int down = mdspan[row + 1, col]; int down = grid[row + 1, col];
int downRight = mdspan[row + 1, col + 1]; int downRight = grid[row + 1, col + 1];
// caveman shit // caveman shit
if ((upLeft + up + upRight + left + right + downLeft + down + downRight) < 4) { if ((upLeft + up + upRight + left + right + downLeft + down + downRight) < 4) {
@ -102,40 +104,35 @@ auto countMovablePaper(Diagram &diagram) -> long {
auto moveMoveablePaper(Diagram &diagram) -> long { auto moveMoveablePaper(Diagram &diagram) -> long {
long totalPaperRemoved{}; long totalPaperRemoved{};
auto mdspan = diagram.mdspan(); auto grid = diagram.grid();
constexpr std::array<std::pair<int, int>, 8> offsets = {
{{-1, -1}, {-1, 0}, {-1, 1}, {0, -1}, {0, 1}, {1, -1}, {1, 0}, {1, 1}}};
while (true) { while (true) {
long currentPaperRemoved = 0; long currentPaperRemoved = 0;
for (auto row = 1UZ; row != mdspan.extent(0) - 1; row++) { for (auto row = 1UZ; row != grid.extent(0) - 1; row++) {
for (auto col = 1UZ; col != mdspan.extent(1) - 1; col++) { for (auto col = 1UZ; col != grid.extent(1) - 1; col++) {
if (grid[row, col] != 1) {
if (mdspan[row, col] == 1) { continue;
// std::print("checking [{},{}]:", row, col); }
// std::print("checking [{},{}]:", row, col);
// shitty kernal
int neighbors{}; // shitty kernal
neighbors += mdspan[row - 1, col - 1]; int neighbors{0};
neighbors += mdspan[row - 1, col]; for (auto [dr, dc] : offsets) {
neighbors += mdspan[row - 1, col + 1]; // mdspan allows [x, y] indexing natively
neighbors += grid[row + dr, col + dc];
neighbors += mdspan[row, col - 1]; }
neighbors += mdspan[row, col + 1];
if (neighbors < 4) {
neighbors += mdspan[row + 1, col - 1]; grid[row, col] = 0;
neighbors += mdspan[row + 1, col]; // std::println("Found");
neighbors += mdspan[row + 1, col + 1]; currentPaperRemoved++;
// caveman shit
if (neighbors < 4) {
mdspan[row, col] = 0;
// std::println("Found");
currentPaperRemoved++;
}
} }
// std::println();
} }
// std::println();
} }
if (currentPaperRemoved == 0) { if (currentPaperRemoved == 0) {
std::println("Didn't remove any more paper this iteration! Stopping."); std::println("Didn't remove any more paper this iteration! Stopping.");
break; break;