Skip to content

Commit 689cb3e

Browse files
Merge branch 'dev' into sp/#267-icon-weather-scheme-adaptions
# Conflicts: # CHANGELOG.md # src/main/java/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSource.java # src/main/java/edu/ie3/datamodel/io/source/influxdb/InfluxDbWeatherSource.java # src/test/groovy/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSourceCosmoIT.groovy
2 parents 4b2243d + 3a88caa commit 689cb3e

File tree

284 files changed

+8877
-5705
lines changed

Some content is hidden

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

284 files changed

+8877
-5705
lines changed

.github/dependabot.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: gradle
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
time: "04:00"
8+
open-pull-requests-limit: 10
9+
target-branch: dev
10+
reviewers:
11+
- ckittl
12+
- johanneshiry
13+
- t-ober
14+
- sensarmad
15+
- sebastian-peter
16+
- danielfeismann
17+
ignore:
18+
- dependency-name: org.spockframework:spock-core
19+
versions:
20+
- 2.1-groovy-2.5-SNAPSHOT
21+
- 2.1-groovy-3.0-SNAPSHOT
22+
- 2.2-groovy-2.5-SNAPSHOT
23+
- 2.2-groovy-3.0-SNAPSHOT
24+
- 2.2-groovy-4.0-SNAPSHOT
25+
- 2.2-M1-groovy-2.5
26+
- 2.2-M1-groovy-3.0
27+
- 2.2-M1-groovy-4.0
28+
- 2.2-M2-groovy-2.5
29+
- 2.2-M2-groovy-3.0
30+
- 2.2-M2-groovy-4.0

.readthedocs.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# .readthedocs.yaml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4+
5+
# Required
6+
version: 2
7+
8+
# Set the version of Python and other tools you might need
9+
build:
10+
os: ubuntu-20.04
11+
tools:
12+
python: "3.9"
13+
14+
# Configure python
15+
python:
16+
install:
17+
- requirements: docs/readthedocs/requirements.txt
18+
19+
# Build documentation in the docs/ directory with Sphinx
20+
sphinx:
21+
configuration: docs/readthedocs/conf.py

CHANGELOG.md

Lines changed: 88 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,81 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased/Snapshot]
88

