diff --git a/GOLAppLib/lib/x64/Debug/GOLAppLib.lib b/GOLAppLib/lib/x64/Debug/GOLAppLib.lib new file mode 100644 index 0000000..c89ee75 Binary files /dev/null and b/GOLAppLib/lib/x64/Debug/GOLAppLib.lib differ diff --git a/GOLAppLib/lib/x64/Debug/GOLAppLib.pdb b/GOLAppLib/lib/x64/Debug/GOLAppLib.pdb new file mode 100644 index 0000000..529e667 Binary files /dev/null and b/GOLAppLib/lib/x64/Debug/GOLAppLib.pdb differ diff --git a/GOLAppLib/lib/x64/Debug/GOLEngine.idb b/GOLAppLib/lib/x64/Debug/GOLEngine.idb new file mode 100644 index 0000000..0cbe801 Binary files /dev/null and b/GOLAppLib/lib/x64/Debug/GOLEngine.idb differ diff --git a/GOLAppLib/lib/x64/Debug/GOLEngine.lib b/GOLAppLib/lib/x64/Debug/GOLEngine.lib new file mode 100644 index 0000000..e955159 Binary files /dev/null and b/GOLAppLib/lib/x64/Debug/GOLEngine.lib differ diff --git a/GOLAppLib/lib/x64/Debug/GOLEngine.pdb b/GOLAppLib/lib/x64/Debug/GOLEngine.pdb new file mode 100644 index 0000000..451e5ce Binary files /dev/null and b/GOLAppLib/lib/x64/Debug/GOLEngine.pdb differ diff --git a/GOLAppLib/lib/x64/Release/GOLAppLib.lib b/GOLAppLib/lib/x64/Release/GOLAppLib.lib new file mode 100644 index 0000000..28d0ee9 Binary files /dev/null and b/GOLAppLib/lib/x64/Release/GOLAppLib.lib differ diff --git a/GOLAppLib/lib/x64/Release/GOLEngine.lib b/GOLAppLib/lib/x64/Release/GOLEngine.lib new file mode 100644 index 0000000..398c452 Binary files /dev/null and b/GOLAppLib/lib/x64/Release/GOLEngine.lib differ diff --git a/GOLAppLib/lib/x64/Release/GOLEngine.pdb b/GOLAppLib/lib/x64/Release/GOLEngine.pdb new file mode 100644 index 0000000..c875605 Binary files /dev/null and b/GOLAppLib/lib/x64/Release/GOLEngine.pdb differ diff --git a/GPA675Lab1GOL/GOLTeamH.h b/GPA675Lab1GOL/GOLTeamH.h index faff16a..d57ed8c 100644 --- a/GPA675Lab1GOL/GOLTeamH.h +++ b/GPA675Lab1GOL/GOLTeamH.h @@ -12,13 +12,14 @@ constexpr unsigned char MAX_ALPHA = 255; class GOLTeamH : public GOL { public: - size_t width() const override; - size_t height() const override; - size_t size() const override; - State state(int x, int y) const override; - std::string rule() const override; - BorderManagement borderManagement() const override; - Color color(State state) const override; + // inline puisque trivial. + size_t width() const override { return mData.width(); } + size_t height() const override { return mData.height(); } + size_t size() const override { return mData.size(); } + State state(int x, int y) const override { return mData.value(x, y); } + std::string rule() const override { return mRule.value_or(std::move(std::string())); } + BorderManagement borderManagement() const override { return mBorderManagement.value_or(GOL::BorderManagement::immutableAsIs); } + Color color(State state) const override { return state == GOL::State::alive ? mAliveColor : mDeadColor; } Statistics statistics() const override; ImplementationInformation information() const override;