Fixed

pyAmakCore/classes/agent.py

@@ -163,25 +163,32 @@ class Agent:
         """
         self.on_perceive()
         self.compute_criticality()
-        self.__phase = Phase.PERCEPTION_DONE
+        self.__next_phase()
 
     def __phase2(self) -> None:
         """
         this is the second phase of a cycle
         """
-        self.__phase = Phase.DECISION_AND_ACTION
         self.on_decide()
         self.on_act()
         self.compute_criticality()
-        self.__phase = Phase.DECISION_AND_ACTION_DONE
+        self.__next_phase()
+
+    def __next_phase(self):
+        next_phase = {
+            Phase.INITIALIZING: Phase.PERCEPTION,
+            Phase.PERCEPTION: Phase.PERCEPTION_DONE,
+            Phase.PERCEPTION_DONE: Phase.DECISION_AND_ACTION,
+            Phase.DECISION_AND_ACTION: Phase.DECISION_AND_ACTION_DONE,
+            Phase.DECISION_AND_ACTION_DONE: Phase.PERCEPTION
+        }
+        self.__phase = next_phase.get(self.__phase)
 
     def run(self) -> None:
         """
         Full cycle of an agent
         """
-        # TODO : next phase DECISION_AND_ACTION_DONE -> PERCEPTION
-        if self.__phase == Phase.INITIALIZING:
-            self.__phase = Phase.PERCEPTION
+        self.__next_phase()
 
         execution_policy = self.__amas.get_execution_policy()
 
@@ -199,6 +206,7 @@ class Agent:
         if execution_policy == ExecutionPolicy.ONE_PHASE:
             self.on_cycle_begin()
             self.__phase1()
+            self.__next_phase()
             self.__phase2()
             self.on_cycle_end()
 

pyAmakCore/classes/amas.py

@@ -85,6 +85,12 @@ class Amas(Schedulable):
         """
         return self.__execution_policy
 
+    def set_execution_policy(self, execution_policy: ExecutionPolicy) -> None:
+        """
+        set system execution_policy
+        """
+        self.__execution_policy = execution_policy
+
     def get_cycle(self) -> int:
         """
         return nbr of cycle

pyAmakCore/tests/test_agent/test_run.py

+"""
+test that run of Agent work as intended
+"""
+from unittest import TestCase, main
+
+from pyAmakCore.classes.agent import Agent
+from pyAmakCore.classes.amas import Amas
+from pyAmakCore.classes.environment import Environment
+from pyAmakCore.enumeration.executionPolicy import ExecutionPolicy
+
+
+class TestAgentRun(TestCase):
+    """
+    Test class for Agent run
+    """
+
+    def test_run(self):
+        Agent.reset_agent()
+        environment = Environment()
+        amas = Amas(environment)
+        amas.set_execution_policy(ExecutionPolicy.ONE_PHASE)
+
+        agent = Agent(amas)
+        agent.run()
+        self.assertEqual()
+
+if __name__ == '__main__':
+    main()