Merge branch 'dev' into ms/#1292-add-updated-bdew-standard-load-profiles

# Conflicts:
#	CHANGELOG.md

Author: staudtMarius

CHANGELOG.md

@@ -7,11 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased/Snapshot]
 
 ### 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)
+- Enhancing Validation for sRated of `HpTypeInput` [1394](https://github.com/ie3-institute/PowerSystemDataModel/issues/1394)
 - Added updated `BdewStandardLoadProfiles` [#1292](https://github.com/ie3-institute/PowerSystemDataModel/issues/1292)
 
-### Fixed
-
 ### Changed
+- Fixed CFF-Version [#1392](https://github.com/ie3-institute/PowerSystemDataModel/issues/1392)
 
 ## [8.0.0] - 2025-07-22
 

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/factory/Factory.java

@@ -174,10 +174,11 @@ public Try<Void, ValidationException> validate(
                   + "' are possible (NOT case-sensitive!):\n"
                   + possibleOptions));
     } else {
+      // find all unused fields
       Set<String> unused = getUnusedFields(harmonizedActualFields, validFieldSets);
 
       if (!unused.isEmpty()) {
-        log.debug(
+        log.info(
             "The following additional fields were found for entity class of '{}': {}",
             entityClass.getSimpleName(),
             unused);

src/main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantInputEntityFactory.java

@@ -30,23 +30,26 @@ public abstract class SystemParticipantInputEntityFactory<
         T extends SystemParticipantInput, D extends SystemParticipantEntityData>
     extends AssetInputEntityFactory<T, D> {
 
+  private static final String NODE = "node";
+
   private static final String Q_CHARACTERISTICS = "qCharacteristics";
 
   public static final String CONTROLLING_EM = "controllingEm";
 
+  @SafeVarargs
   protected SystemParticipantInputEntityFactory(Class<? extends T>... allowedClasses) {
     super(allowedClasses);
   }
 
   @Override
   protected List<Set<String>> getFields(Class<?> entityClass) {
     List<Set<String>> fields = new ArrayList<>(super.getFields(entityClass));
-    for (Set<String> set : fields) set.add(Q_CHARACTERISTICS);
-
-    List<Set<String>> withEm =
-        fields.stream().map(f -> (Set<String>) expandSet(f, CONTROLLING_EM)).toList();
 
-    fields.addAll(withEm);
+    for (Set<String> set : fields) {
+      set.add(Q_CHARACTERISTICS);
+      set.add(NODE);
+      set.add(CONTROLLING_EM);
+    }
 
     return fields;
   }

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/result/system/HpResult.java

@@ -20,7 +20,7 @@ public class HpResult extends SystemParticipantWithHeatResult {
    * @param inputModel uuid of the input model that produces the result
    * @param p active power output normally provided in MW
    * @param q reactive power output normally provided in MVAr
-   * @param qDot provided head energy
+   * @param qDot provided heat energy
    */
   public HpResult(
       ZonedDateTime time,