Merge branch 'dev' into df/#1352-air-condition-input

Author: danielfeismann

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Enhanced check for invalid field names in sources [#1383](https://github.com/ie3-institute/PowerSystemDataModel/issues/1383)
 - Enhancing value retrieval in `TimeSeriesSource` [1280](https://github.com/ie3-institute/PowerSystemDataModel/issues/1280)
+- Enhancing the `LoadProfileSource` to return the resolution [1288](https://github.com/ie3-institute/PowerSystemDataModel/issues/1288)
 
 ### Fixed
 
@@ -30,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Extend azimuth angle range to [-180°, 180°] for PV inputs [#1330](https://github.com/ie3-institute/PowerSystemDataModel/issues/1330)
 - Improved error messages when reading and validating an invalid grid [#1354](https://github.com/ie3-institute/PowerSystemDataModel/issues/1354)
 - Changed `SubgridContainer` to represent galvanically seperated grids [#1226](https://github.com/ie3-institute/PowerSystemDataModel/issues/1226)
+- Fixed CFF-Version [#1392](https://github.com/ie3-institute/PowerSystemDataModel/issues/1392)
 
 ## [7.0.0] - 2025-05-08
 

CITATION.cff

@@ -1,4 +1,4 @@
-cff-version: 1.0.0
+cff-version: 1.2.0
 title: "PowerSystemDataModel - Provides an elaborated data model to model energy systems with a high granularity."
 message: "If you use this software, please cite it as below."
 type: software

build.gradle

@@ -18,7 +18,7 @@ ext {
   //version (changing these should be considered thoroughly!)
   javaVersion = JavaVersion.VERSION_17
   groovyVersion = "4.0"
-  groovyBinaryVersion = "4.0.27"
+  groovyBinaryVersion = "4.0.28"
 
   junitVersion = '1.12.0'
   testcontainersVersion = '1.21.3'

src/main/java/edu/ie3/datamodel/io/source/LoadProfileSource.java

@@ -88,6 +88,23 @@ protected Try<LoadProfileEntry<V>, FactoryException> createEntries(
   /** Returns the load profile energy scaling for this load profile time series. */
   public abstract Optional<ComparableQuantity<Energy>> getLoadProfileEnergyScaling();
 
+  /**
+   * Returns the resolution for the given {@link LoadProfile}.
+   *
+   * @param loadProfile given load profile
+   * @return the resolution in seconds.
+   */
+  public static long getResolution(LoadProfile loadProfile) {
+
+    if (loadProfile == LoadProfile.DefaultLoadProfiles.NO_LOAD_PROFILE) {
+      // since no load profile was assigned, we return the maximal possible value
+      return Long.MAX_VALUE;
+    } else {
+      // currently all registered profiles and all sources use 15 minutes intervals
+      return 900L;
+    }
+  }
+
   /**
    * Method to read in the build-in {@link BdewStandardLoadProfile}s.
    *

src/test/groovy/edu/ie3/datamodel/io/source/LoadProfileSourceTest.groovy

@@ -8,11 +8,25 @@ package edu.ie3.datamodel.io.source
 import static edu.ie3.datamodel.models.profile.LoadProfile.RandomLoadProfile.RANDOM_LOAD_PROFILE
 
 import edu.ie3.datamodel.models.profile.BdewStandardLoadProfile
+import edu.ie3.datamodel.models.profile.LoadProfile
 import spock.lang.Specification
 
 class LoadProfileSourceTest extends Specification {
 
-  def "A LoadProfileSourceTest should read in all build-in BDEWStandardLoadProfiles"() {
+  def "A LoadProfileSource should return the correct profile resolution for a given load profile"() {
+    given:
+    def allProfiles = LoadProfile.getAllProfiles()
+
+
+    when:
+    def resolutions = Arrays.stream(allProfiles).map { it -> LoadProfileSource.getResolution(it) }.toList()
+
+    then:
+    resolutions.every { resolution -> resolution == 900 }
+  }
+
+
+  def "A LoadProfileSource should read in all build-in BDEWStandardLoadProfiles"() {
     when:
     def profiles = LoadProfileSource.bdewLoadProfiles
 
@@ -22,7 +36,7 @@ class LoadProfileSourceTest extends Specification {
     profiles.values().every { it.timeSeries.entries.size() == 96 }
   }
 
-  def "A LoadProfileSourceTest should read in the build-in RandomLoadProfile"() {
+  def "A LoadProfileSource should read in the build-in RandomLoadProfile"() {
     when:
     def random = LoadProfileSource.randomLoadProfile.timeSeries