kvuj/GPA675Lab1GOL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplification

Browse Source
This commit is contained in:
Timothée Leclaire-Fournier 2024-01-22 19:57:29 -05:00
parent 2502529432
commit 4d0b142490
1 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
GPA675Lab1GOL/GridTeamH.cpp
View File

@ -25,6 +25,7 @@ GridTeamH::~GridTeamH()
// Mutateur modifiant la taille de la grille et initialise le contenu par la valeur spécifiée. // Mutateur modifiant la taille de la grille et initialise le contenu par la valeur spécifiée.
void GridTeamH::resize(size_t width, size_t height, CellType initValue) void GridTeamH::resize(size_t width, size_t height, CellType initValue)
{ {
// On exige que si mData soit null, mIntermediateData le soi aussi.
if (mData) if (mData)
dealloc(); dealloc();
@ -124,17 +125,10 @@ float GridTeamH::totalAliveRel() const
void GridTeamH::fill(CellType value, bool fillBorder) void GridTeamH::fill(CellType value, bool fillBorder)
{ {
if (fillBorder) { for (size_t i{ static_cast<size_t>(1) - fillBorder }; i < mWidth - (static_cast<size_t>(1) - fillBorder); i++)
for (size_t i{}; i < mWidth; i++) for (size_t j{ static_cast<size_t>(1) - fillBorder }; j < mHeight - (static_cast<size_t>(1) - fillBorder); ++j)
for (size_t j{}; j < mHeight; ++j)
mData[i + (j * mWidth)] = value; mData[i + (j * mWidth)] = value;
} }
else {
for (size_t i{ 1 }; i < mWidth - 1; i++)
for (size_t j{ 1 }; j < mHeight - 1; ++j)
mData[i + (j * mWidth)] = value;
}
}
// TODO: FIX LES COLONNES EN FAISANT ATTENTION AU BORDER // TODO: FIX LES COLONNES EN FAISANT ATTENTION AU BORDER
// TIMOTHEE: Je m'en occupe. // TIMOTHEE: Je m'en occupe.
@ -142,33 +136,17 @@ void GridTeamH::fillAternately(CellType initValue, bool fillBorder)
{ {
auto otherValue = (initValue == CellType::alive) ? CellType::dead : CellType::alive; auto otherValue = (initValue == CellType::alive) ? CellType::dead : CellType::alive;
if (fillBorder) { for (size_t i{ static_cast<size_t>(1) - fillBorder }; i < mWidth - (static_cast<size_t>(1) - fillBorder); i++)
for (size_t i{}; i < mWidth; i++) for (size_t j{ static_cast<size_t>(1) - fillBorder }; j < mHeight - (static_cast<size_t>(1) - fillBorder); ++j)
for (size_t j{}; j < mHeight; ++j)
mData[i + (j * mWidth)] = !(i % 2) ? initValue : otherValue; mData[i + (j * mWidth)] = !(i % 2) ? initValue : otherValue;
} }
else {
for (size_t i{ 1 }; i < mWidth - 1; i++)
for (size_t j{ 1 }; j < mHeight - 1; ++j)
mData[i + (j * mWidth)] = !(i % 2) ? initValue : otherValue;
}
}
void GridTeamH::randomize(double percentAlive, bool fillBorder) void GridTeamH::randomize(double percentAlive, bool fillBorder)
{ {
if (fillBorder) { for (size_t i{ static_cast<size_t>(1) - fillBorder }; i < mWidth - (static_cast<size_t>(1) - fillBorder); i++)
for (size_t i{}; i < mWidth; i++) for (size_t j{ static_cast<size_t>(1) - fillBorder }; j < mHeight - (static_cast<size_t>(1) - fillBorder); ++j)
for (size_t j{}; j < mHeight; ++j)
mData[i + (j * mWidth)] = static_cast<GridTeamH::CellType>(mDistribution(mEngine) < percentAlive); mData[i + (j * mWidth)] = static_cast<GridTeamH::CellType>(mDistribution(mEngine) < percentAlive);
} }
else {
for (size_t i{ 1 }; i < mWidth - 1; i++) {
for (size_t j{ 1 }; j < mHeight - 1; ++j) {
mData[i + (j * mWidth)] = static_cast<GridTeamH::CellType>(mDistribution(mEngine) < percentAlive);
}
}
}
}
void GridTeamH::fillBorder(CellType value) void GridTeamH::fillBorder(CellType value)
{ {