Skip to content

Commit

Permalink
Merge pull request #1081 from ie3-institute/ms/#1080-update-simonaAPI…
Browse files Browse the repository at this point in the history
…-version

Update `simonaAPI` to version `0.6.0`
  • Loading branch information
danielfeismann authored Jan 7, 2025
2 parents 75c21d2 + 7b1cf39 commit 327fc46
Show file tree
Hide file tree
Showing 14 changed files with 61 additions and 53 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Removed Deployment stage from Jenkinsfile [#1063](https://github.com/ie3-institute/simona/issues/1063)
- Prepare 'ChpModelSpec' and 'CylindricalThermalStorageSpec' for Storage without storageVolumeLvlMin [#1012](https://github.com/ie3-institute/simona/issues/1012)
- Fixed SonarQube quality gate using the correct parameter '-Dsonar.qualitygate.wait=true' [#1072](https://github.com/ie3-institute/simona/issues/1072)
- Updated `simonaAPI` to version `0.6.0` [#1080](https://github.com/ie3-institute/simona/issues/1080)

### Fixed
- Fix rendering of references in documentation [#505](https://github.com/ie3-institute/simona/issues/505)
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ dependencies {
exclude group: 'edu.ie3'
}

implementation('com.github.ie3-institute:simonaAPI:0.5.0') {
implementation('com.github.ie3-institute:simonaAPI:0.6.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 @@ -35,10 +35,10 @@ final case class EvModelWrapper(
def id: String = original.getId

lazy val pRatedAc: Power = Kilowatts(
original.getSRatedAC.to(KILOWATT).getValue.doubleValue
original.getPRatedAC.to(KILOWATT).getValue.doubleValue
)
lazy val pRatedDc: Power = Kilowatts(
original.getSRatedDC.to(KILOWATT).getValue.doubleValue
original.getPRatedDC.to(KILOWATT).getValue.doubleValue
)
lazy val eStorage: Energy = KilowattHours(
original.getEStorage.to(KILOWATTHOUR).getValue.doubleValue
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

package edu.ie3.simona.service.ev

import edu.ie3.simona.api.data.ev.ExtEvData
import edu.ie3.simona.api.data.ev.ExtEvDataConnection
import edu.ie3.simona.api.data.ev.model.EvModel
import edu.ie3.simona.api.data.ev.ontology._
import edu.ie3.simona.api.data.ontology.DataMessageFromExt
Expand Down Expand Up @@ -46,7 +46,7 @@ object ExtEvDataService {
)

final case class ExtEvStateData(
extEvData: ExtEvData,
extEvData: ExtEvDataConnection,
uuidToActorRef: Map[UUID, ActorRef] = Map.empty[UUID, ActorRef],
extEvMessage: Option[EvDataMessageFromExt] = None,
freeLots: ReceiveDataMap[UUID, Int] = ReceiveDataMap.empty,
Expand All @@ -55,7 +55,7 @@ object ExtEvDataService {
) extends ServiceBaseStateData

final case class InitExtEvData(
extEvData: ExtEvData
extEvData: ExtEvDataConnection
) extends InitializeServiceStateData

}
Expand Down
30 changes: 13 additions & 17 deletions src/main/scala/edu/ie3/simona/sim/setup/SimonaStandaloneSetup.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import edu.ie3.simona.agent.EnvironmentRefs
import edu.ie3.simona.agent.grid.GridAgent
import edu.ie3.simona.agent.grid.GridAgentMessages.CreateGridAgent
import edu.ie3.simona.api.ExtSimAdapter
import edu.ie3.simona.api.data.ExtData
import edu.ie3.simona.api.data.ev.{ExtEvData, ExtEvSimulation}
import edu.ie3.simona.api.data.ExtDataConnection
import edu.ie3.simona.api.data.ev.ExtEvDataConnection
import edu.ie3.simona.api.simulation.ExtSimAdapterData
import edu.ie3.simona.config.{ArgsParser, RefSystemParser, SimonaConfig}
import edu.ie3.simona.event.listener.{ResultEventListener, RuntimeEventListener}
Expand Down Expand Up @@ -219,34 +219,30 @@ class SimonaStandaloneSetup(
)

// setup data services that belong to this external simulation
val (extData, extDataInit): (
Iterable[ExtData],
Iterable[(Class[_ <: SimonaService[_]], ClassicRef)],
) =
extLink.getExtDataSimulations.asScala.zipWithIndex.map {
case (_: ExtEvSimulation, dIndex) =>
extLink.setup(extSimAdapterData)
val extSim = extLink.getExtSimulation

val extDataInit
: Iterable[(Class[_ <: SimonaService[_]], ClassicRef)] =
extSim.getDataConnections.asScala.zipWithIndex.map {
case (evConnection: ExtEvDataConnection, dIndex) =>
val extEvDataService = context.toClassic.simonaActorOf(
ExtEvDataService.props(scheduler.toClassic),
s"$index-$dIndex",
)
val extEvData = new ExtEvData(extEvDataService, extSimAdapter)
evConnection.setActorRefs(extEvDataService, extSimAdapter)

extEvDataService ! SimonaService.Create(
InitExtEvData(extEvData),
InitExtEvData(evConnection),
ScheduleLock.singleKey(
context,
scheduler,
INIT_SIM_TICK,
),
)

(extEvData, (classOf[ExtEvDataService], extEvDataService))
}.unzip

extLink.getExtSimulation.setup(
extSimAdapterData,
extData.toList.asJava,
)
(classOf[ExtEvDataService], extEvDataService)
}

// starting external simulation
new Thread(extLink.getExtSimulation, s"External simulation $index")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ public String getId() {
}

@Override
public ComparableQuantity<Power> getSRatedAC() {
public ComparableQuantity<Power> getPRatedAC() {
return sRatedAC;
}

@Override
public ComparableQuantity<Power> getSRatedDC() {
public ComparableQuantity<Power> getPRatedDC() {
return sRatedDC;
}

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -1363,9 +1363,9 @@ class EvcsAgentModelCalculationSpec
resultListener.expectMsgPF() { case FlexOptionsResultEvent(flexResult) =>
flexResult.getInputModel shouldBe evcsInputModelQv.getUuid
flexResult.getTime shouldBe 900.toDateTime
flexResult.getpRef should beEquivalentTo(ev900.unwrap().getSRatedAC)
flexResult.getpMin should beEquivalentTo(ev900.unwrap().getSRatedAC)
flexResult.getpMax should beEquivalentTo(ev900.unwrap().getSRatedAC)
flexResult.getpRef should beEquivalentTo(ev900.unwrap().getPRatedAC)
flexResult.getpMin should beEquivalentTo(ev900.unwrap().getPRatedAC)
flexResult.getpMax should beEquivalentTo(ev900.unwrap().getPRatedAC)
}

emAgent.send(evcsAgent, IssueNoControl(900))
Expand All @@ -1377,7 +1377,7 @@ class EvcsAgentModelCalculationSpec
Kilowatts(
ev900
.unwrap()
.getSRatedAC
.getPRatedAC
.to(PowerSystemUnits.KILOWATT)
.getValue
.doubleValue
Expand Down Expand Up @@ -1431,7 +1431,7 @@ class EvcsAgentModelCalculationSpec
case ParticipantResultEvent(result: EvResult)
if result.getTime.equals(900.toDateTime) =>
result.getInputModel shouldBe ev900.uuid
result.getP should beEquivalentTo(ev900.unwrap().getSRatedAC)
result.getP should beEquivalentTo(ev900.unwrap().getPRatedAC)
result.getQ should beEquivalentTo(0d.asMegaVar)
result.getSoc should beEquivalentTo(0d.asPercent)
case ParticipantResultEvent(result: EvResult)
Expand All @@ -1446,7 +1446,7 @@ class EvcsAgentModelCalculationSpec
case ParticipantResultEvent(result: EvcsResult) =>
result.getInputModel shouldBe evcsInputModelQv.getUuid
result.getTime shouldBe 900.toDateTime
result.getP should beEquivalentTo(ev900.unwrap().getSRatedAC)
result.getP should beEquivalentTo(ev900.unwrap().getPRatedAC)
result.getQ should beEquivalentTo(0d.asMegaVar)
}

Expand Down Expand Up @@ -1480,9 +1480,9 @@ class EvcsAgentModelCalculationSpec
resultListener.expectMsgPF() { case FlexOptionsResultEvent(flexResult) =>
flexResult.getInputModel shouldBe evcsInputModelQv.getUuid
flexResult.getTime shouldBe 4500.toDateTime
flexResult.getpRef should beEquivalentTo(ev4500.unwrap().getSRatedAC)
flexResult.getpMin should beEquivalentTo(ev4500.unwrap().getSRatedAC)
flexResult.getpMax should beEquivalentTo(ev4500.unwrap().getSRatedAC)
flexResult.getpRef should beEquivalentTo(ev4500.unwrap().getPRatedAC)
flexResult.getpMin should beEquivalentTo(ev4500.unwrap().getPRatedAC)
flexResult.getpMax should beEquivalentTo(ev4500.unwrap().getPRatedAC)
}

emAgent.send(evcsAgent, IssueNoControl(4500))
Expand Down Expand Up @@ -1530,9 +1530,9 @@ class EvcsAgentModelCalculationSpec
resultListener.expectMsgPF() { case FlexOptionsResultEvent(flexResult) =>
flexResult.getInputModel shouldBe evcsInputModelQv.getUuid
flexResult.getTime shouldBe 9736.toDateTime
flexResult.getpRef should beEquivalentTo(ev4500.unwrap().getSRatedAC)
flexResult.getpRef should beEquivalentTo(ev4500.unwrap().getPRatedAC)
flexResult.getpMin should beEquivalentTo(0d.asKiloWatt)
flexResult.getpMax should beEquivalentTo(ev4500.unwrap().getSRatedAC)
flexResult.getpMax should beEquivalentTo(ev4500.unwrap().getPRatedAC)
}

emAgent.send(evcsAgent, IssuePowerControl(9736, Kilowatts(10.0)))
Expand Down Expand Up @@ -1595,7 +1595,7 @@ class EvcsAgentModelCalculationSpec
emAgent.send(evcsAgent, FlexActivation(11700))

val combinedChargingPower =
ev11700.unwrap().getSRatedAC.add(ev4500.unwrap().getSRatedAC)
ev11700.unwrap().getPRatedAC.add(ev4500.unwrap().getPRatedAC)
val combinedChargingPowerSq = Kilowatts(
combinedChargingPower.to(PowerSystemUnits.KILOWATT).getValue.doubleValue
)
Expand All @@ -1620,7 +1620,7 @@ class EvcsAgentModelCalculationSpec
flexResult.getTime shouldBe 11700.toDateTime
flexResult.getpRef should beEquivalentTo(combinedChargingPower)
flexResult.getpMin should beEquivalentTo(
ev4500.unwrap().getSRatedAC.multiply(-1)
ev4500.unwrap().getPRatedAC.multiply(-1)
)
flexResult.getpMax should beEquivalentTo(combinedChargingPower)
}
Expand Down Expand Up @@ -1772,7 +1772,7 @@ class EvcsAgentModelCalculationSpec
flexResult.getpMin should beEquivalentTo(
ev4500
.unwrap()
.getSRatedAC
.getPRatedAC
.multiply(
-1
)
Expand Down Expand Up @@ -1965,9 +1965,9 @@ class EvcsAgentModelCalculationSpec
resultListener.expectMsgPF() { case FlexOptionsResultEvent(flexResult) =>
flexResult.getInputModel shouldBe evcsInputModelQv.getUuid
flexResult.getTime shouldBe 36000.toDateTime
flexResult.getpRef should beEquivalentTo(ev4500.unwrap().getSRatedAC)
flexResult.getpRef should beEquivalentTo(ev4500.unwrap().getPRatedAC)
flexResult.getpMin should beEquivalentTo(0.asKiloWatt)
flexResult.getpMax should beEquivalentTo(ev4500.unwrap().getSRatedAC)
flexResult.getpMax should beEquivalentTo(ev4500.unwrap().getPRatedAC)
}

emAgent.send(evcsAgent, IssuePowerControl(36000, Kilowatts(4.0)))
Expand Down
35 changes: 23 additions & 12 deletions src/test/scala/edu/ie3/simona/service/ev/ExtEvDataServiceSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package edu.ie3.simona.service.ev

import com.typesafe.config.ConfigFactory
import edu.ie3.simona.api.data.ev.ExtEvData
import edu.ie3.simona.api.data.ev.ExtEvDataConnection
import edu.ie3.simona.api.data.ev.model.EvModel
import edu.ie3.simona.api.data.ev.ontology._
import edu.ie3.simona.api.data.ontology.ScheduleDataServiceMessage
Expand Down Expand Up @@ -67,7 +67,8 @@ class ExtEvDataServiceSpec
val extSimAdapter = TestProbe("extSimAdapter")

val evService = TestActorRef(new ExtEvDataService(scheduler.ref))
val extEvData = new ExtEvData(evService, extSimAdapter.ref)
val extEvData = new ExtEvDataConnection()
extEvData.setActorRefs(evService, extSimAdapter.ref)

val key =
ScheduleLock.singleKey(TSpawner, scheduler.ref.toTyped, INIT_SIM_TICK)
Expand All @@ -90,7 +91,8 @@ class ExtEvDataServiceSpec
val extSimAdapter = TestProbe("extSimAdapter")

val evService = TestActorRef(new ExtEvDataService(scheduler.ref))
val extEvData = new ExtEvData(evService, extSimAdapter.ref)
val extEvData = new ExtEvDataConnection()
extEvData.setActorRefs(evService, extSimAdapter.ref)

val evcs1 = TestProbe("evcs1")

Expand Down Expand Up @@ -124,7 +126,8 @@ class ExtEvDataServiceSpec
val extSimAdapter = TestProbe("extSimAdapter")

val evService = TestActorRef(new ExtEvDataService(scheduler.ref))
val extEvData = new ExtEvData(evService, extSimAdapter.ref)
val extEvData = new ExtEvDataConnection()
extEvData.setActorRefs(evService, extSimAdapter.ref)

val key =
ScheduleLock.singleKey(TSpawner, scheduler.ref.toTyped, INIT_SIM_TICK)
Expand Down Expand Up @@ -171,7 +174,8 @@ class ExtEvDataServiceSpec
val extSimAdapter = TestProbe("extSimAdapter")

val evService = TestActorRef(new ExtEvDataService(scheduler.ref))
val extEvData = new ExtEvData(evService, extSimAdapter.ref)
val extEvData = new ExtEvDataConnection()
extEvData.setActorRefs(evService, extSimAdapter.ref)

val key =
ScheduleLock.singleKey(TSpawner, scheduler.ref.toTyped, INIT_SIM_TICK)
Expand Down Expand Up @@ -204,7 +208,8 @@ class ExtEvDataServiceSpec
val extSimAdapter = TestProbe("extSimAdapter")

val evService = TestActorRef(new ExtEvDataService(scheduler.ref))
val extEvData = new ExtEvData(evService, extSimAdapter.ref)
val extEvData = new ExtEvDataConnection()
extEvData.setActorRefs(evService, extSimAdapter.ref)

val key =
ScheduleLock.singleKey(TSpawner, scheduler.ref.toTyped, INIT_SIM_TICK)
Expand Down Expand Up @@ -305,7 +310,8 @@ class ExtEvDataServiceSpec
val extSimAdapter = TestProbe("extSimAdapter")

val evService = TestActorRef(new ExtEvDataService(scheduler.ref))
val extEvData = new ExtEvData(evService, extSimAdapter.ref)
val extEvData = new ExtEvDataConnection()
extEvData.setActorRefs(evService, extSimAdapter.ref)

val key =
ScheduleLock.singleKey(TSpawner, scheduler.ref.toTyped, INIT_SIM_TICK)
Expand Down Expand Up @@ -380,7 +386,8 @@ class ExtEvDataServiceSpec
val extSimAdapter = TestProbe("extSimAdapter")

val evService = TestActorRef(new ExtEvDataService(scheduler.ref))
val extEvData = new ExtEvData(evService, extSimAdapter.ref)
val extEvData = new ExtEvDataConnection()
extEvData.setActorRefs(evService, extSimAdapter.ref)

val key =
ScheduleLock.singleKey(TSpawner, scheduler.ref.toTyped, INIT_SIM_TICK)
Expand Down Expand Up @@ -423,7 +430,8 @@ class ExtEvDataServiceSpec
val extSimAdapter = TestProbe("extSimAdapter")

val evService = TestActorRef(new ExtEvDataService(scheduler.ref))
val extEvData = new ExtEvData(evService, extSimAdapter.ref)
val extEvData = new ExtEvDataConnection()
extEvData.setActorRefs(evService, extSimAdapter.ref)

val key =
ScheduleLock.singleKey(TSpawner, scheduler.ref.toTyped, INIT_SIM_TICK)
Expand Down Expand Up @@ -527,7 +535,8 @@ class ExtEvDataServiceSpec
val extSimAdapter = TestProbe("extSimAdapter")

val evService = TestActorRef(new ExtEvDataService(scheduler.ref))
val extEvData = new ExtEvData(evService, extSimAdapter.ref)
val extEvData = new ExtEvDataConnection()
extEvData.setActorRefs(evService, extSimAdapter.ref)

val key =
ScheduleLock.singleKey(TSpawner, scheduler.ref.toTyped, INIT_SIM_TICK)
Expand Down Expand Up @@ -574,7 +583,8 @@ class ExtEvDataServiceSpec
val extSimAdapter = TestProbe("extSimAdapter")

val evService = TestActorRef(new ExtEvDataService(scheduler.ref))
val extEvData = new ExtEvData(evService, extSimAdapter.ref)
val extEvData = new ExtEvDataConnection()
extEvData.setActorRefs(evService, extSimAdapter.ref)

val key =
ScheduleLock.singleKey(TSpawner, scheduler.ref.toTyped, INIT_SIM_TICK)
Expand Down Expand Up @@ -652,7 +662,8 @@ class ExtEvDataServiceSpec
val extSimAdapter = TestProbe("extSimAdapter")

val evService = TestActorRef(new ExtEvDataService(scheduler.ref))
val extEvData = new ExtEvData(evService, extSimAdapter.ref)
val extEvData = new ExtEvDataConnection()
extEvData.setActorRefs(evService, extSimAdapter.ref)

val key =
ScheduleLock.singleKey(TSpawner, scheduler.ref.toTyped, INIT_SIM_TICK)
Expand Down

0 comments on commit 327fc46

Please sign in to comment.