Merge branch 'sp/#309-StorageAgent' into sp/#000-em-combined

ie3-institute · Nov 14, 2022 · 0d9cfd7 · 0d9cfd7
2 parents d41a78b + 60a4111
commit 0d9cfd7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/main/scala/edu/ie3/simona/agent/participant/storage/StorageAgentFundamentals.scala b/src/main/scala/edu/ie3/simona/agent/participant/storage/StorageAgentFundamentals.scala
@@ -110,18 +110,18 @@ trait StorageAgentFundamentals
       Map.empty,
       requestVoltageDeviationThreshold,
       ValueStore.forVoltage(
-        resolution * 10,
+        resolution,
         inputModel.getNode
           .getvTarget()
           .to(PowerSystemUnits.PU)
       ),
-      ValueStore.forResult(resolution, 10),
-      ValueStore(resolution * 10),
-      ValueStore(resolution * 10),
-      ValueStore(resolution * 10),
+      ValueStore(resolution),
+      ValueStore(resolution),
+      ValueStore(resolution),
+      ValueStore(resolution),
       maybeEmAgent.map(
-        FlexStateData(_, ValueStore(resolution * 10))
-      ) // TODO
+        FlexStateData(_, ValueStore(resolution))
+      )
     )
   }
 

diff --git a/src/test/scala/edu/ie3/simona/agent/participant/StorageAgentModelCalculationSpec.scala b/src/test/scala/edu/ie3/simona/agent/participant/StorageAgentModelCalculationSpec.scala
@@ -223,14 +223,14 @@ class StorageAgentModelCalculationSpec
           additionalActivationTicks shouldBe Array.emptyLongArray
           foreseenDataTicks shouldBe Map.empty
           voltageValueStore shouldBe ValueStore(
-            resolution * 10,
+            resolution,
             Map(0L -> Quantities.getQuantity(1d, PU))
           )
           resultValueStore shouldBe ValueStore(
-            resolution * 10
+            resolution
           )
           requestValueStore shouldBe ValueStore[ApparentPower](
-            resolution * 10
+            resolution
           )
         case unrecognized =>
           fail(
@@ -314,7 +314,7 @@ class StorageAgentModelCalculationSpec
           modelBaseStateData.requestValueStore shouldBe ValueStore[
             ApparentPower
           ](
-            resolution * 10,
+            resolution,
             Map(
               0L -> ApparentPower(
                 Quantities.getQuantity(0d, MEGAWATT),