Deleting the repetitive methods

ie3-institute · Jan 23, 2023 · a5a6ccb · a5a6ccb
1 parent 4ed0ac7
commit a5a6ccb
Showing 1 changed file with 11 additions and 20 deletions.
diff --git a/src/main/scala/edu/ie3/simona/scheduler/SchedulerHelper.scala b/src/main/scala/edu/ie3/simona/scheduler/SchedulerHelper.scala
@@ -445,31 +445,22 @@ trait SchedulerHelper extends SimonaActorLogging {
       context.unwatch(trig.agent)
     )
 
+    /* notify listeners */
+    /*The usage of min is necessary because the scheduler overshoots the target tick by 1 at the end of the simulation*/
+    notifyListener(
+      Done(
+        Math.min(stateData.time.nowInTicks, endTick),
+        totalSimDuration,
+        stateData.runtime.noOfFailedPF,
+        errorInSim
+      )
+    )
+
     /* notify start sender */
     if (errorInSim) {
       stateData.runtime.initSender ! SimulationFailureMessage
-
-      /* notify listeners */
-      notifyListener(
-        Done(
-          Math.min(stateData.time.nowInTicks, endTick),
-          totalSimDuration,
-          stateData.runtime.noOfFailedPF,
-          errorInSim
-        )
-      )
     } else {
       stateData.runtime.initSender ! SimulationSuccessfulMessage
-
-      /* notify listeners */
-      notifyListener(
-        Done(
-          Math.min(stateData.time.nowInTicks, endTick),
-          totalSimDuration,
-          stateData.runtime.noOfFailedPF,
-          errorInSim
-        )
-      )
     }
 
     /* disable schedule */