From 0e1b7f73b2ce12b53cb8e7189f1dc12cf1b4d01f Mon Sep 17 00:00:00 2001 From: shinedday <shinedday@gmail.com> Date: Fri, 13 May 2022 11:18:00 +0200 Subject: [PATCH] Remove mode in scheduler as it's not usefull --- dist/iotAmak-0.0.1-py3-none-any.whl | Bin 10962 -> 10784 bytes iotAmak/ihm.py | 11 +---------- iotAmak/scheduler.py | 18 +++++------------- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/dist/iotAmak-0.0.1-py3-none-any.whl b/dist/iotAmak-0.0.1-py3-none-any.whl index 4895e53f2612b1a1293548dc04d552f4eebb50e5..28d73a639ad5b510b63000f303fe759af4f32d98 100644 GIT binary patch delta 3991 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 Zg@Hj1WB?RzVVnt3xJ^rpZN4f<6acwhP~QLm delta 4183 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 VeU!n5omXO;%%vs37N`ai1_18J+amw~ diff --git a/iotAmak/ihm.py b/iotAmak/ihm.py index 8a23611..5a23197 100644 --- a/iotAmak/ihm.py +++ b/iotAmak/ihm.py @@ -150,14 +150,8 @@ class Ihm(MqttClient, SSHClient): if self.experiment_loaded and self.ping_is_true: - # choose exec - print("Choose execution mode for the scheduler") - print("0 : step by step, 1 : auto") - while cmd not in ["0", "1"]: - cmd = input(">") - # start subprocess scheduler - p1 = Popen([sys.executable, './scheduler.py', cmd, self.broker_ip]) + p1 = Popen([sys.executable, './scheduler.py', self.broker_ip]) sleep(1) # start subprocess amas send_client = [c.to_send() for c in self.clients] @@ -174,8 +168,5 @@ class Ihm(MqttClient, SSHClient): if cmd.lower() in ["s", "step"]: self.client.publish("ihm/step") - if cmd.lower() == "mode": - self.client.publish("ihm/mode") - self.client.publish("ihm/step") sleep(2) diff --git a/iotAmak/scheduler.py b/iotAmak/scheduler.py index 51ecdcc..9c97156 100644 --- a/iotAmak/scheduler.py +++ b/iotAmak/scheduler.py @@ -16,13 +16,11 @@ class Scheduler(Schedulable): Scheduler class, it's role is to make sure the amas, the env and all the agents stay in sync """ - def __init__(self, execution_policy: int, broker_ip: str) -> None: + def __init__(self, broker_ip: str) -> None: Schedulable.__init__(self, broker_ip, "Scheduler") self.sleep_between_cycle = 0 - # 0: pas a pas, 1: auto - self.execution_policy: int = execution_policy self.ihm_token = 0 self.paused = True @@ -33,19 +31,12 @@ class Scheduler(Schedulable): self.subscribe("ihm/step", self.step) self.subscribe("ihm/pause", self.pause) self.subscribe("ihm/unpause", self.unpause) - self.subscribe("ihm/mode", self.mode) self.agent_waiting = 0 self.schedulable_waiting = 0 print("Init done") - def mode(self, client, userdata, message) -> None: - """ - Function called when the IHM change scheduler mode - """ - self.execution_policy = (1 - self.execution_policy) % 2 - def pause(self, client, userdata, message) -> None: """ Function called when the IHM pause the scheduler @@ -109,6 +100,8 @@ class Scheduler(Schedulable): """ Called when the scheduler is waiting for an action of the IHM """ + if not self.paused: + return while self.ihm_token == 0: sleep(self.wait_delay) self.ihm_token -= 1 @@ -154,8 +147,7 @@ class Scheduler(Schedulable): while not self.exit_bool: print("Cycle : ", self.nbr_cycle) - if self.execution_policy == 0 or self.paused: - self.wait_ihm() + self.wait_ihm() if self.exit_bool: break @@ -176,5 +168,5 @@ class Scheduler(Schedulable): if __name__ == '__main__': - s = Scheduler(int(sys.argv[1]), str(sys.argv[2])) + s = Scheduler(str(sys.argv[1])) s.run() -- GitLab