Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pp/#646-convert-groovy-tests-to-scalatest #773

Merged
merged 40 commits into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
d083b2c
First Structure for WecModelSpec.scala
pierrepetersmeier Mar 18, 2024
65947e8
Merge branch 'dev' into pp/#646-convert-groovy-tests-to-scalatest
pierrepetersmeier Mar 18, 2024
fbdacfe
Merge branch 'dev' into pp/#646-convert-groovy-tests-to-scalatest
pierrepetersmeier Mar 21, 2024
487140f
fixing some import and other issues
danielfeismann May 31, 2024
74ad862
Merge branch 'dev' into pp/#646-convert-groovy-tests-to-scalatest
danielfeismann May 31, 2024
0eed6c0
Delete Groovy test. Implement Scala test.
pierrepetersmeier Jun 6, 2024
1ad0a86
Merge branch 'refs/heads/dev' into pp/#646-convert-groovy-tests-to-sc…
danielfeismann Jun 12, 2024
d01763d
spotless
danielfeismann Jun 12, 2024
45ea956
WecModelSpec.scala and Wecmodel.scala
pierrepetersmeier Jun 12, 2024
7365732
betzCurve in "check build method of companion object"
pierrepetersmeier Jun 13, 2024
6b607ee
5281.0 m² was not equal to 5281 m² (WecModelSpec.scala:96)
pierrepetersmeier Jun 13, 2024
0e1d8be
Sonarqube
pierrepetersmeier Jun 13, 2024
7d99ee9
Sonarqube2
pierrepetersmeier Jun 13, 2024
c9a6880
powerTolerance
pierrepetersmeier Jun 17, 2024
c0abb5f
squants, spotlessApply
Jun 17, 2024
a94498f
import
Jun 17, 2024
a73dab6
densityTolerance
Jun 17, 2024
ef1820c
spotlessApply
Jun 17, 2024
a419092
watts
Jun 17, 2024
048b401
densityTolerance
Jun 17, 2024
a9553a5
spotlessApply
Jun 17, 2024
97c11ca
velocity,spotlessApply
Jun 17, 2024
faa810b
tolerance, spotlessApply
Jun 17, 2024
684ccee
betzCurve
pierrepetersmeier Jun 26, 2024
589189b
Rewrote WecModelTest from groovy to scala
pierrepetersmeier Jun 26, 2024
41b56da
Merge branch 'refs/heads/dev' into pp/#646-convert-groovy-tests-to-sc…
danielfeismann Jul 1, 2024
442287f
fmt
danielfeismann Jul 1, 2024
7f6f40e
Merge branch 'dev' into pp/#646-convert-groovy-tests-to-scalatest
pierrepetersmeier Jul 7, 2024
67655ad
Merge branch 'dev' into pp/#646-convert-groovy-tests-to-scalatest
pierrepetersmeier Jul 10, 2024
89203cf
Refactor Scalatests to replace Sq.create() with direct units.
pierrepetersmeier Jul 10, 2024
9929d49
fmt
pierrepetersmeier Jul 10, 2024
27b820c
remove towatts() in test "calculate active power output depending on …
pierrepetersmeier Jul 25, 2024
e52a689
Update src/test/scala/edu/ie3/simona/model/participant/WecModelSpec.s…
pierrepetersmeier Jul 25, 2024
a9c448d
Update src/test/scala/edu/ie3/simona/model/participant/WecModelSpec.s…
pierrepetersmeier Jul 25, 2024
06d7bd1
Update src/test/scala/edu/ie3/simona/model/participant/WecModelSpec.s…
pierrepetersmeier Jul 25, 2024
d34721b
fix decimals failure in test "calculate active power output depending…
pierrepetersmeier Jul 26, 2024
bd78f7e
add unit in test "calculate active power output depending on temperat…
pierrepetersmeier Jul 26, 2024
0314e1f
Changelog
pierrepetersmeier Jul 26, 2024
0f47502
Merge branch 'dev' into pp/#646-convert-groovy-tests-to-scalatest
pierrepetersmeier Jul 26, 2024
da88d5c
fmt
pierrepetersmeier Jul 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- 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)
- Rewrote WecModelTest from groovy to scala [#646](https://github.com/ie3-institute/simona/issues/646)

### Fixed
- Removed a repeated line in the documentation of vn_simona config [#658](https://github.com/ie3-institute/simona/issues/658)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ final case class WecModel(
* @return
* active power output
*/
override protected def calculateActivePower(
override def calculateActivePower(
modelState: ConstantState.type,
wecData: WecRelevantData,
): Power = {
Expand Down Expand Up @@ -154,7 +154,7 @@ final case class WecModel(
* @return
* betz coefficient cₚ
*/
private def determineBetzCoefficient(
def determineBetzCoefficient(
windVelocity: Velocity
): Dimensionless = {
betzCurve.interpolateXy(windVelocity) match {
Expand All @@ -174,7 +174,7 @@ final case class WecModel(
* current air pressure
* @return
*/
private def calculateAirDensity(
def calculateAirDensity(
temperature: Temperature,
airPressure: Option[Pressure],
): Density = {
Expand Down Expand Up @@ -214,7 +214,7 @@ object WecModel {
/** This class is initialized with a [[WecCharacteristicInput]], which
* contains the needed betz curve.
*/
final case class WecCharacteristic private (
final case class WecCharacteristic(
override val xyCoordinates: SortedSet[
XYPair[Velocity, Dimensionless]
]
Expand Down
217 changes: 0 additions & 217 deletions src/test/groovy/edu/ie3/simona/model/participant/WecModelTest.groovy

This file was deleted.

Loading