Skip to content

Adapt to enhancement of EvModel regarding cosPhi #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
9 changes: 7 additions & 2 deletions src/main/scala/edu/ie3/mobsim/model/ElectricVehicle.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/edu/ie3/mobsim/model/EvType.scala
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ object EvType {
.getsRated()
.to(PowerSystemUnits.KILOWATT)
.getValue
.doubleValue()
.doubleValue() * evTypeInput.getCosPhiRated
),
Kilowatts(
evTypeInput
Expand Down