From d3c551848193b1bb7979fc108542a834c17e5854 Mon Sep 17 00:00:00 2001 From: Jean-Christophe <jean-christophe.routier@univ-lille.fr> Date: Thu, 2 Jul 2020 14:49:43 +0200 Subject: [PATCH] stupid print before each round added --- .../scadcop/solver/decentralized/supervisor/Supervisor.scala | 1 + .../solver/decentralized/supervisor/SupervisorStatus.scala | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/scala/org/scadcop/solver/decentralized/supervisor/Supervisor.scala b/src/main/scala/org/scadcop/solver/decentralized/supervisor/Supervisor.scala index b85c71d..e0e4e5c 100644 --- a/src/main/scala/org/scadcop/solver/decentralized/supervisor/Supervisor.scala +++ b/src/main/scala/org/scadcop/solver/decentralized/supervisor/Supervisor.scala @@ -161,6 +161,7 @@ class Supervisor(val pb : DCOP, val algorithm: Algorithm) extends Actor with Sta //when it receives its own decison that it should continue case Event(ContinueAlgo, status) => { + println(s" ${Supervisor.counter}/${Supervisor.NB_ROUNDS} ************************************************************************") val newStatus: SupervisorStatus = status.resetContext() unstashAll goto(RunningSupervisorState) using newStatus diff --git a/src/main/scala/org/scadcop/solver/decentralized/supervisor/SupervisorStatus.scala b/src/main/scala/org/scadcop/solver/decentralized/supervisor/SupervisorStatus.scala index 2e44305..bc71821 100644 --- a/src/main/scala/org/scadcop/solver/decentralized/supervisor/SupervisorStatus.scala +++ b/src/main/scala/org/scadcop/solver/decentralized/supervisor/SupervisorStatus.scala @@ -40,7 +40,7 @@ class SupervisorStatus(val readyVariables: Set[Variable] = Set(), * Returns true if the algorithm ends * @todo modify it */ - def isTerminated : Boolean = Supervisor.incrementCounter() == Supervisor.NB_ROUNDS + def isTerminated : Boolean = Supervisor.incrementCounter() > Supervisor.NB_ROUNDS /*Returns the updated supervisor's status when resetting the context*/ def resetContext(): SupervisorStatus = { -- GitLab