Merge branch 'dev' into ps/#939-GitHubActionsPipeline

CHANGELOG.md

@@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - EmAgents should be able to handle initialization [#945](https://github.com/ie3-institute/simona/issues/945)
 - Added option to directly zip the output files [#793](https://github.com/ie3-institute/simona/issues/793)
 - Added weatherData HowTo for Copernicus ERA5 data [#967](https://github.com/ie3-institute/simona/issues/967)
+- Add some quote to 'printGoodbye' [#997](https://github.com/ie3-institute/simona/issues/997)
 
 ### Changed
 - Adapted to changed data source in PSDM [#435](https://github.com/ie3-institute/simona/issues/435)
@@ -87,6 +88,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Renamed `ActivityStartTrigger`, `ScheduleTriggerMessage`, `CompletionMessage` in UML Diagrams[#675](https://github.com/ie3-institute/simona/issues/675)
 - Simplifying quantity integration in QuantityUtil [#973](https://github.com/ie3-institute/simona/issues/973)
 - Reorganized Jenkins pipeline to separate build and test stages for better efficiency [#938](https://github.com/ie3-institute/simona/issues/938)
+- Rewrote SystemParticipantTest and MockParticipant from groovy to scala [#646](https://github.com/ie3-institute/simona/issues/646)
+- Rewrote ChpModelTest from groovy to scala [#646](https://github.com/ie3-institute/simona/issues/646)
 
 ### Fixed
 - Removed a repeated line in the documentation of vn_simona config [#658](https://github.com/ie3-institute/simona/issues/658)
@@ -117,6 +120,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
 

build.gradle

@@ -26,7 +26,7 @@ ext {
 
   scalaVersion = '2.13'
   scalaBinaryVersion = '2.13.15'
-  pekkoVersion = '1.1.1'
+  pekkoVersion = '1.1.2'
   jtsVersion = '1.20.0'
   confluentKafkaVersion = '7.4.0'
   tscfgVersion = '1.1.3'
@@ -98,7 +98,7 @@ dependencies {
 
   /* logging */
   implementation "com.typesafe.scala-logging:scala-logging_${scalaVersion}:3.9.5" // pekko scala logging
-  implementation "ch.qos.logback:logback-classic:1.5.8"
+  implementation "ch.qos.logback:logback-classic:1.5.10"
 
   /* testing */
   testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'

docs/readthedocs/requirements.txt

@@ -1,5 +1,5 @@
-Sphinx==7.4.7
-sphinx-rtd-theme==2.0.0
+Sphinx==8.1.3
+sphinx-rtd-theme==3.0.1
 sphinxcontrib-plantuml==0.30
 myst-parser==4.0.0
 markdown-it-py==3.0.0

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(

src/main/scala/edu/ie3/simona/main/RunSimona.scala

@@ -66,6 +66,7 @@ trait RunSimona[T <: SimonaSetup] extends LazyLogging {
       "\"Ich bin der Anfang, das Ende, die Eine, die Viele ist. Ich bin die Borg.\" - Borg-Königin (in Star Trek: Der erste Kontakt)",
       "\"A horse! A horse! My kingdom for a horse!\" - King Richard III (in Shakespeare's Richard III, 1594)",
       "\"Und wenn du lange in einen Abgrund blickst, blickt der Abgrund auch in dich hinein\" - F. Nietzsche",
+      "\"Before anything else, preparation is the key to success.\" - Alexander Graham Bell",
     )
 
     val rand = new Random

src/main/scala/edu/ie3/simona/model/thermal/CylindricalThermalStorage.scala

@@ -63,7 +63,7 @@ final case class CylindricalThermalStorage(
     minEnergyThreshold: Energy,
     maxEnergyThreshold: Energy,
     chargingPower: Power,
-    override protected var _storedEnergy: Energy,
+    override var _storedEnergy: Energy,
 ) extends ThermalStorage(
       uuid,
       id,

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