Sara/clay-template
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat: separated cell state checking into separate function in case another algo is faster than .contains

Browse source
This commit is contained in:
Sara Gerretsen 2025-09-23 14:24:17 +02:00
parent f7e474e1cf
commit 8538c91206
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/simulation.cpp
View file

@ -43,6 +43,10 @@ CellIterator::CellIterator(Cell begin, Cell end)
CellIterator::CellIterator(Cell begin, Cell end, Cell state) CellIterator::CellIterator(Cell begin, Cell end, Cell state)
: state{ state } , begin{ begin }, end{ end } {} : state{ state } , begin{ begin }, end{ end } {}
static inline bool CellIsAlive(Cell const &cell) {
return living.contains(cell);
}
CellIterator &CellIterator::operator++() { CellIterator &CellIterator::operator++() {
++(this->state.x); ++(this->state.x);
if (this->state.x == this->end.x) { if (this->state.x == this->end.x) {
@ -71,7 +75,7 @@ bool CellIterator::at_end() const {
static size_t CountNeighbors(Cell const &cell) { static size_t CountNeighbors(Cell const &cell) {
size_t count{ 0 }; size_t count{ 0 };
for (Cell const &c : CellRange{ {cell.x - 1, cell.y - 1}, { cell.x + 2, cell.y + 2} }) { for (Cell const &c : CellRange{ {cell.x - 1, cell.y - 1}, { cell.x + 2, cell.y + 2} }) {
if (c != cell && living.contains(c)) { if (c != cell && CellIsAlive(c)) {
++count; ++count;
} }
} }
@ -147,7 +151,7 @@ static void FindBorn(std::shared_ptr<ThreadWorkload> wl) {
CellRange range{{ center.x - 1, center.y - 1 }, {center.x + 2, center.y + 2 }}; CellRange range{{ center.x - 1, center.y - 1 }, {center.x + 2, center.y + 2 }};
std::copy_if(range.begin(), range.end(), std::back_inserter(wl->changes), std::copy_if(range.begin(), range.end(), std::back_inserter(wl->changes),
[&](Cell const &c) -> bool { [&](Cell const &c) -> bool {
return !living.contains(c) && CountNeighbors(c) == 3; return !CellIsAlive(c) && CountNeighbors(c) == 3;
}); });
}); });
TaskComplete(); TaskComplete();