Skip to content

Commit 0e8e809

Browse files
Merge pull request #1267 from ie3-institute/rel/sp/#1266-release-6.0
Release 6.0
2 parents 504d73a + 00feda2 commit 0e8e809

File tree

293 files changed

+11544
-4248
lines changed

Some content is hidden

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

293 files changed

+11544
-4248
lines changed

.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ updates:
99
target-branch: dev
1010
reviewers:
1111
- t-ober
12-
- sensarmad
12+
- staudtMarius
1313
- sebastian-peter
1414
- danielfeismann
1515
- jo-bao

CHANGELOG.md

+36-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,45 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased/Snapshot]
88

9+
## [6.0.0] - 2025-02-27
10+
911
### Added
12+
- Enhance `TimeSeriesSource` with method to retrieve all time keys after a given key [#543](https://github.com/ie3-institute/PowerSystemDataModel/issues/543)
13+
- Enhance `WeatherSource` with method to retrieve all time keys after a given key [#572](https://github.com/ie3-institute/PowerSystemDataModel/issues/572)
14+
- Adding timeseries for voltage values [#1128](https://github.com/ie3-institute/PowerSystemDataModel/issues/1128)
15+
- Added Staudt to list of reviewers [#1190](https://github.com/ie3-institute/PowerSystemDataModel/issues/1190)
16+
- Extend ValidationUtils for validating ThermalGrids [#1216](https://github.com/ie3-institute/PowerSystemDataModel/issues/1216)
17+
- Enhance `TimeSeriesSource` with method to retrieve the previous value before a given key [#1182](https://github.com/ie3-institute/PowerSystemDataModel/issues/1182)
18+
- Added `BdewLoadProfileTimeSeries` [#1230](https://github.com/ie3-institute/PowerSystemDataModel/issues/1230)
19+
- Added `RandomLoadProfileTimeSeries` [#1232](https://github.com/ie3-institute/PowerSystemDataModel/issues/1232)
20+
- Attribute `pThermalRated` for `ThermalStorage`s [#679](https://github.com/ie3-institute/PowerSystemDataModel/issues/679)
21+
- Attributes `housingType` and `numberInhabitants` for `ThermalHouse`s [#1253](https://github.com/ie3-institute/PowerSystemDataModel/issues/1253)
22+
- Added domestic hot water storage model [#1257](https://github.com/ie3-institute/PowerSystemDataModel/issues/1257)
23+
- Validation for BDEW load profile values [#1243](https://github.com/ie3-institute/PowerSystemDataModel/issues/1243)
24+
- Added load profiles sources [#1106](https://github.com/ie3-institute/PowerSystemDataModel/issues/1106)
1025

1126
### Fixed
27+
- Removing opened `SwitchInput` during connectivity check [#1221](https://github.com/ie3-institute/PowerSystemDataModel/issues/1221)
28+
- Fixed example in ReadTheDocs [#1244](https://github.com/ie3-institute/PowerSystemDataModel/issues/1244)
29+
- Remove double test in ThermalValidationUtils [#1260](https://github.com/ie3-institute/PowerSystemDataModel/issues/1260)]
1230

1331
### Changed
32+
- Storage minimum level parameter removed from cylindrical thermal storage [#1123](https://github.com/ie3-institute/PowerSystemDataModel/issues/1123)
33+
- Converted eval-rst to myst syntax in ReadTheDocs, fixed line wrapping and widths [#1137](https://github.com/ie3-institute/PowerSystemDataModel/issues/1137)
34+
- Improving usage of streams on sql fetches [#827](https://github.com/ie3-institute/PowerSystemDataModel/issues/827)
35+
- Improving error message when using the outdated csv format [#1112](https://github.com/ie3-institute/PowerSystemDataModel/issues/1112)
36+
- Changed ThermalUnitValidation: Ensure that thermal boundaries of thermal house are not the same [#1186](https://github.com/ie3-institute/PowerSystemDataModel/issues/1186)
37+
- Converted `MappingEntry` into a normal class [#1087](https://github.com/ie3-institute/PowerSystemDataModel/issues/1087)
38+
- Renamed timeseries mapping `participant` column to `asset` [#1191](https://github.com/ie3-institute/PowerSystemDataModel/issues/1191)
39+
- Removed attribute `dsm` from `LoadInput` [#1195](https://github.com/ie3-institute/PowerSystemDataModel/issues/1195)
40+
- Fix spotless deprecations [#1123](https://github.com/ie3-institute/PowerSystemDataModel/issues/1223)
41+
- Refactored `CongestionResult`, removed `ModelResultEntity` [#1234](https://github.com/ie3-institute/PowerSystemDataModel/issues/1234)
42+
- Replaced `LoadProfileInput` with `LoadProfileTimeSeries` [#1228](https://github.com/ie3-institute/PowerSystemDataModel/issues/1228)
43+
- Enhance `CsvDataSource` [#1246](https://github.com/ie3-institute/PowerSystemDataModel/issues/1246)
44+
- Updated `_joint_grid` csv files from simona [#750](https://github.com/ie3-institute/PowerSystemDataModel/issues/750)
45+
46+
### Updates
47+
- Updated gradle to v8.13 [#1264](https://github.com/ie3-institute/PowerSystemDataModel/issues/1264)
1448

1549
## [5.1.0] - 2024-06-24
1650

@@ -302,7 +336,8 @@ coordinates or multiple exactly equal coordinates possible
302336
- CsvDataSource now stops trying to get an operator for empty operator uuid field in entities
303337
- CsvDataSource now parsing multiple geoJson strings correctly
304338

305-
[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.1.0...HEAD
339+
[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/6.0.0...HEAD
340+
[6.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.1.0...6.0.0
306341
[5.1.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.0.1...5.1.0
307342
[5.0.1]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.0.0...5.0.1
308343
[5.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/4.1.0...5.0.0

build.gradle

+23-16
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,24 @@ plugins {
44
id 'maven-publish'
55
id 'signing'
66
id 'pmd' // code check, working on source code
7-
id 'com.diffplug.spotless' version '6.25.0' //code format
8-
id 'com.github.spotbugs' version '6.0.18' // code check, working on byte code
7+
id 'com.diffplug.spotless' version '7.0.2' //code format
8+
id 'com.github.spotbugs' version '6.1.6' // 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
12-
id "org.sonarqube" version "5.0.0.4638" // sonarqube
12+
id "org.sonarqube" version "6.0.1.5171" // sonarqube
1313
id 'net.thauvin.erik.gradle.semver' version '1.0.4' // semantic versioning
14+
id "com.github.johnrengelman.shadow" version "8.1.1" // fat jar
1415
}
1516

1617
ext {
1718
//version (changing these should be considered thoroughly!)
1819
javaVersion = JavaVersion.VERSION_17
1920
groovyVersion = "4.0"
20-
groovyBinaryVersion = "4.0.21"
21-
testcontainersVersion = '1.19.8'
21+
groovyBinaryVersion = "4.0.25"
22+
23+
junitVersion = '1.12.0'
24+
testcontainersVersion = '1.20.5'
2225

2326
scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
2427
}
@@ -55,25 +58,29 @@ dependencies {
5558
// ie³ power system utils
5659
implementation 'com.github.ie3-institute:PowerSystemUtils:2.2.1'
5760

58-
implementation 'tech.units:indriya:2.2'
61+
implementation 'tech.units:indriya:2.2.2'
5962

6063
// JTS Topology Suite for GeoPositions, License: EPL 1.0 / EDL 1.0
61-
implementation ('org.locationtech.jts:jts-core:1.19.0'){
64+
implementation ('org.locationtech.jts:jts-core:1.20.0'){
6265
exclude group: 'junit', module: 'junit'
6366
}
6467

65-
implementation 'org.locationtech.jts.io:jts-io-common:1.19.0'
68+
implementation 'org.locationtech.jts.io:jts-io-common:1.20.0'
6669

6770
// Graphs
6871
implementation 'org.jgrapht:jgrapht-core:1.5.2'
6972

73+
// Statistics (for random load model)
74+
implementation 'de.lmu.ifi.dbs.elki:elki:0.7.5'
75+
7076
// testing
7177
testImplementation "org.apache.groovy:groovy:$groovyBinaryVersion"
7278

73-
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
79+
testImplementation "org.junit.platform:junit-platform-launcher:$junitVersion"
80+
testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"
7481
testImplementation "org.spockframework:spock-core:2.3-groovy-$groovyVersion"
7582
testImplementation 'org.objenesis:objenesis:3.4' // Mock creation with constructor parameters
76-
testImplementation 'net.bytebuddy:byte-buddy:1.14.17' // Mocks of classes
83+
testImplementation 'net.bytebuddy:byte-buddy:1.17.1' // Mocks of classes
7784

7885
// testcontainers (docker framework for testing)
7986
testImplementation "org.testcontainers:testcontainers:$testcontainersVersion"
@@ -83,19 +90,19 @@ dependencies {
8390
testImplementation "org.testcontainers:couchbase:$testcontainersVersion"
8491

8592
// logging
86-
implementation platform('org.apache.logging.log4j:log4j-bom:2.23.1')
93+
implementation platform('org.apache.logging.log4j:log4j-bom:2.24.3')
8794
implementation 'org.apache.logging.log4j:log4j-api' // log4j
8895
implementation 'org.apache.logging.log4j:log4j-core' // log4j
8996
implementation 'org.apache.logging.log4j:log4j-slf4j-impl' // log4j -> slf4j
9097

9198
// Databases
9299
implementation 'org.influxdb:influxdb-java:2.24'
93-
implementation 'com.couchbase.client:java-client:3.7.0'
94-
runtimeOnly 'org.postgresql:postgresql:42.7.3' // postgresql jdbc driver required during runtime
100+
implementation 'com.couchbase.client:java-client:3.7.8'
101+
runtimeOnly 'org.postgresql:postgresql:42.7.5' // postgresql jdbc driver required during runtime
95102

96-
implementation 'commons-io:commons-io:2.16.1' // I/O functionalities
97-
implementation 'commons-codec:commons-codec:1.17.0' // needed by commons-compress
98-
implementation 'org.apache.commons:commons-compress:1.26.2' // I/O functionalities
103+
implementation 'commons-io:commons-io:2.18.0' // I/O functionalities
104+
implementation 'commons-codec:commons-codec:1.18.0' // needed by commons-compress
105+
implementation 'org.apache.commons:commons-compress:1.27.1' // I/O functionalities
99106
}
100107

101108
tasks.withType(JavaCompile) {

docs/readthedocs/_static/css/theme_override.css

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@
1010
}
1111
.wy-table-responsive table th p {
1212
margin-bottom: 0;
13-
}
13+
}
14+
15+
table.wrapping td {
16+
white-space: normal;
17+
}

docs/readthedocs/io/ValidationUtils.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The methods in ValidationUtils and subclasses can be used to check that objects
1111
The general validation checks:
1212
- if assigned values are valid, e.g. lines are not allowed to have negative lengths or the rated power factor of any unit must be between 0 and 1
1313
- furthermore, several connections are checked, e.g. that lines only connect nodes of the same voltage level or that the voltage levels indicated for the transformer sides match the voltage levels of the nodes they are connected to.
14-
- the connectivity of the given grid for all defined operation intervals
14+
- the connectivity of the given grid for all defined operation intervals, if a switch is opened, it is filtered out for the connectivity check
1515

1616
The uniqueness validation checks if a collection of given objects are unique in either:
1717
- a specific field
@@ -74,7 +74,7 @@ The ValidationUtils include validation checks for...
7474
- HpTypeInput
7575
- StorageTypeInput
7676
- WecTypeInput
77-
- ThermalUnitValidationUtils
77+
- ThermalValidationUtils
7878
- ThermalUnitInput
7979
- ThermalSinkInput
8080
- ThermalHouseInput

0 commit comments

Comments
 (0)