diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b9029ee..fcb113da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated `Gradle` to version V8.10 [#282](https://github.com/ie3-institute/MobilitySimulator/issues/282) - Changed Spotless to format with trailing commas [#301](https://github.com/ie3-institute/MobilitySimulator/issues/301) - Adapting to recent changes in the API [#303](https://github.com/ie3-institute/MobilitySimulator/issues/303) +- Adapt to enhancement of EvModel regarding cosPhi [#335](https://github.com/ie3-institute/MobilitySimulator/issues/335) ### Fixed - Adapting to SIMONA-API changes introduced by [PR#37](https://github.com/ie3-institute/simonaAPI/pull/37) [[#7](https://github.com/ie3-institute/MobilitySimulator/issues/7)] diff --git a/src/main/scala/edu/ie3/mobsim/model/ElectricVehicle.scala b/src/main/scala/edu/ie3/mobsim/model/ElectricVehicle.scala index 5554e836..7ba933d1 100644 --- a/src/main/scala/edu/ie3/mobsim/model/ElectricVehicle.scala +++ b/src/main/scala/edu/ie3/mobsim/model/ElectricVehicle.scala @@ -99,12 +99,17 @@ final case class ElectricVehicle( PowerSystemUnits.KILOWATTHOUR, ) - def getPRatedAC: ComparableQuantity[Power] = Quantities - .getQuantity(evType.acPower.toKilowatts, PowerSystemUnits.KILOWATT) + def getSRatedAC: ComparableQuantity[Power] = Quantities + .getQuantity( + evType.acPower.toKilovoltamperes, + PowerSystemUnits.KILOVOLTAMPERE, + ) def getPRatedDC: ComparableQuantity[Power] = Quantities .getQuantity(evType.dcPower.toKilowatts, PowerSystemUnits.KILOWATT) + def getCosPhiRated: Double = ??? + def getStoredEnergy: ComparableQuantity[Energy] = storedEnergy def getDepartureTick: java.lang.Long = toTick(simulationStart, departureTime) diff --git a/src/main/scala/edu/ie3/mobsim/model/EvType.scala b/src/main/scala/edu/ie3/mobsim/model/EvType.scala index 58e693c3..17afd983 100644 --- a/src/main/scala/edu/ie3/mobsim/model/EvType.scala +++ b/src/main/scala/edu/ie3/mobsim/model/EvType.scala @@ -109,7 +109,7 @@ object EvType { .getsRated() .to(PowerSystemUnits.KILOWATT) .getValue - .doubleValue() + .doubleValue() * evTypeInput.getCosPhiRated ), Kilowatts( evTypeInput