Merge branch 'sp/#000-em-combined' into sp/#339-em-it

ie3-institute · Nov 7, 2022 · eb4878a · eb4878a
2 parents 0b9972b + ec5aff0
commit eb4878a
Show file tree

Hide file tree

Showing 9 changed files with 369 additions and 209 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -72,6 +72,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Adapted to changes of EvcsInput in PSDM [#377](https://github.com/ie3-institute/simona/pull/377)
 - Fix breaking SIMONA caused by changes in simonaAPI [#384] (https://github.com/ie3-institute/simona/issues/384)
 - Fixed awaiting departed EVs in ExtEvDataService [#392](https://github.com/ie3-institute/simona/issues/392)
+- Fixed missing ModelBaseStateData generation for random load profiles [#399](https://github.com/ie3-institute/simona/issues/399)
+- Fixed non-random first days of random load profiles [#401](https://github.com/ie3-institute/simona/issues/401)
 
 ### Removed
 - Remove workaround for tscfg tmp directory [#178](https://github.com/ie3-institute/simona/issues/178)

diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ plugins {
   id "de.undercouch.download" version "5.3.0" // downloads plugin
   id "kr.motd.sphinx" version "2.10.1" // documentation generation
   id "com.github.johnrengelman.shadow" version "7.1.2" // fat jar
-  id "org.sonarqube" version "3.4.0.2513" // sonarqube
+  id "org.sonarqube" version "3.5.0.2730" // sonarqube
   id "org.scoverage" version "7.0.1" // scala code coverage scoverage
   id "com.github.maiflai.scalatest" version "0.32" // run scalatest without specific spec task
   id 'org.hidetake.ssh' version '2.10.1'

diff --git a/src/main/scala/edu/ie3/simona/agent/participant/load/LoadAgentFundamentals.scala b/src/main/scala/edu/ie3/simona/agent/participant/load/LoadAgentFundamentals.scala
@@ -41,7 +41,10 @@ import edu.ie3.simona.model.participant.load.profile.{
   LoadProfileStore,
   ProfileLoadModel
 }
-import edu.ie3.simona.model.participant.load.random.RandomLoadModel
+import edu.ie3.simona.model.participant.load.random.{
+  RandomLoadModel,
+  RandomLoadParamStore
+}
 import edu.ie3.simona.model.participant.load.random.RandomLoadModel.RandomRelevantData
 import edu.ie3.simona.model.participant.load.{
   FixedLoadModel,
@@ -149,6 +152,13 @@ protected trait LoadAgentFundamentals[LD <: LoadRelevantData, LM <: LoadModel[
           profileLoadModel.operationInterval.start,
           profileLoadModel.operationInterval.end
         )
+      case randomLoadModel: RandomLoadModel =>
+        activationTicksInOperationTime(
+          simulationStartDate,
+          RandomLoadParamStore.resolution.getSeconds,
+          randomLoadModel.operationInterval.start,
+          randomLoadModel.operationInterval.end
+        )
       case _ =>
         Array.emptyLongArray
     }

diff --git a/src/main/scala/edu/ie3/simona/model/participant/StorageModel.scala b/src/main/scala/edu/ie3/simona/model/participant/StorageModel.scala
@@ -194,6 +194,7 @@ final case class StorageModel(
 
     // don't allow under- or overcharge e.g. due to tick rounding error
     // allow charges below dod though since batteries can start at 0 kWh
+    // TODO don't allow SOCs below dod
     zeroKWH.max(eStorage.min(newEnergy))
   }
 
@@ -258,6 +259,7 @@ object StorageModel {
       inputModel.getType.getDod,
       initialSoc
     )
+    // TODO initialSoc >= dod must be true
     // TODO include activePowerGradient, lifeTime, lifeCycle ?
 
     model.enable()