diff --git a/build.gradle b/build.gradle index ed48625c..dd592af4 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ dependencies { /* PowerSystemDataModel */ - implementation('com.github.ie3-institute:PowerSystemDataModel:3.0.0') { + implementation('com.github.ie3-institute:PowerSystemDataModel:4.1.0') { exclude group: 'org.apache.logging.log4j' exclude group: 'org.slf4j' /* Exclude our own nested dependencies */ diff --git a/src/main/scala/edu/ie3/powerFactory2psdm/main/RunConversion.scala b/src/main/scala/edu/ie3/powerFactory2psdm/main/RunConversion.scala index e31777a4..5f791951 100644 --- a/src/main/scala/edu/ie3/powerFactory2psdm/main/RunConversion.scala +++ b/src/main/scala/edu/ie3/powerFactory2psdm/main/RunConversion.scala @@ -7,11 +7,7 @@ package edu.ie3.powerFactory2psdm.main import com.typesafe.scalalogging.LazyLogging -import edu.ie3.datamodel.io.naming.{ - DefaultDirectoryHierarchy, - EntityPersistenceNamingStrategy, - FileNamingStrategy -} +import edu.ie3.datamodel.io.naming.{DefaultDirectoryHierarchy, EntityPersistenceNamingStrategy, FileNamingStrategy} import edu.ie3.datamodel.io.sink.CsvFileSink import edu.ie3.powerFactory2psdm.config.ConversionConfig import edu.ie3.powerFactory2psdm.config.validate.ConfigValidator @@ -24,6 +20,8 @@ import edu.ie3.powerFactory2psdm.model.RawPfGridModel import pureconfig.ConfigSource import pureconfig.generic.auto._ +import java.nio.file.Path + object RunConversion extends LazyLogging { def main(args: Array[String]): Unit = { @@ -46,7 +44,7 @@ object RunConversion extends LazyLogging { logger.info("Converting grid to PSDM") val jointGridContainer = GridConverter.convert(pfGrid, config) - val baseTargetDirectory = config.output.targetFolder + val baseTargetDirectory = Path.of(config.output.targetFolder) val csvSink = if (config.output.csvConfig.directoryHierarchy) { new CsvFileSink( @@ -55,14 +53,12 @@ object RunConversion extends LazyLogging { new EntityPersistenceNamingStrategy(), new DefaultDirectoryHierarchy(baseTargetDirectory, config.gridName) ), - false, config.output.csvConfig.separator ) } else { new CsvFileSink( baseTargetDirectory, new FileNamingStrategy(), - false, config.output.csvConfig.separator ) }