diff --git a/GPA675Lab1GOL/GOLTeamH.cpp b/GPA675Lab1GOL/GOLTeamH.cpp index 73ca7fa..d7b3b34 100644 --- a/GPA675Lab1GOL/GOLTeamH.cpp +++ b/GPA675Lab1GOL/GOLTeamH.cpp @@ -116,7 +116,7 @@ bool GOLTeamH::setRule(std::string const& rule) return false; } -void GOLTeamH::setBorderManagement(BorderManagement borderManagement) +void GOLTeamH::setBorderManagement(GOL::BorderManagement borderManagement) { mBorderManagement = borderManagement; mIteration = 0; diff --git a/GPA675Lab1GOL/GOLTeamH.h b/GPA675Lab1GOL/GOLTeamH.h index 329c745..bc89e4b 100644 --- a/GPA675Lab1GOL/GOLTeamH.h +++ b/GPA675Lab1GOL/GOLTeamH.h @@ -35,7 +35,7 @@ public: private: std::optional mRule; - std::optional mBorderManagement; + std::optional mBorderManagement; std::optional mIteration; Grid mData; diff --git a/GPA675Lab1GOL/GPA675Lab1GOL.vcxproj b/GPA675Lab1GOL/GPA675Lab1GOL.vcxproj index c54509c..a2e6ea8 100644 --- a/GPA675Lab1GOL/GPA675Lab1GOL.vcxproj +++ b/GPA675Lab1GOL/GPA675Lab1GOL.vcxproj @@ -115,6 +115,8 @@ + + diff --git a/GPA675Lab1GOL/GPA675Lab1GOL.vcxproj.filters b/GPA675Lab1GOL/GPA675Lab1GOL.vcxproj.filters index 2e9f4ec..b0bf2be 100644 --- a/GPA675Lab1GOL/GPA675Lab1GOL.vcxproj.filters +++ b/GPA675Lab1GOL/GPA675Lab1GOL.vcxproj.filters @@ -45,5 +45,13 @@ Header Files + + Header Files + + + + + Header Files + \ No newline at end of file diff --git a/GPA675Lab1GOL/Grid.cpp b/GPA675Lab1GOL/Grid.cpp index ef37ec1..782b7a9 100644 --- a/GPA675Lab1GOL/Grid.cpp +++ b/GPA675Lab1GOL/Grid.cpp @@ -7,7 +7,7 @@ Grid::Grid() } Grid::Grid(size_t width, size_t height, CellType initValue) - :mWidth{ width }, mHeight{ height }, mEngine(mRandomDevice), mDistribution(0.0, 1.0) + :mWidth{ width }, mHeight{ height }, mEngine(mRandomDevice()), mDistribution(0.0, 1.0) { resize(width, height, initValue); } diff --git a/GPA675Lab1GOL/Grid.h b/GPA675Lab1GOL/Grid.h index 75d04e5..a31052b 100644 --- a/GPA675Lab1GOL/Grid.h +++ b/GPA675Lab1GOL/Grid.h @@ -3,6 +3,7 @@ #include #include #include + #include "GOL.h" class Grid // Classe facilitant la gestion d'un tableau dynamique 2d. diff --git a/GPA675Laboratoire1.pdf b/GPA675Laboratoire1.pdf new file mode 100644 index 0000000..d8ea10b Binary files /dev/null and b/GPA675Laboratoire1.pdf differ