Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
67b6d40
Introducing EmAgent (cherry-picked from all/#tbw-wHp-squants-2023-12)
sebastian-peter Feb 8, 2024
1d3be41
Merge branch 'dev' into sp/#204-EmAgent-NEW
sebastian-peter Feb 23, 2024
772c783
Removing storage stuff in GridAgentController for now
sebastian-peter Feb 23, 2024
ac9edb8
Removing test involving storages for now
sebastian-peter Feb 23, 2024
0129a9e
Merge branch 'dev' into sp/#204-EmAgent-NEW
sebastian-peter Feb 23, 2024
90e3659
Accounting for storage, which is not included yet
sebastian-peter Feb 23, 2024
083afbf
Merge branch 'dev' into sp/#204-EmAgent-NEW
sebastian-peter Feb 27, 2024
fae0732
Merging dev
sebastian-peter Feb 28, 2024
6e63e61
Merge branch 'dev' into sp/#204-EmAgent-NEW
sebastian-peter Mar 4, 2024
a85ad86
Merge branch 'dev' into sp/#204-EmAgent-NEW
sebastian-peter Mar 5, 2024
8c69b72
Merge branch 'dev' into sp/#204-EmAgent-NEW
sebastian-peter Mar 7, 2024
72cd1b3
Adapting to changes of new PSDM, fixing compilation errors
sebastian-peter Mar 7, 2024
b05a92a
Merge branch 'dev' into sp/#204-EmAgent-NEW
sebastian-peter Mar 11, 2024
a6b83c0
Adapting to changed time format
sebastian-peter Mar 11, 2024
ee54a17
Excluding storages for now
sebastian-peter Mar 11, 2024
0fedd64
Fixing typo
sebastian-peter Mar 11, 2024
bd13b9d
Extracting em building method
sebastian-peter Mar 11, 2024
b2a2c6e
Removing root-em/flex signal code for now
sebastian-peter Mar 11, 2024
6d0b27e
Documentation and cleaner code
sebastian-peter Mar 11, 2024
01d8833
System participants are now directly connected to the grid
sebastian-peter Mar 11, 2024
e3a0a6f
Removing unnecessary todo
sebastian-peter Mar 11, 2024
cc72ad8
Follow the message naming convention
sebastian-peter Mar 11, 2024
29440f4
Implementing phase switch for MobSim+EM combinations
sebastian-peter Mar 11, 2024
2a2b206
Fixing errors
sebastian-peter Mar 11, 2024
a5fd8d1
Removing todo
sebastian-peter Mar 11, 2024
5861489
Solving todo, cleanup
sebastian-peter Mar 11, 2024
6fd10ff
More cleanup
sebastian-peter Mar 11, 2024
b624b05
Adding disclaimer to config-template
sebastian-peter Mar 11, 2024
3a1c81d
Replacing RuntimeExceptions
sebastian-peter Mar 11, 2024
45faf3f
Importing squants.Power
sebastian-peter Mar 11, 2024
f129a57
Removing unused resources
sebastian-peter Mar 11, 2024
b86f412
Merge branch 'dev' into sp/#204-EmAgent-NEW
sebastian-peter Mar 18, 2024
d089af6
Update src/main/scala/edu/ie3/simona/model/em/EmModelShell.scala
sebastian-peter Mar 19, 2024
7b70c04
Taking care of some reviewer comments
sebastian-peter Mar 19, 2024
5d4e673
Curtailing regeneratives in general instead of just PV
sebastian-peter Mar 19, 2024
e18b460
Also adapting EmAggregateSelfOpt
sebastian-peter Mar 19, 2024
1d02a56
More addressing of reviewer's comments
sebastian-peter Mar 19, 2024
380a362
Update src/test/scala/edu/ie3/simona/model/em/PrioritizedFlexStratSpe…
sebastian-peter Mar 19, 2024
f6a30ef
Exemplary explanation of test cases in ProportionalFlexStratSpec
sebastian-peter Mar 19, 2024
8b45e2b
Correcting commentary
sebastian-peter Mar 19, 2024
c80df93
Improving commentary
sebastian-peter Mar 19, 2024
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -232,3 +232,6 @@ deploy.properties

# Ignore Gradle build output directory
build

# Ignore unwanted input directories
input/ext_sim
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Config possibility for transformer control groups [#90](https://github.com/ie3-institute/simona/issues/90)
- Implemented scaling of all relevant input parameters [#764](https://github.com/ie3-institute/simona/issues/764)
- Consider scaling factor with flex options [#734](https://github.com/ie3-institute/simona/issues/734)
- Implementation of Energy Management Agents [#204](https://github.com/ie3-institute/simona/issues/204)

### Changed
- Adapted to changed data source in PSDM [#435](https://github.com/ie3-institute/simona/issues/435)
Expand Down
12 changes: 12 additions & 0 deletions input/samples/vn_simona/vn_simona.conf
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,18 @@ simona.runtime.participant.hp = {
individualConfigs = []
}

# # # # #
# ATTENTION: calculateMissingReactivePowerWithModel and scaling is ignored here.
# # # # #
simona.runtime.participant.em = {
defaultConfig = {
calculateMissingReactivePowerWithModel = false
uuids = ["default"]
scaling = 1.0
}
individualConfigs = []
}

##################################################################
# Event Configuration
##################################################################
Expand Down
16 changes: 16 additions & 0 deletions src/main/resources/config/config-template.conf
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@ EvcsRuntimeConfig {
lowestEvSoc: Double | 0.2 # Defines the lowest possible state of charge (SoC) that an EV is allowed to uncharge in vehicle to grid (V2G) mode
}

#@define extends BaseRuntimeConfig
EmRuntimeConfig {
# # # # #
# ATTENTION: calculateMissingReactivePowerWithModel and scaling is ignored here.
# Cleaner solution is possible with different config framework.
# # # # #
baseRuntimeConfig: BaseRuntimeConfig # this entry is ignored by the config generator,
# but cannot removed bc otherwise EmRuntimeConfig is handled as String
curtailRegenerative: Boolean | false
aggregateFlex: String | "SELF_OPT_EXCL_REG"
}

#@define extends BaseRuntimeConfig
HpRuntimeConfig {
baseRuntimeConfig: BaseRuntimeConfig # this entry is ignored by the config generator,
Expand Down Expand Up @@ -312,6 +324,10 @@ simona.runtime.participant = {
defaultConfig = HpRuntimeConfig # Mandatory default config (uuids are ignored, best provide "default")
individualConfigs = [HpRuntimeConfig]
}
em = {
defaultConfig = EmRuntimeConfig # Mandatory default config (uuids are ignored, best provide "default")
individualConfigs = [EmRuntimeConfig]
}
}

##################################################################
Expand Down
Loading