From 069de840f09137fd25b68890343688fe2acc2d2e Mon Sep 17 00:00:00 2001 From: t-ober <63147366+t-ober@users.noreply.github.com> Date: Wed, 24 Nov 2021 08:09:25 +0100 Subject: [PATCH 1/2] update test grid --- src/test/resources/pfGrids/exampleGrid.json | 112 ++++++++++---------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/src/test/resources/pfGrids/exampleGrid.json b/src/test/resources/pfGrids/exampleGrid.json index 1a534fa4..bf59880c 100644 --- a/src/test/resources/pfGrids/exampleGrid.json +++ b/src/test/resources/pfGrids/exampleGrid.json @@ -477,14 +477,14 @@ ], "lines": [ { - "id": "Grid.ElmNet\\Line_0002_0003.ElmLne", + "id": "Grid.ElmNet\\Line_0002_0005.ElmLne", "GPScoords": [ [] ], "dline": 1.0, "bus1Id": "Grid.ElmNet\\Bus_0002.ElmTerm", - "bus2Id": "Grid.ElmNet\\Bus_0003.ElmTerm", - "typeId": "TypLne 0002 to 0003.TypLne" + "bus2Id": "Grid.ElmNet\\Bus_0005.ElmTerm", + "typeId": "TypLne 0002 to 0005.TypLne" }, { "id": "Grid.ElmNet\\Line_0010_0011.ElmLne", @@ -496,16 +496,6 @@ "bus2Id": "Grid.ElmNet\\Bus_0011.ElmTerm", "typeId": "TypLne 0010 to 0011.TypLne" }, - { - "id": "Grid.ElmNet\\Line_0012_0013.ElmLne", - "GPScoords": [ - [] - ], - "dline": 1.0, - "bus1Id": "Grid.ElmNet\\Bus_0012.ElmTerm", - "bus2Id": "Grid.ElmNet\\Bus_0013.ElmTerm", - "typeId": "TypLne 0012 to 0013.TypLne" - }, { "id": "Grid.ElmNet\\Line_0013_0014.ElmLne", "GPScoords": [ @@ -517,14 +507,14 @@ "typeId": "TypLne 0013 to 0014.TypLne" }, { - "id": "Grid.ElmNet\\Line_0002_0005.ElmLne", + "id": "Grid.ElmNet\\Line_0002_0003.ElmLne", "GPScoords": [ [] ], "dline": 1.0, "bus1Id": "Grid.ElmNet\\Bus_0002.ElmTerm", - "bus2Id": "Grid.ElmNet\\Bus_0005.ElmTerm", - "typeId": "TypLne 0002 to 0005.TypLne" + "bus2Id": "Grid.ElmNet\\Bus_0003.ElmTerm", + "typeId": "TypLne 0002 to 0003.TypLne" }, { "id": "Grid.ElmNet\\Line_0006_0013.ElmLne", @@ -608,7 +598,7 @@ "typeId": "TypLne 0001 to 0002.TypLne" }, { - "id": "Grid.ElmNet\\Line_0001_0005.ElmLne", + "id": "Grid.ElmNet\\Line_0001_0002/2.ElmLne", "GPScoords": [ [ 1.0, @@ -625,11 +615,11 @@ ], "dline": 1.0, "bus1Id": "Grid.ElmNet\\Bus_0001.ElmTerm", - "bus2Id": "Grid.ElmNet\\Bus_0005.ElmTerm", - "typeId": "TypLne 0001 to 0005.TypLne" + "bus2Id": "Grid.ElmNet\\Bus_0002.ElmTerm", + "typeId": "TypLne 0001 to 0002.TypLne" }, { - "id": "Grid.ElmNet\\Line_0001_0002/2.ElmLne", + "id": "Grid.ElmNet\\Line_0002_0004.ElmLne", "GPScoords": [ [ 1.0, @@ -645,12 +635,12 @@ ] ], "dline": 1.0, - "bus1Id": "Grid.ElmNet\\Bus_0001.ElmTerm", - "bus2Id": "Grid.ElmNet\\Bus_0002.ElmTerm", - "typeId": "TypLne 0001 to 0002.TypLne" + "bus1Id": "Grid.ElmNet\\Bus_0002.ElmTerm", + "bus2Id": "Grid.ElmNet\\Bus_0004.ElmTerm", + "typeId": "TypLne 0002 to 0004.TypLne" }, { - "id": "Grid.ElmNet\\Line_0002_0004.ElmLne", + "id": "Grid.ElmNet\\Line_0003_0004.ElmLne", "GPScoords": [ [ 1.0, @@ -666,12 +656,12 @@ ] ], "dline": 1.0, - "bus1Id": "Grid.ElmNet\\Bus_0002.ElmTerm", + "bus1Id": "Grid.ElmNet\\Bus_0003.ElmTerm", "bus2Id": "Grid.ElmNet\\Bus_0004.ElmTerm", - "typeId": "TypLne 0002 to 0004.TypLne" + "typeId": "TypLne 0003 to 0004.TypLne" }, { - "id": "Grid.ElmNet\\Line_0003_0004.ElmLne", + "id": "Grid.ElmNet\\Line_0001_0005.ElmLne", "GPScoords": [ [ 1.0, @@ -687,20 +677,30 @@ ] ], "dline": 1.0, - "bus1Id": "Grid.ElmNet\\Bus_0003.ElmTerm", - "bus2Id": "Grid.ElmNet\\Bus_0004.ElmTerm", - "typeId": "TypLne 0003 to 0004.TypLne" + "bus1Id": "Grid.ElmNet\\Bus_0001.ElmTerm", + "bus2Id": "Grid.ElmNet\\Bus_0005.ElmTerm", + "typeId": "TypLne 0001 to 0005.TypLne" + }, + { + "id": "Grid.ElmNet\\Line_0012_0013.ElmLne", + "GPScoords": [ + [] + ], + "dline": 0.30000001192092896, + "bus1Id": "Grid.ElmNet\\Bus_0012.ElmTerm", + "bus2Id": "Grid.ElmNet\\Bus_0013.ElmTerm", + "typeId": "TypLne 0012 to 0013.TypLne" } ], "lineTypes": [ { - "id": "TypLne 0002 to 0003.TypLne", - "bline": 251.37741088867188, + "id": "TypLne 0002 to 0005.TypLne", + "bline": 195.13314819335938, "gline": 0.0, - "rline": 8.18753719329834, + "rline": 9.922967910766602, "sline": 1.0, "uline": 132.0, - "xline": 34.49428176879883 + "xline": 30.296852111816406 }, { "id": "TypLne 0010 to 0011.TypLne", @@ -711,15 +711,6 @@ "uline": 33.0, "xline": 2.0916426181793213 }, - { - "id": "TypLne 0012 to 0013.TypLne", - "bline": 0.0, - "gline": 0.0, - "rline": 2.4058187007904053, - "sline": 1.0, - "uline": 33.0, - "xline": 2.1766932010650635 - }, { "id": "TypLne 0013 to 0014.TypLne", "bline": 0.0, @@ -730,13 +721,13 @@ "xline": 3.78993821144104 }, { - "id": "TypLne 0002 to 0005.TypLne", - "bline": 195.13314819335938, + "id": "TypLne 0002 to 0003.TypLne", + "bline": 251.37741088867188, "gline": 0.0, - "rline": 9.922967910766602, + "rline": 8.18753719329834, "sline": 1.0, "uline": 132.0, - "xline": 30.296852111816406 + "xline": 34.49428176879883 }, { "id": "TypLne 0006 to 0013.TypLne", @@ -801,15 +792,6 @@ "uline": 132.0, "xline": 20.61956214904785 }, - { - "id": "TypLne 0001 to 0005.TypLne", - "bline": 282.369140625, - "gline": 0.0, - "rline": 9.41418743133545, - "sline": 1.0, - "uline": 132.0, - "xline": 38.86250305175781 - }, { "id": "TypLne 0002 to 0004.TypLne", "bline": 214.64646911621094, @@ -827,6 +809,24 @@ "sline": 1.0, "uline": 132.0, "xline": 29.80026626586914 + }, + { + "id": "TypLne 0001 to 0005.TypLne", + "bline": 282.369140625, + "gline": 0.0, + "rline": 9.41418743133545, + "sline": 1.0, + "uline": 132.0, + "xline": 38.86250305175781 + }, + { + "id": "TypLne 0012 to 0013.TypLne", + "bline": 0.0, + "gline": 0.0, + "rline": 2.4058187007904053, + "sline": 1.0, + "uline": 33.0, + "xline": 2.1766932010650635 } ], "trafos2w": [ From cb2e136703c7700f87a46512949718f479aa2f09 Mon Sep 17 00:00:00 2001 From: t-ober <63147366+t-ober@users.noreply.github.com> Date: Wed, 24 Nov 2021 10:36:46 +0100 Subject: [PATCH 2/2] remove unused import --- .../edu/ie3/powerFactory2psdm/converter/LineConverter.scala | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/scala/edu/ie3/powerFactory2psdm/converter/LineConverter.scala b/src/main/scala/edu/ie3/powerFactory2psdm/converter/LineConverter.scala index e6c6eec3..a6bdb667 100644 --- a/src/main/scala/edu/ie3/powerFactory2psdm/converter/LineConverter.scala +++ b/src/main/scala/edu/ie3/powerFactory2psdm/converter/LineConverter.scala @@ -7,20 +7,17 @@ package edu.ie3.powerFactory2psdm.converter import edu.ie3.datamodel.models.StandardUnits -import tech.units.indriya.unit.Units.METRE import edu.ie3.datamodel.models.input.NodeInput import edu.ie3.datamodel.models.input.connector.LineInput import edu.ie3.datamodel.models.input.connector.`type`.LineTypeInput import edu.ie3.datamodel.models.input.system.characteristic.OlmCharacteristicInput import edu.ie3.datamodel.utils.GridAndGeoUtils import edu.ie3.powerFactory2psdm.converter.NodeConverter.getNode -import edu.ie3.powerFactory2psdm.converter.types.LineTypeConverter import edu.ie3.powerFactory2psdm.converter.types.LineTypeConverter.getLineType import edu.ie3.powerFactory2psdm.exception.pf.ConversionException import edu.ie3.powerFactory2psdm.model.entity.Line import edu.ie3.powerFactory2psdm.model.setting.ConversionPrefixes.ConversionPrefix import edu.ie3.powerFactory2psdm.util.QuantityUtils.RichQuantityDouble -import tech.units.indriya.quantity.Quantities import java.util.UUID import scala.util.{Failure, Success}