Merge branch 'dev' into sp/#1134-new-ParticipantAgent-ParticipantModel

CHANGELOG.md

@@ -127,6 +127,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactored EM messages [#1138](https://github.com/ie3-institute/simona/issues/1138)
 - `OperationInterval` should extend `RightOpenInterval` [#1142](https://github.com/ie3-institute/simona/issues/1142)
 - Enhance EmAggregate of SelfOpt to cope with other targetLimits [#1131](https://github.com/ie3-institute/simona/issues/1131)
+- Switched to `pureconfig` [#608](https://github.com/ie3-institute/simona/issues/608)
+- Removing generated methods and cleaning up in config [#1170](https://github.com/ie3-institute/simona/issues/1170)
 
 ### Fixed
 - Fix rendering of references in documentation [#505](https://github.com/ie3-institute/simona/issues/505)

build.gradle

@@ -26,7 +26,6 @@ ext {
   pekkoVersion = '1.1.3'
   jtsVersion = '1.20.0'
   confluentKafkaVersion = '7.4.0'
-  tscfgVersion = '1.2.4'
   scapegoatVersion = '3.1.4'
 
   testContainerVersion = '0.41.8'
@@ -44,7 +43,6 @@ java {
 
 apply from: scriptsLocation + 'spotless.gradle'
 apply from: scriptsLocation + 'checkJavaVersion.gradle'
-apply from: scriptsLocation + 'tscfg.gradle' // config tasks
 apply from: scriptsLocation + 'documentation.gradle' // documentation tasks + configuration
 apply from: scriptsLocation + 'tests.gradle' // tasks for tests
 apply from: scriptsLocation + 'sonarqube.gradle' // sonarqube config
@@ -128,8 +126,8 @@ dependencies {
 
   /* config */
   implementation 'com.typesafe:config:1.4.3'
-  implementation "com.github.carueda:tscfg_2.13:$tscfgVersion"
   implementation "com.github.scopt:scopt_${scalaVersion}:4.1.0" // cmd args parser
+  implementation "com.github.pureconfig:pureconfig_${scalaVersion}:0.17.8"
 
   // JTS
   implementation ("org.locationtech.jts:jts-core:${jtsVersion}"){
@@ -200,6 +198,12 @@ tasks.withType(ScalaCompile) {
     "-P:scapegoat:disabledInspections:VariableShadowing",
     "-P:scapegoat:ignoredFiles:.*/SimonaConfig.scala" // see scapegoat-sbt page for this param
   ]
+  // increasing stack size required for our pureconfig configuration
+  // see: https://github.com/pureconfig/pureconfig/issues/481#issuecomment-647760554
+  scalaCompileOptions.forkOptions.jvmArgs = [
+    '-Xss2m',
+    '-XX:-UseGCOverheadLimit'
+  ]
 }
 
 // separate scapegoat report for test classes

gradle/scripts/documentation.gradle

@@ -25,3 +25,19 @@ javadoc() {
   destinationDir = file("${project.projectDir}/docs/javadoc")
   classpath = project.sourceSets.main.compileClasspath
 }
+
+/**
+ * Task to generate the ScalaDoc
+ */
+scaladoc() {
+  description 'Generates scala API doc at the correct place.'
+  group 'Documentation'
+
+  source = sourceSets.main.allSource
+  destinationDir = file("${project.projectDir}/docs/scaladoc")
+  classpath = project.sourceSets.main.compileClasspath
+
+  // Exclude SimonaConfig because implicits used by pureconfig's
+  // ConfigSource.load and ConfigWriter.apply lead to failure of scaladoc
+  exclude("edu/ie3/simona/config/SimonaConfig.scala")
+}

input/samples/vn_simona/vn_simona.conf

@@ -170,6 +170,7 @@ simona.runtime.participant.storage = {
     calculateMissingReactivePowerWithModel = false
     uuids = ["default"]
     scaling = 1.0
+    initialSoc = 0.0
   }
   individualConfigs = []
 }