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 b85c71d5179dabbe964c4d1c26422b4f45507c7f..e0e4e5ce0f8a4d1afa4a29af6f6ab544830ba90e 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 2e44305b0b2d807febd5d7bfb9e8e931d2362301..bc71821bd566acddcb3f8b94d167c8f85b40f58a 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 = {