From b90c800cd5e14cc378b2ae696db602b25b0e11ce Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Fri, 27 May 2022 12:06:42 +0200 Subject: [PATCH 1/3] Updating PowerSystemUtils to 2.0-SNAPSHOT --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a8e6b5904d..03b0d99cf6 100644 --- a/build.gradle +++ b/build.gradle @@ -70,7 +70,7 @@ dependencies { } // ie³ internal repository - implementation('com.github.ie3-institute:PowerSystemUtils:1.6') { + implementation('com.github.ie3-institute:PowerSystemUtils:2.0-SNAPSHOT') { exclude group: 'org.apache.logging.log4j' exclude group: 'org.slf4j' /* Exclude our own nested dependencies */ From b862524905352fdcb02e97a62e9445b9c6412b45 Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Fri, 27 May 2022 12:21:10 +0200 Subject: [PATCH 2/3] Adapting tests to changed dependency --- .../service/weather/WeatherSourceSpec.scala | 18 +++++++++--------- .../weather/WeatherSourceWrapperSpec.scala | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/test/scala/edu/ie3/simona/service/weather/WeatherSourceSpec.scala b/src/test/scala/edu/ie3/simona/service/weather/WeatherSourceSpec.scala index 8988ddf682..987d42283b 100644 --- a/src/test/scala/edu/ie3/simona/service/weather/WeatherSourceSpec.scala +++ b/src/test/scala/edu/ie3/simona/service/weather/WeatherSourceSpec.scala @@ -27,7 +27,7 @@ import scala.jdk.OptionConverters._ import scala.util.{Failure, Success} class WeatherSourceSpec extends UnitSpec { - private val coordinate0 = GeoUtils.xyToPoint(7.41, 51.47) + private val coordinate0 = GeoUtils.buildPoint(51.47, 7.41) "A weather source" should { "issue a ServiceException, if there are not enough coordinates available" in { @@ -300,14 +300,14 @@ class WeatherSourceSpec extends UnitSpec { } case object WeatherSourceSpec { - private val coordinate67775 = GeoUtils.xyToPoint(7.438, 51.5) - private val coordinate531137 = GeoUtils.xyToPoint(7.375, 51.5) - private val coordinate551525 = GeoUtils.xyToPoint(7.438, 51.438) - private val coordinate278150 = GeoUtils.xyToPoint(7.375, 51.438) - private val coordinate477295 = GeoUtils.xyToPoint(12.812, 52.312) - private val coordinate537947 = GeoUtils.xyToPoint(12.812, 52.25) - private val coordinate144112 = GeoUtils.xyToPoint(12.875, 52.312) - private val coordinate165125 = GeoUtils.xyToPoint(12.875, 52.25) + private val coordinate67775 = GeoUtils.buildPoint(51.5, 7.438) + private val coordinate531137 = GeoUtils.buildPoint(51.5, 7.375) + private val coordinate551525 = GeoUtils.buildPoint(51.438, 7.438) + private val coordinate278150 = GeoUtils.buildPoint(51.438, 7.375) + private val coordinate477295 = GeoUtils.buildPoint(52.312, 12.812) + private val coordinate537947 = GeoUtils.buildPoint(52.25, 12.812) + private val coordinate144112 = GeoUtils.buildPoint(52.312, 12.875) + private val coordinate165125 = GeoUtils.buildPoint(52.25, 12.875) case object DummyWeatherSource extends WeatherSource { override protected val idCoordinateSource: IdCoordinateSource = diff --git a/src/test/scala/edu/ie3/simona/service/weather/WeatherSourceWrapperSpec.scala b/src/test/scala/edu/ie3/simona/service/weather/WeatherSourceWrapperSpec.scala index 8b0502c6cf..96f83968bc 100644 --- a/src/test/scala/edu/ie3/simona/service/weather/WeatherSourceWrapperSpec.scala +++ b/src/test/scala/edu/ie3/simona/service/weather/WeatherSourceWrapperSpec.scala @@ -290,13 +290,13 @@ class WeatherSourceWrapperSpec extends UnitSpec { object WeatherSourceWrapperSpec { // lat/lon are irrelevant, we will manually create weights later on - private val coordinate1a = GeoUtils.xyToPoint(6, 51) - private val coordinate1b = GeoUtils.xyToPoint(7, 51) - private val coordinate1c = GeoUtils.xyToPoint(8, 51) - private val coordinate1d = GeoUtils.xyToPoint(9, 51) - private val coordinate13 = GeoUtils.xyToPoint(10, 51) - private val coordinate13NoTemp = GeoUtils.xyToPoint(10, 52) - private val coordinateEmpty = GeoUtils.xyToPoint(10, 53) + private val coordinate1a = GeoUtils.buildPoint(51, 6) + private val coordinate1b = GeoUtils.buildPoint(51, 7) + private val coordinate1c = GeoUtils.buildPoint(51, 8) + private val coordinate1d = GeoUtils.buildPoint(51, 9) + private val coordinate13 = GeoUtils.buildPoint(51, 10) + private val coordinate13NoTemp = GeoUtils.buildPoint(52, 10) + private val coordinateEmpty = GeoUtils.buildPoint(53, 10) case object DummyPsdmWeatherSource extends PsdmWeatherSource { From ca0cd5d9bd8f8ed634e920068c8d43c7c5c73265 Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Sat, 28 May 2022 13:28:17 +0200 Subject: [PATCH 3/3] Adding to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60ce8d035f..6bf348dbe4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Re-organizing test resources into their respective packages [#105](https://github.com/ie3-institute/simona/issues/105) -- BREAKING: Using snapshot version of PSDM +- BREAKING: Using snapshot version of PSDM and PSU - Simplified PrimaryServiceProxy due to changes in PSDM [#120](https://github.com/ie3-institute/simona/issues/120) - Improved handling of weights and their sum in determination of weather data [#173](https://github.com/ie3-institute/simona/issues/173) - Improving code readability in EvcsAgent by moving FreeLotsRequest to separate methods [#19](https://github.com/ie3-institute/simona/issues/19)