Skip to content
Open
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ dependencies {
exclude group: 'edu.ie3'
}

implementation('com.github.ie3-institute:simonaAPI:0.11.0') {
implementation('com.github.ie3-institute:simonaAPI:0.12.0') {
exclude group: 'org.apache.logging.log4j'
exclude group: 'org.slf4j'
/* Exclude our own nested dependencies */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ package edu.ie3.simona.model.participant.evcs
import edu.ie3.simona.api.data.model.ev.EvModel
import edu.ie3.util.quantities.PowerSystemUnits.*
import edu.ie3.util.quantities.QuantityUtils.asKiloWattHour
import edu.ie3.util.scala.quantities.QuantityConversionUtils.toSquants
import edu.ie3.util.scala.quantities.ApparentPower
import edu.ie3.util.scala.quantities.QuantityConversionUtils.{
toApparent,
toSquants,
}
import squants.Power
import squants.energy.{Energy, KilowattHours}

Expand All @@ -35,7 +39,9 @@ final case class EvModelWrapper(
def uuid: UUID = original.getUuid
def id: String = original.getId

lazy val pRatedAc: Power = original.getPRatedAC.toSquants
lazy val cosPhi: Double = original.getCosPhiRated
lazy val sRatedAc: ApparentPower = original.getSRatedAC.toApparent
lazy val pRatedAc: Power = sRatedAc.toActivePower(cosPhi)
lazy val pRatedDc: Power = original.getPRatedDC.toSquants
lazy val eStorage: Energy = original.getEStorage.toSquants

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ object ServiceMessage {
final case class EmServiceRegistration(
requestingActor: ActorRef[EmAgent.Message],
inputUuid: UUID,
parentEm: Option[ActorRef[FlexResponse]],
parentUuid: Option[UUID],
parentEm: Option[ActorRef[FlexResponse]] = None,
parentUuid: Option[UUID] = None,
) extends ServiceRegistrationMessage

/** Message to register with a primary data service.
Expand Down
7 changes: 4 additions & 3 deletions src/main/scala/edu/ie3/simona/service/ExtDataSupport.scala
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ trait ExtDataSupport {

idle(using updatedStateData, scheduler)

case (_, extResponseMsg: ServiceResponseMessage) =>
val updatedStateData = handleDataResponseMessage(extResponseMsg)
case (ctx, extResponseMsg: ServiceResponseMessage) =>
val updatedStateData = handleDataResponseMessage(extResponseMsg, ctx)

idle(using updatedStateData, scheduler)
}
Expand Down Expand Up @@ -75,6 +75,7 @@ trait ExtDataSupport {
* the updated state data
*/
protected def handleDataResponseMessage(
extResponseMsg: ServiceResponseMessage
extResponseMsg: ServiceResponseMessage,
ctx: ActorContext[Message],
)(using serviceStateData: S): S
}
Loading