Merge branch 'dev' into df/#1357-validation-load

Author: danielfeismann

CHANGELOG.md

@@ -8,6 +8,8 @@ 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 +32,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/main/java/edu/ie3/datamodel/io/source/TimeSeriesSource.java

@@ -52,6 +52,22 @@ public abstract IndividualTimeSeries<V> getTimeSeries(ClosedInterval<ZonedDateTi
 
   public abstract Optional<V> getValue(ZonedDateTime time);
 
+  /**
+   * Method to retrieve the value of the given time or the last timestamp before the given time.
+   *
+   * @param time given time
+   * @return an option for a value
+   */
+  public Optional<V> getValueOrLast(ZonedDateTime time) {
+    Optional<V> value = getValue(time);
+
+    if (value.isEmpty()) {
+      return getPreviousTimeBasedValue(time).map(TimeBasedValue::getValue);
+    }
+
+    return value;
+  }
+
   public abstract Optional<TimeBasedValue<V>> getPreviousTimeBasedValue(ZonedDateTime time);
 
   /**
@@ -61,4 +77,12 @@ public abstract IndividualTimeSeries<V> getTimeSeries(ClosedInterval<ZonedDateTi
    * @return a list of time keys
    */
   public abstract List<ZonedDateTime> getTimeKeysAfter(ZonedDateTime time);
+
+  /**
+   * Method to return all last known time keys before a given timestamp.
+   *
+   * @param time given time
+   * @return an option for the time key
+   */
+  public abstract Optional<ZonedDateTime> getLastTimeKeyBefore(ZonedDateTime time);
 }

src/main/java/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSource.java

@@ -142,6 +142,11 @@ public List<ZonedDateTime> getTimeKeysAfter(ZonedDateTime time) {
     return timeSeries.getTimeKeysAfter(time);
   }
 
+  @Override
+  public Optional<ZonedDateTime> getLastTimeKeyBefore(ZonedDateTime time) {
+    return timeSeries.getPreviousDateTime(time);
+  }
+
   // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
   /**

src/main/java/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSource.java

@@ -199,6 +199,15 @@ public List<ZonedDateTime> getTimeKeysAfter(ZonedDateTime time) {
         .toList();
   }
 
+  @Override
+  public Optional<ZonedDateTime> getLastTimeKeyBefore(ZonedDateTime time) {
+    return dataSource
+        .executeQuery(
+            queryForValueBefore, ps -> ps.setTimestamp(1, Timestamp.from(time.toInstant())))
+        .map(valueFactory::extractTime)
+        .max(ZonedDateTime::compareTo);
+  }
+
   // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
   /** Creates a set of TimeBasedValues from database */

src/main/java/edu/ie3/datamodel/models/timeseries/TimeSeries.java

@@ -62,7 +62,7 @@ public Optional<TimeBasedValue<R>> getTimeBasedValue(ZonedDateTime time) {
    * @param time Reference in time
    * @return The next earlier known time instant
    */
-  protected abstract Optional<ZonedDateTime> getPreviousDateTime(ZonedDateTime time);
+  public abstract Optional<ZonedDateTime> getPreviousDateTime(ZonedDateTime time);
 
   /**
    * Get the next later known time instant

src/main/java/edu/ie3/datamodel/models/timeseries/individual/IndividualTimeSeries.java

@@ -53,10 +53,10 @@ public Optional<V> getValue(ZonedDateTime time) {
   }
 
   @Override
-  protected Optional<ZonedDateTime> getPreviousDateTime(ZonedDateTime time) {
+  public Optional<ZonedDateTime> getPreviousDateTime(ZonedDateTime time) {
     return timeToValue.keySet().stream()
-        .filter(valueTime -> valueTime.compareTo(time) < 0)
-        .max(Comparator.naturalOrder());
+        .filter(valueTime -> valueTime.isBefore(time))
+        .max(ZonedDateTime::compareTo);
   }
 
   @Override

src/main/java/edu/ie3/datamodel/models/timeseries/repetitive/LoadProfileTimeSeries.java

@@ -78,7 +78,7 @@ public Set<LoadProfileEntry<V>> getEntries() {
   }
 
   @Override
-  protected Optional<ZonedDateTime> getPreviousDateTime(ZonedDateTime time) {
+  public Optional<ZonedDateTime> getPreviousDateTime(ZonedDateTime time) {
     return Optional.of(time.minusMinutes(15));
   }