Merge pull request #993 from ie3-institute/mh/#921-CheckWindow-duration

Mh/#921 check window duration
ie3-institute · Oct 14, 2024 · c375145 · c375145
2 parents fd9fd94 + 1a05221
commit c375145
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -117,6 +117,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improve code quality in fixedloadmodelspec and other tests [#919](https://github.com/ie3-institute/simona/issues/919)
 - Fix power flow calculation with em agents [#962](https://github.com/ie3-institute/simona/issues/962)
 - Fix scheduling at Evcs with more than one Ev at a time without Em [#787](https://github.com/ie3-institute/simona/issues/787)
+- Fix CheckWindow duration [#921](https://github.com/ie3-institute/simona/issues/921)
 
 ## [3.0.0] - 2023-08-07
 

diff --git a/src/main/scala/edu/ie3/simona/io/runtime/RuntimeEventLogSink.scala b/src/main/scala/edu/ie3/simona/io/runtime/RuntimeEventLogSink.scala
@@ -27,7 +27,6 @@ import scala.concurrent.duration.DurationLong
 final case class RuntimeEventLogSink(
     simulationStartDate: ZonedDateTime,
     log: Logger,
-    private var last: Long = 0L,
 ) extends RuntimeEventSink {
 
   override def handleRuntimeEvent(
@@ -45,15 +44,13 @@ final case class RuntimeEventLogSink(
 
       case CheckWindowPassed(tick, duration) =>
         log.info(
-          s"******* Simulation until ${calcTime(tick)} completed. ${durationAndMemoryString(duration - last)} ******"
+          s"******* Simulation until ${calcTime(tick)} completed. ${durationAndMemoryString(duration)} ******"
         )
-        last = duration
 
       case Ready(tick, duration) =>
         log.info(
-          s"******* Switched from 'Simulating' to 'Ready'. Last simulated time: ${calcTime(tick)}. ${durationAndMemoryString(duration - last)}  ******"
+          s"******* Switched from 'Simulating' to 'Ready'. Last simulated time: ${calcTime(tick)}. ${durationAndMemoryString(duration)}  ******"
         )
-        last = duration
 
       case Simulating(startTick, endTick) =>
         log.info(

diff --git a/src/main/scala/edu/ie3/simona/scheduler/RuntimeNotifier.scala b/src/main/scala/edu/ie3/simona/scheduler/RuntimeNotifier.scala
@@ -111,8 +111,12 @@ final case class RuntimeNotifier(
         val completedWindows =
           (adjustedLastCheck + checkWindow) to completedTick by checkWindow
 
-        completedWindows.foreach { tick =>
-          notify(CheckWindowPassed(tick, duration(lastStartTime, nowTime)))
+        completedWindows.foldLeft(lastCheckWindowTime) {
+          case (lastTime, tick) =>
+            notify(
+              CheckWindowPassed(tick, duration(lastTime, nowTime))
+            )
+            None
         }
 
         completedWindows.lastOption