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

Petits tweaks

Browse Source
This commit is contained in:
Timothée Leclaire-Fournier 2024-01-29 18:10:53 -05:00
parent 69461a3f6f
commit a4764cd225
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GPA675Lab1GOL/GOLTeamH.cpp
View File

@ -326,7 +326,6 @@ void GOLTeamH::randomize(double percentAlive)
//! \return true si le patron est valide, false sinon. //! \return true si le patron est valide, false sinon.
//! //!
// TODO
bool GOLTeamH::setFromPattern(std::string const& pattern, int centerX, int centerY) bool GOLTeamH::setFromPattern(std::string const& pattern, int centerX, int centerY)
{ {
auto sq = parsePattern(pattern); auto sq = parsePattern(pattern);
@ -556,6 +555,8 @@ std::optional<GOLTeamH::sizeQueried> GOLTeamH::parsePattern(std::string const& p
{ {
// Analyse du pattern // Analyse du pattern
size_t pos{}, processedNumbers{}; size_t pos{}, processedNumbers{};
if (pattern.size() < 6)
return std::nullopt;
// Vérification du '[' initial // Vérification du '[' initial
if (pattern[pos++] != '[') { if (pattern[pos++] != '[') {

10
GPA675Lab1GOL/GridTeamH.cpp
View File

@ -59,11 +59,11 @@ GridTeamH& GridTeamH::operator=(GridTeamH&& mv) noexcept
if (this != &mv) { if (this != &mv) {
dealloc(); dealloc();
mAliveCount = std::move(mv.mAliveCount); mAliveCount = mv.mAliveCount;
mWidth = std::move(mv.mWidth); mWidth = mv.mWidth;
mHeight = std::move(mv.mHeight); mHeight = mv.mHeight;
mData = std::move(mv.mData); mData = mv.mData;
mIntermediateData = std::move(mv.mIntermediateData); mIntermediateData = mv.mIntermediateData;
// Il faut que le destructeur de l'ancien objet soit valide. // Il faut que le destructeur de l'ancien objet soit valide.
mv.mData = nullptr; mv.mData = nullptr;