diff --git a/pyAmakCore/classes/communicating_agent.py b/pyAmakCore/classes/communicating_agent.py index be6d0f017e1311317746d4b70d0dae89dce28166..0dbbede2b325a6c723127be266980d7224fc0a42 100644 --- a/pyAmakCore/classes/communicating_agent.py +++ b/pyAmakCore/classes/communicating_agent.py @@ -17,10 +17,11 @@ class Mail: Class message """ - def __init__(self, id_sender: int, id_receiver: int, message: Any) -> None: + def __init__(self, id_sender: int, id_receiver: int, message: Any, sending_date: int) -> None: self.__id_sender = id_sender self.__id_receiver = id_receiver self.__message = message + self.__sending_date = sending_date def get_id_sender(self): """ @@ -40,6 +41,12 @@ class Mail: """ return self.__message + def get_sending_date(self): + """ + return sending_date + """ + return self.__sending_date + class Mailbox: """ @@ -72,7 +79,7 @@ class Mailbox: """ this method is called to send a message """ - mail = Mail(self.__owner_id, id_receiver, message) + mail = Mail(self.__owner_id, id_receiver, message, self.__amas.get_cycle()) for agent in self.__amas.get_agents(): if agent.get_id() == id_receiver: @@ -106,12 +113,12 @@ class CommunicatingAgent(Agent): Override of phase 1 agent so he read mail before he perceive this is the first phase of a cycle """ - self._read_mails() + self.read_mails() self.on_perceive() self.compute_criticality() self._next_phase() - def _read_mails(self) -> None: + def read_mails(self) -> None: """ method that open all mail in the mailbox """ diff --git a/pyAmakCore/tests/test_communicating_agent/test_mail.py b/pyAmakCore/tests/test_communicating_agent/test_mail.py index 9f875811be0ec0334166e2a871e3b480a7f1ffae..444505df65d027c74ab77e81a8d50fa82d365a2f 100644 --- a/pyAmakCore/tests/test_communicating_agent/test_mail.py +++ b/pyAmakCore/tests/test_communicating_agent/test_mail.py @@ -15,17 +15,18 @@ class TestMail(TestCase): """ Test mail init """ - mail = Mail(1, 5, None) + mail = Mail(1, 5, None, 0) self.assertEqual(mail.get_id_sender(), 1) self.assertEqual(mail.get_id_receiver(), 5) self.assertEqual(mail.get_message(), None) + self.assertEqual(mail.get_sending_date(), 0) - mail = Mail(255, 0, "test") + mail = Mail(255, 0, "test", 12) self.assertEqual(mail.get_id_sender(), 255) self.assertEqual(mail.get_id_receiver(), 0) self.assertEqual(mail.get_message(), "test") - + self.assertEqual(mail.get_sending_date(), 12) if __name__ == '__main__': main()