Skip to content

Commit a3e1524

Browse files
Merge branch 'dev' into kk/#1139-rtd-page-for-available-converters-to-and-from-PSDM
# Conflicts: # CHANGELOG.md
2 parents b2b1856 + 15383c6 commit a3e1524

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+196
-79
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
### Added
1010
- Added weathersource documentation [#1390](https://github.com/ie3-institute/PowerSystemDataModel/issues/1390)
1111
- Added standard asset parameter for `3wTransformer` in `ReadTheDocs` [#1417](https://github.com/ie3-institute/PowerSystemDataModel/issues/1417)
12+
- Added getter sRated for SystemParticipant inputs and updated them in tests in src[#1412](https://github.com/ie3-institute/PowerSystemDataModel/issues/1412)
1213
- Added psdmconverts.md in the io folder and linked it to the basicusage.md[#1139](https://github.com/ie3-institute/PowerSystemDataModel/issues/1139)
1314

1415
### Fixed
1516
- Fixed small issues in tests [#1400](https://github.com/ie3-institute/PowerSystemDataModel/issues/1400)
1617
- Fix transformer susceptance in readTheDocs to negative values [#1078](https://github.com/ie3-institute/PowerSystemDataModel/issues/1078)
1718
- Added mising fields to field validation [#1422](https://github.com/ie3-institute/PowerSystemDataModel/issues/1422)
1819
- Fixed the issues with rtd for Cylindrical thermal storage [#1273](https://github.com/ie3-institute/PowerSystemDataModel/issues/1273)
20+
- Updated Controlling_em for all the loads in readthedocs[#1447](https://github.com/ie3-institute/PowerSystemDataModel/issues/1447)
1921

2022
### Changed
2123
- Updated CI-Pipeline to run task `Deploy` and `Staging` only for `Main` [#1403](https://github.com/ie3-institute/PowerSystemDataModel/issues/1403)
2224
- Extend `GermanVoltageLevelUtils` with more synonymousIds [#143](https://github.com/ie3-institute/PowerSystemDataModel/issues/143)
2325
- Change spotless to use googleJavaFormat('1.28.0') [#1409](https://github.com/ie3-institute/PowerSystemDataModel/issues/1409)
26+
- Change `TimeSeries` to no longer extend `UniqueEntity` [#1441](https://github.com/ie3-institute/PowerSystemDataModel/issues/1441)
2427

2528
## [8.1.0] - 2025-07-25
2629

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ plugins {
44
id 'maven-publish'
55
id 'signing'
66
id 'pmd' // code check, working on source code
7-
id 'com.diffplug.spotless' version '7.2.1' //code format
8-
id 'com.github.spotbugs' version '6.2.6' // code check, working on byte code
7+
id 'com.diffplug.spotless' version '8.0.0' //code format
8+
id 'com.github.spotbugs' version '6.4.2' // code check, working on byte code
99
id 'de.undercouch.download' version '5.6.0'
1010
id 'kr.motd.sphinx' version '2.10.1' // documentation generation
1111
id 'jacoco' // java code coverage plugin
@@ -92,15 +92,15 @@ dependencies {
9292
testImplementation "org.testcontainers:couchbase:$testcontainersVersion"
9393

9494
// logging
95-
implementation platform('org.apache.logging.log4j:log4j-bom:2.25.1')
95+
implementation platform('org.apache.logging.log4j:log4j-bom:2.25.2')
9696
implementation 'org.apache.logging.log4j:log4j-api' // log4j
9797
implementation 'org.apache.logging.log4j:log4j-core' // log4j
9898
implementation 'org.apache.logging.log4j:log4j-slf4j-impl' // log4j -> slf4j
9999

100100
// Databases
101101
implementation 'org.influxdb:influxdb-java:2.25'
102-
implementation 'com.couchbase.client:java-client:3.9.0'
103-
runtimeOnly 'org.postgresql:postgresql:42.7.7' // postgresql jdbc driver required during runtime
102+
implementation 'com.couchbase.client:java-client:3.9.1'
103+
runtimeOnly 'org.postgresql:postgresql:42.7.8' // postgresql jdbc driver required during runtime
104104

105105
implementation 'commons-io:commons-io:2.20.0' // I/O functionalities
106106
implementation 'commons-codec:commons-codec:1.19.0' // needed by commons-compress

docs/readthedocs/models/input/em.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Participants are connected to an EM each via their `em` field.
4040
* - controllingEm
4141
-
4242
- Reference to a superior Energy Management Unit that is controlling this EM.
43-
Field can be empty or missing, if this EM itself is not controlled.
43+
Field can be empty, if this EM itself is not controlled.
4444
4545
```
4646

docs/readthedocs/models/input/participant/bm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Model of a biomass power plant.
110110
* - controllingEm
111111
-
112112
- UUID reference to an [Energy Management Unit](#em_model) that is controlling
113-
this system participant. Field can be empty or missing, if this participant
113+
this system participant. Field can be empty, if this participant
114114
is not controlled.
115115
116116
```

docs/readthedocs/models/input/participant/chp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Combined heat and power plant.
117117
* - controllingEm
118118
-
119119
- UUID reference to an [Energy Management Unit](em_model) that is controlling
120-
this system participant. Field can be empty or missing, if this participant
120+
this system participant. Field can be empty, if this participant
121121
is not controlled.
122122
123123
```

docs/readthedocs/models/input/participant/ev.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Model of an electric vehicle, that is occasionally connected to the grid via an
100100
* - controllingEm
101101
-
102102
- UUID reference to an [Energy Management Unit](#em_model) that is controlling
103-
this system participant. Field can be empty or missing, if this participant
103+
this system participant. Field can be empty, if this participant
104104
is not controlled.
105105
106106
```

docs/readthedocs/models/input/participant/evcs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ station and has some limitations outlined below.
6666
* - controllingEm
6767
-
6868
- UUID reference to an [Energy Management Unit](#em_model) that is controlling
69-
this system participant. Field can be empty or missing, if this participant
69+
this system participant. Field can be empty, if this participant
7070
is not controlled.
7171
7272
```

docs/readthedocs/models/input/participant/fixedfeedin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ model can be derived.
5252
* - controllingEm
5353
-
5454
- UUID reference to an [Energy Management Unit](#em_model) that is controlling
55-
this system participant. Field can be empty or missing, if this participant
55+
this system participant. Field can be empty, if this participant
5656
is not controlled.
5757
5858
```

docs/readthedocs/models/input/participant/hp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Model of a heat pump.
9696
* - controllingEm
9797
-
9898
- UUID reference to an [Energy Management Unit](#em_model) that is controlling
99-
this system participant. Field can be empty or missing, if this participant
99+
this system participant. Field can be empty, if this participant
100100
is not controlled.
101101
102102

docs/readthedocs/models/input/participant/load.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Model of (mainly) domestic loads.
5959
* - controllingEm
6060
-
6161
- UUID reference to an [Energy Management Unit](#em_model) that is controlling
62-
this system participant. Field can be empty or missing, if this participant
62+
this system participant. Field can be empty, if this participant
6363
is not controlled.
6464
6565
```

0 commit comments

Comments
 (0)