9+
### Added
10+
- SQL time series sources (`SqlTimeSeriesSource` and `SqlTimeSeriesMappingSource`) [#467](https://github.com/ie3-institute/PowerSystemDataModel/issues/467)
11+
- Graph with impedance weighted edges including facilities to create it [#440](https://github.com/ie3-institute/PowerSystemDataModel/issues/440)
12+
- Introducing `SqlIndividualTimeSeriesMetaInformation` which provides sql table names [#513](https://github.com/ie3-institute/PowerSystemDataModel/issues/513)
13+
14+
### Fixed
15+
- Reduced code smells [#492](https://github.com/ie3-institute/PowerSystemDataModel/issues/492)
16+
- Protected constructors for abstract classes
17+
- Use pattern matching
18+
- Remove unused imports
19+
- Use enhanced switch statements
20+
- Replace lambdas with method references
21+
- Use `Stream#toList`
22+
- Adapt visibility for JUnit 5
23+
- Fix JavaDoc creation
24+
- Create JavaDoc with java 17 instead of java 8
25+
- Let JavDoc pass, if there are warnings **ATTENTION:** Should be removed, when JavaDoc is fixed! (cf. Issue [#494](https://github.com/ie3-institute/PowerSystemDataModel/issues/494))
26+
27+
### Changed
28+
- BREAKING: PvInput Model parameter name height changed to elevationAngle [#393](https://github.com/ie3-institute/PowerSystemDataModel/issues/393) :warning:
29+
- BREAKING: Transformer's no load susceptance needs to be zero or negative to pass model validation [#378](https://github.com/ie3-institute/PowerSystemDataModel/issues/378)
30+
- All input data sets for version < 3.0.0 need to be altered!
31+
- Deprecating (as part of [#513](https://github.com/ie3-institute/PowerSystemDataModel/issues/513)):
32+
- `edu.ie3.datamodel.io.csv.timeseries.ColumnScheme`
33+
- `edu.ie3.datamodel.io.csv.FileNameMetaInformation`
34+
- `edu.ie3.datamodel.io.csv.timeseries.IndividualTimeSeriesMetaInformation`
35+
- `edu.ie3.datamodel.io.csv.timeseries.LoadProfileTimeSeriesMetaInformation`
36+
- `edu.ie3.datamodel.io.connectors.CsvFileConnector.CsvIndividualTimeSeriesMetaInformation`
37+
- and related methods
38+
- BREAKING: Comprehensive harmonization around weather sources [#267](https://github.com/ie3-institute/PowerSystemDataModel/issues/267)
39+
- Adapted the expected column scheme
40+
- General weather model
41+
- `coordinate` to `coordinateid`
42+
- DWD COSMO model
43+
- `diffuseirradiation` to `diffuseirradiance`
44+
- `directirradiation` to `directirradiance`
45+
- ICON model:
46+
- `"datum"` to `"time"`
47+
- Get field name in different casing (to actually get the column name in database, file, ...)
48+
- Force user to provide time stamp pattern to `CouchbaseWeatherSource` to ensure harmonized querying
49+
50+
## [2.1.0] - 2022-01-05
51+
52+
### Added
53+
- added `EvcsLocationType` support in `EvcsInput` and `EvcsInputFactory` [#406](https://github.com/ie3-institute/PowerSystemDataModel/issues/406)
54+
- Opportunity to close writer in `CsvFileSink`
55+
- Generified SQL data sources for future extensions
56+
57+
### Fixed
58+
- adapted `LineInput` constructor to convert line length to `StandardUnits.LINE_LENGTH` [#412](https://github.com/ie3-institute/PowerSystemDataModel/issues/412)
59+
60+
### Changed
61+
- Writers used to write time series are closed right away
62+
63+
## [2.0.1] - 2021-07-08
64+
65+
### Fixed
66+
- fix CHANGELOG.md
67+
- replace `LogManager` calls with `LogFactory` for facade logging support
68+
69+
## [2.0.0] - 2021-05-21
70+
71+
### Added
72+
- added `ResultEntitySource` interface
73+
- added `CsvResultEntitySource` implementation to read `ResultEntity` instances from .csv files
74+
- added target temperature including tolerance boundaries to `ThermalHouseInput`
75+
76+
### Changed
77+
- separated entity and file naming and introduced a new FileNamingStrategy taking an EntityNamingStrategy and a FileHierarchy as arguments
78+
79+
### Fixed
80+
- `CsvSystemParticipantSource#getSystemParticipants()` now correctly returns electric vehicle charging station input models [PR#370](https://github.com/ie3-institute/PowerSystemDataModel/pull/370)
81+
82+
## [2.0.0] - 2021-05-21
83+
984
### Added
1085
- definition for a default input file directory structure
1186
- tarball utils to extract and compress files
@@ -30,12 +105,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
30105
- Reworking the time series source (one source per time series, distinct mapping source, factory pattern)
31106
- BREAKING: Moved methods `buildSafe{Coord,Point,LineString,LineStringBetweenCoords,LineStringBetweenPoints}`, `totalLengthOfLineString` from `GridAndGeoUtils` to `GeoUtils` in [_PowerSystemUtils_](https://github.com/ie3-institute/PowerSystemUtils)
32107
- BREAKING: Moved `CoordinateDistance` to [_PowerSystemUtils_](https://github.com/ie3-institute/PowerSystemUtils)
33-
- BREAKING: Weather source
34-
- Adapted data scheme (COSMO: `"coordinate"` to `"coordinate id"`, `"irradiation"` to `"irradiance"`, ICON: `"datum"` to `"time"`)
35-
- Harmonized the source of coordinate id column name across implementations of `WeatherSource`
36-
- Get field name in different casing (to actually get the column name in database, file, ...)
37-
- Force user to provide time stamp pattern to `CouchbaseWeatherSource` to ensure harmonized querying
38-
- Use naming convention dependent field names from factories within `InfluxDBWeatherSource`
108+
- Factory methods for `SubGridGate`
109+
- BREAKING: Inheritance hierarchy of exceptions all around entity validation
110+
111+
### Removed
112+
- BREAKING: Removed deprecated code parts
113+
- Intermingled builder pattern and constructors in `SubGridGate`
114+
- `TarballUtils` that have been transferred to `FileIOUtils` in [_PowerSystemUtils_](https://github.com/ie3-institute/PowerSystemUtils)
115+
- `FileNamingStrategy` that has been transferred to `EntityPersistenceNamingStrategy`
116+
- `EvCharacteristicInput` and `TimeSeriesContainer` that shouldn't be used anymore
39117

40118
### Fixed
41119
- InfluxDbConnector now keeps session instead of creating a new one each call
@@ -83,5 +161,8 @@ coordinates or multiple exactly equal coordinates possible
83161
- CsvDataSource now stops trying to get an operator for empty operator uuid field in entities
84162
- CsvDataSource now parsing multiple geoJson strings correctly
85163

86-
[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/1.1.0...HEAD
164+
[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/2.1.0...HEAD
165+
[2.1.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/2.0.1...2.1.0
166+
[2.0.1]: https://github.com/ie3-institute/powersystemdatamodel/compare/2.0.0...2.0.1
167+
[2.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/1.1.0...2.0.0
87168
[1.1.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/6a49bc514be8859ebd29a3595cd58cd000498f1e...1.1.0

0 commit comments

Comments
 (0)