Merge pull request #836 from ie3-institute/ms/#835-update-to-psdm-5.1

Updating to PSDM version 5.1.0

CHANGELOG.md

@@ -51,6 +51,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactoring of `GridAgent` messages [#736](https://github.com/ie3-institute/simona/issues/736)
 - Rewrote PVModelTest from groovy to scala [#646](https://github.com/ie3-institute/simona/issues/646)
 - Making configuration of `RefSystem` via config optional [#769](https://github.com/ie3-institute/simona/issues/769)
+- Updated PSDM to version 5.1.0 [#835](https://github.com/ie3-institute/simona/issues/835)
 
 ### Fixed
 - Removed a repeated line in the documentation of vn_simona config [#658](https://github.com/ie3-institute/simona/issues/658)

build.gradle

@@ -75,7 +75,7 @@ dependencies {
     /* Exclude our own nested dependencies */
     exclude group: 'com.github.ie3-institute'
   }
-  implementation('com.github.ie3-institute:PowerSystemDataModel:5.0.1') {
+  implementation('com.github.ie3-institute:PowerSystemDataModel:5.1.0') {
     exclude group: 'org.apache.logging.log4j'
     exclude group: 'org.slf4j'
     /* Exclude our own nested dependencies */

src/main/scala/edu/ie3/simona/service/weather/SampleWeatherSource.scala

@@ -168,6 +168,18 @@ object SampleWeatherSource {
       else
         Vector.empty[CoordinateDistance].asJava
     }
+
+    override def findCornerPoints(
+        point: Point,
+        distance: ComparableQuantity[Length],
+    ): util.List[CoordinateDistance] = {
+      // just a dummy implementation, because this is just a sample weather source
+      getClosestCoordinates(point, 4, distance)
+    }
+
+    override def validate(): Unit = {
+      /* nothing to do here */
+    }
   }
 
   // these lists contain the hourly weather values for each first of the month of 2011 + january of

src/test/scala/edu/ie3/simona/service/weather/WeatherSourceSpec.scala

@@ -450,5 +450,17 @@ case object WeatherSourceSpec {
     ): util.List[CoordinateDistance] = {
       calculateCoordinateDistances(coordinate, n, coordinateToId.keySet.asJava)
     }
+
+    override def findCornerPoints(
+        point: Point,
+        distance: ComparableQuantity[Length],
+    ): util.List[CoordinateDistance] = {
+      // just a dummy implementation
+      getClosestCoordinates(point, 4, distance)
+    }
+
+    override def validate(): Unit = {
+      /* nothing to do here */
+    }
   }
 }

src/test/scala/edu/ie3/simona/service/weather/WeatherSourceWrapperSpec.scala

@@ -318,9 +318,7 @@ object WeatherSourceWrapperSpec {
       ),
     )
 
-    override def getSourceFields[C <: WeatherValue](
-        entityClass: Class[C]
-    ): Optional[util.Set[String]] =
+    override def getSourceFields: Optional[util.Set[String]] =
       // only required for validation
       Optional.empty
 

src/test/scala/edu/ie3/simona/test/common/input/EmInputTestData.scala

@@ -78,9 +78,6 @@ trait EmInputTestData
     Quantities.getQuantity(5d, KILOWATT),
     Quantities.getQuantity(0.03, PU_PER_HOUR),
     Quantities.getQuantity(0.95, PU),
-    Quantities.getQuantity(20d, PERCENT),
-    Quantities.getQuantity(50000d, HOUR),
-    100000,
   )
 
   protected val householdStorageInput = new StorageInput(