Merge branch 'sp/#204-EmAgent' into sp/#000-em-combined

ie3-institute · Nov 14, 2022 · 3660b06 · 3660b06
2 parents 0d9cfd7 + 5afbcaf
commit 3660b06
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/main/scala/edu/ie3/simona/agent/participant/em/EmAgent.scala b/src/main/scala/edu/ie3/simona/agent/participant/em/EmAgent.scala
@@ -217,16 +217,16 @@ class EmAgent(
         Map.empty,
         requestVoltageDeviationThreshold,
         ValueStore.forVoltage(
-          resolution * 10,
+          resolution,
           inputModel.getNode
             .getvTarget()
             .to(PU)
         ),
-        ValueStore.forResult(resolution, 10),
-        ValueStore(resolution * 10),
+        ValueStore(resolution),
+        ValueStore(resolution),
         ValueStore(0),
         connectedAgents.map { case (_, _, sp) =>
-          sp.getUuid -> ValueStore(resolution * 10)
+          sp.getUuid -> ValueStore(resolution)
         }.toMap,
         connectedAgents.map { case (_, _, sp) =>
           sp.getUuid -> sp

diff --git a/src/main/scala/edu/ie3/simona/agent/participant/em/EmSchedulerHelper.scala b/src/main/scala/edu/ie3/simona/agent/participant/em/EmSchedulerHelper.scala
@@ -123,10 +123,8 @@ trait EmSchedulerHelper {
     if (
       !triggerData.awaitedFlexCompletions.contains(completionMessage.modelUuid)
     ) {
-      log.warning(
-        "Completion for UUID {} has not been awaited in completions map {}",
-        completionMessage.modelUuid,
-        triggerData.awaitedFlexCompletions
+      throw new RuntimeException(
+        s"Completion for UUID ${completionMessage.modelUuid} is not part of expected completions: ${triggerData.awaitedFlexCompletions}"
       )
     }