Re-implementation of ParticipantAgent and models

docs/uml/main/participants/ParticipantStates.puml

@@ -0,0 +1,35 @@
+@startuml
+'https://plantuml.com/state-diagram
+
+' clock "Cock 0" as C0 with period 50
+skinparam componentStyle rectangle
+
+package "t0" {
+    component "State (t0)" as s0
+    component "OperatingPoint (t0 - ?)" as op0
+        component "OperationRelevantData (t0)" as or0
+
+}
+
+package t1 {
+    component "State (t1)" as s1
+}
+
+package t2 {
+    component "State (t2)" as s2
+}
+
+
+s0 -> op0
+or0 -> op0
+
+s0 -> s1
+op0 -> s1
+
+s1 -> s2
+
+' Layouting:
+s0 -[hidden]-> or0
+'States --> OperatingPoints
+
+@enduml

src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgent.scala

@@ -14,7 +14,7 @@ import edu.ie3.simona.agent.participant.ParticipantAgent.{
   getAndCheckNodalVoltage,
 }
 import edu.ie3.simona.agent.participant.data.Data
-import edu.ie3.simona.agent.participant.data.Data.PrimaryData.PrimaryDataWithApparentPower
+import edu.ie3.simona.agent.participant.data.Data.PrimaryData.PrimaryDataWithComplexPower
 import edu.ie3.simona.agent.participant.data.Data.{PrimaryData, SecondaryData}
 import edu.ie3.simona.agent.participant.data.secondary.SecondaryDataService
 import edu.ie3.simona.agent.participant.statedata.BaseStateData.{
@@ -89,7 +89,7 @@ import scala.reflect.ClassTag
   * @since 2019-07-04
   */
 abstract class ParticipantAgent[
-    PD <: PrimaryDataWithApparentPower[PD],
+    PD <: PrimaryDataWithComplexPower[PD],
     CD <: CalcRelevantData,
     MS <: ModelState,
     D <: ParticipantStateData[PD],

src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgentFundamentals.scala

@@ -26,7 +26,7 @@ import edu.ie3.simona.agent.participant.data.Data.PrimaryData.{
   ComplexPower,
   ComplexPowerAndHeat,
   EnrichableData,
-  PrimaryDataWithApparentPower,
+  PrimaryDataWithComplexPower,
 }
 import edu.ie3.simona.agent.participant.data.Data.{PrimaryData, SecondaryData}
 import edu.ie3.simona.agent.participant.data.secondary.SecondaryDataService
@@ -103,7 +103,7 @@ import scala.util.{Failure, Success, Try}
 /** Useful functions to use in [[ParticipantAgent]] s
   */
 protected trait ParticipantAgentFundamentals[
-    PD <: PrimaryDataWithApparentPower[PD],
+    PD <: PrimaryDataWithComplexPower[PD],
     CD <: CalcRelevantData,
     MS <: ModelState,
     D <: ParticipantStateData[PD],

src/main/scala/edu/ie3/simona/agent/participant/ServiceRegistration.scala

@@ -8,7 +8,7 @@ package edu.ie3.simona.agent.participant
 
 import org.apache.pekko.actor.ActorRef
 import edu.ie3.datamodel.models.input.system.{EvcsInput, SystemParticipantInput}
-import edu.ie3.simona.agent.participant.data.Data.PrimaryData.PrimaryDataWithApparentPower
+import edu.ie3.simona.agent.participant.data.Data.PrimaryData.PrimaryDataWithComplexPower
 import edu.ie3.simona.agent.participant.data.Data.SecondaryData
 import edu.ie3.simona.agent.participant.data.secondary.SecondaryDataService
 import edu.ie3.simona.agent.participant.data.secondary.SecondaryDataService.{
@@ -28,7 +28,7 @@ import edu.ie3.simona.ontology.messages.services.EvMessage.RegisterForEvDataMess
 import edu.ie3.simona.ontology.messages.services.WeatherMessage.RegisterForWeatherMessage
 
 trait ServiceRegistration[
-    PD <: PrimaryDataWithApparentPower[PD],
+    PD <: PrimaryDataWithComplexPower[PD],
     CD <: CalcRelevantData,
     MS <: ModelState,
     D <: ParticipantStateData[PD],

src/main/scala/edu/ie3/simona/agent/participant/data/Data.scala

@@ -15,7 +15,6 @@ import edu.ie3.util.scala.quantities.{Kilovars, ReactivePower}
 import squants.energy.{Kilowatts, Power}
 import tech.units.indriya.ComparableQuantity
 
-import java.time.ZonedDateTime
 import scala.jdk.OptionConverters.RichOptional
 import scala.util.{Failure, Success, Try}
 
@@ -39,16 +38,22 @@ object Data {
     def toComplexPower: ComplexPower
   }
 
+  sealed trait PrimaryDataMeta[T <: PrimaryData] {
+    def zero: T
+
+    def scale(data: T, factor: Double): T
+  }
+
   object PrimaryData {
 
-    sealed trait EnrichableData[E <: PrimaryDataWithApparentPower[E]] {
+    sealed trait EnrichableData[E <: PrimaryDataWithComplexPower[E]] {
       def add(q: ReactivePower): E
     }
 
-    /** Denoting all primary data, that carry apparent power
+    /** Denoting all primary data, that carry complex power
       */
-    sealed trait PrimaryDataWithApparentPower[
-        +T <: PrimaryDataWithApparentPower[T]
+    sealed trait PrimaryDataWithComplexPower[
+        +T <: PrimaryDataWithComplexPower[T]
     ] extends PrimaryData {
       val q: ReactivePower
 
@@ -81,6 +86,13 @@ object Data {
         ComplexPower(p, q)
     }
 
+    object ActivePowerMeta extends PrimaryDataMeta[ActivePower] {
+      override def zero: ActivePower = ActivePower(zeroKW)
+
+      override def scale(data: ActivePower, factor: Double): ActivePower =
+        ActivePower(data.p * factor)
+    }
+
     /** Active and Reactive power as participant simulation result
       *
       * @param p
@@ -91,13 +103,20 @@ object Data {
     final case class ComplexPower(
         override val p: Power,
         override val q: ReactivePower,
-    ) extends PrimaryDataWithApparentPower[ComplexPower] {
+    ) extends PrimaryDataWithComplexPower[ComplexPower] {
       override def toComplexPower: ComplexPower = this
 
       override def withReactivePower(q: ReactivePower): ComplexPower =
         copy(q = q)
     }
 
+    object ComplexPowerMeta extends PrimaryDataMeta[ComplexPower] {
+      override def zero: ComplexPower = ComplexPower(zeroKW, zeroKVAr)
+
+      override def scale(data: ComplexPower, factor: Double): ComplexPower =
+        ComplexPower(data.p * factor, data.q * factor)
+    }
+
     /** Active power and heat demand as participant simulation result
       *
       * @param p
@@ -121,6 +140,16 @@ object Data {
         ComplexPowerAndHeat(p, q, qDot)
     }
 
+    object ActivePowerAndHeatMeta extends PrimaryDataMeta[ActivePowerAndHeat] {
+      override def zero: ActivePowerAndHeat = ActivePowerAndHeat(zeroKW, zeroKW)
+
+      override def scale(
+          data: ActivePowerAndHeat,
+          factor: Double,
+      ): ActivePowerAndHeat =
+        ActivePowerAndHeat(data.p * factor, data.qDot * factor)
+    }
+
     /** Apparent power and heat demand as participant simulation result
       *
       * @param p
@@ -134,7 +163,7 @@ object Data {
         override val p: Power,
         override val q: ReactivePower,
         override val qDot: Power,
-    ) extends PrimaryDataWithApparentPower[ComplexPowerAndHeat]
+    ) extends PrimaryDataWithComplexPower[ComplexPowerAndHeat]
         with Heat {
       override def toComplexPower: ComplexPower =
         ComplexPower(p, q)
@@ -143,6 +172,22 @@ object Data {
         copy(q = q)
     }
 
+    object ComplexPowerAndHeatMeta
+        extends PrimaryDataMeta[ComplexPowerAndHeat] {
+      override def zero: ComplexPowerAndHeat =
+        ComplexPowerAndHeat(zeroKW, zeroKVAr, zeroKW)
+
+      override def scale(
+          data: ComplexPowerAndHeat,
+          factor: Double,
+      ): ComplexPowerAndHeat =
+        ComplexPowerAndHeat(
+          data.p * factor,
+          data.q * factor,
+          data.qDot * factor,
+        )
+    }
+
     implicit class RichValue(private val value: Value) {
       def toPrimaryData: Try[PrimaryData] =
         value match {
@@ -241,7 +286,6 @@ object Data {
     */
   trait SecondaryData extends Data
   object SecondaryData {
-    final case class DateTime(dateTime: ZonedDateTime) extends SecondaryData
     final case class WholesalePrice(price: ComparableQuantity[EnergyPrice])
         extends SecondaryData
   }

src/main/scala/edu/ie3/simona/agent/participant/evcs/EvcsAgent.scala

@@ -85,7 +85,7 @@ class EvcsAgent(
 
   when(Idle) {
     case Event(
-          EvFreeLotsRequest(tick),
+          EvFreeLotsRequest(tick, _),
           modelBaseStateData: ParticipantModelBaseStateData[
             ComplexPower,
             EvcsRelevantData,
@@ -97,7 +97,7 @@ class EvcsAgent(
       stay()
 
     case Event(
-          DepartingEvsRequest(tick, departingEvs),
+          DepartingEvsRequest(tick, departingEvs, _),
           modelBaseStateData: ParticipantModelBaseStateData[
             ComplexPower,
             EvcsRelevantData,
@@ -115,7 +115,7 @@ class EvcsAgent(
     // in case the activation has arrived first
 
     case Event(
-          EvFreeLotsRequest(tick),
+          EvFreeLotsRequest(tick, _),
           stateData: DataCollectionStateData[ComplexPower],
         ) =>
       stateData.baseStateData match {
@@ -134,7 +134,7 @@ class EvcsAgent(
       }
 
     case Event(
-          DepartingEvsRequest(tick, departingEvs),
+          DepartingEvsRequest(tick, departingEvs, _),
           stateData: DataCollectionStateData[ComplexPower],
         ) =>
       stateData.baseStateData match {

src/main/scala/edu/ie3/simona/agent/participant/statedata/BaseStateData.scala

@@ -7,7 +7,7 @@
 package edu.ie3.simona.agent.participant.statedata
 
 import edu.ie3.simona.agent.ValueStore
-import edu.ie3.simona.agent.participant.data.Data.PrimaryData.PrimaryDataWithApparentPower
+import edu.ie3.simona.agent.participant.data.Data.PrimaryData.PrimaryDataWithComplexPower
 import edu.ie3.simona.agent.participant.data.Data.SecondaryData
 import edu.ie3.simona.agent.participant.data.secondary.SecondaryDataService
 import edu.ie3.simona.event.notifier.NotifierConfig
@@ -33,10 +33,10 @@ import scala.collection.SortedSet
   * agents
   *
   * @tparam PD
-  *   Type of [[PrimaryDataWithApparentPower]], that the represented Participant
+  *   Type of [[PrimaryDataWithComplexPower]], that the represented Participant
   *   produces
   */
-trait BaseStateData[+PD <: PrimaryDataWithApparentPower[PD]]
+trait BaseStateData[+PD <: PrimaryDataWithComplexPower[PD]]
     extends ParticipantStateData[PD] {
 
   /** The date, that fits the tick 0
@@ -90,15 +90,15 @@ object BaseStateData {
   /** The agent is supposed to carry out model calculations
     *
     * @tparam PD
-    *   Type of [[PrimaryDataWithApparentPower]], that the represented
+    *   Type of [[PrimaryDataWithComplexPower]], that the represented
     *   Participant produces
     * @tparam CD
     *   Type of [[CalcRelevantData]], that is required by the included model
     * @tparam M
     *   Restricting the model to a certain class
     */
   trait ModelBaseStateData[
-      +PD <: PrimaryDataWithApparentPower[PD],
+      +PD <: PrimaryDataWithComplexPower[PD],
       CD <: CalcRelevantData,
       MS <: ModelState,
       +M <: SystemParticipant[_ <: CalcRelevantData, PD, MS],
@@ -156,7 +156,7 @@ object BaseStateData {
     _ <: CalcRelevantData,
     P,
     _,
-  ], +P <: PrimaryDataWithApparentPower[P]](
+  ], +P <: PrimaryDataWithComplexPower[P]](
       model: M,
       override val startDate: ZonedDateTime,
       override val endDate: ZonedDateTime,
@@ -207,7 +207,7 @@ object BaseStateData {
     *   Type of model, the base state data is attached to
     */
   final case class ParticipantModelBaseStateData[
-      +PD <: PrimaryDataWithApparentPower[PD],
+      +PD <: PrimaryDataWithComplexPower[PD],
       CD <: CalcRelevantData,
       MS <: ModelState,
       M <: SystemParticipant[_ <: CalcRelevantData, PD, MS],
@@ -272,7 +272,7 @@ object BaseStateData {
     * @return
     *   A copy of the base data with updated value stores
     */
-  def updateBaseStateData[PD <: PrimaryDataWithApparentPower[PD]](
+  def updateBaseStateData[PD <: PrimaryDataWithComplexPower[PD]](
       baseStateData: BaseStateData[PD],
       updatedResultValueStore: ValueStore[PD],
       updatedRequestValueStore: ValueStore[PD],

src/main/scala/edu/ie3/simona/agent/participant/statedata/DataCollectionStateData.scala

@@ -8,7 +8,7 @@ package edu.ie3.simona.agent.participant.statedata
 
 import org.apache.pekko.actor.ActorRef
 import edu.ie3.simona.agent.participant.data.Data
-import edu.ie3.simona.agent.participant.data.Data.PrimaryData.PrimaryDataWithApparentPower
+import edu.ie3.simona.agent.participant.data.Data.PrimaryData.PrimaryDataWithComplexPower
 
 import scala.reflect.{ClassTag, classTag}
 
@@ -24,10 +24,10 @@ import scala.reflect.{ClassTag, classTag}
   *   True, if an [[edu.ie3.simona.ontology.messages.Activation]] has already
   *   arrived
   * @tparam PD
-  *   Type of the [[PrimaryDataWithApparentPower]], that the model will produce
+  *   Type of the [[PrimaryDataWithComplexPower]], that the model will produce
   *   or receive as primary data
   */
-final case class DataCollectionStateData[+PD <: PrimaryDataWithApparentPower[
+final case class DataCollectionStateData[+PD <: PrimaryDataWithComplexPower[
   PD
 ]](
     baseStateData: BaseStateData[PD],

src/main/scala/edu/ie3/simona/agent/participant/statedata/ParticipantStateData.scala

@@ -8,7 +8,7 @@ package edu.ie3.simona.agent.participant.statedata
 
 import edu.ie3.datamodel.models.input.container.ThermalGrid
 import edu.ie3.datamodel.models.input.system.SystemParticipantInput
-import edu.ie3.simona.agent.participant.data.Data.PrimaryData.PrimaryDataWithApparentPower
+import edu.ie3.simona.agent.participant.data.Data.PrimaryData.PrimaryDataWithComplexPower
 import edu.ie3.simona.agent.participant.data.Data.{PrimaryData, SecondaryData}
 import edu.ie3.simona.agent.participant.data.secondary.SecondaryDataService
 import edu.ie3.simona.config.SimonaConfig
@@ -261,11 +261,11 @@ object ParticipantStateData {
     *   Mapping from service provider to foreseen next tick, it will send new
     *   data
     * @tparam PD
-    *   Type of [[PrimaryDataWithApparentPower]], that is covered by given
+    *   Type of [[PrimaryDataWithComplexPower]], that is covered by given
     *   [[BaseStateData]]
     */
   final case class CollectRegistrationConfirmMessages[
-      +PD <: PrimaryDataWithApparentPower[PD]
+      +PD <: PrimaryDataWithComplexPower[PD]
   ](
       baseStateData: BaseStateData[PD],
       pendingResponses: Iterable[ClassicActorRef],