From a108668d6dfee60d2bca85a9a9d977344393f475 Mon Sep 17 00:00:00 2001 From: Victor Le Roch Date: Wed, 20 May 2020 09:49:48 +0200 Subject: [PATCH 1/2] =?UTF-8?q?classe=20tortue=20cr=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/include/Tortue.h | 25 +++++++++++++++++++++++++ app/src/Tortue.cpp | 25 +++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 app/include/Tortue.h create mode 100644 app/src/Tortue.cpp diff --git a/app/include/Tortue.h b/app/include/Tortue.h new file mode 100644 index 0000000..8e533e1 --- /dev/null +++ b/app/include/Tortue.h @@ -0,0 +1,25 @@ +// +// Created by Victor Le Roch on 20/05/2020. +// + +#ifndef BE_TORTUE_H +#define BE_TORTUE_H + +#include + +class Tortue{ +private: + std::string nom; + int naissance; + std::string sexe; +public: + Tortue(const std::string &nom, const std::string &sexe); + + const std::string &getNom() const; + + int getNaissance() const; + + const std::string &getSexe() const; +}; + +#endif //BE_TORTUE_H diff --git a/app/src/Tortue.cpp b/app/src/Tortue.cpp new file mode 100644 index 0000000..9b23e07 --- /dev/null +++ b/app/src/Tortue.cpp @@ -0,0 +1,25 @@ +// +// Created by Victor Le Roch on 20/05/2020. +// + +#include "../include/Tortue.h" +#include "../../core_simulation.h" +//#include + +const std::string &Tortue::getNom() const { + return nom; +} + +int Tortue::getNaissance() const { + return naissance; +} + +const std::string &Tortue::getSexe() const { + return sexe; +} + +Tortue::Tortue(const string &nom, const string &sexe) : nom(nom), sexe(sexe) { + naissance = std::time(nullptr); +} + + From 1bdf07a941e8509710f6ce25356cde1b0b6949e7 Mon Sep 17 00:00:00 2001 From: Victor Le Roch Date: Wed, 20 May 2020 10:00:00 +0200 Subject: [PATCH 2/2] ajout du calcul d'age en annee --- app/include/Tortue.h | 1 + app/src/Tortue.cpp | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/app/include/Tortue.h b/app/include/Tortue.h index 8e533e1..6c9cdb3 100644 --- a/app/include/Tortue.h +++ b/app/include/Tortue.h @@ -18,6 +18,7 @@ public: const std::string &getNom() const; int getNaissance() const; + int getAge() const; const std::string &getSexe() const; }; diff --git a/app/src/Tortue.cpp b/app/src/Tortue.cpp index 9b23e07..b3dd19b 100644 --- a/app/src/Tortue.cpp +++ b/app/src/Tortue.cpp @@ -22,4 +22,12 @@ Tortue::Tortue(const string &nom, const string &sexe) : nom(nom), sexe(sexe) { naissance = std::time(nullptr); } +int Tortue::getAge() const { + int ageSec = std::time(nullptr) - naissance; + int ageHour = ageSec/(60*60); + int ageDay = ageHour/24; + int age = ageDay / 365.25; + return age; +} +