Skip to content

Bump com.github.ie3-institute:PowerSystemDataModel from 3.0.0 to 4.1.0 #325

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Bump com.github.ie3-institute:PowerSystemDataModel from 3.0.0 to 4.1.0 #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
998a011
Bump com.github.ie3-institute:PowerSystemDataModel from 3.0.0 to 4.1.0
dependabot[bot] Nov 3, 2023
8a4ea2b
use nio path
danielfeismann Dec 4, 2023
cc38335
Merge branch 'main' into dependabot/gradle/com.github.ie3-institute-P…
danielfeismann Dec 4, 2023
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
12 changes: 4 additions & 8 deletions src/main/scala/edu/ie3/powerFactory2psdm/main/RunConversion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 = {
Expand All @@ -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(
Expand All @@ -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
)
}
Expand Down