From 29382f2340440653c97f7ea8342d328403c8acb3 Mon Sep 17 00:00:00 2001 From: Utkarsha-dev05 Date: Mon, 10 Jan 2022 08:46:39 +0100 Subject: [PATCH 01/11] Adapting ValidationUtils and test data such that only negative values are allowed for the transformer susceptance. --- .../utils/validation/ConnectorValidationUtils.java | 12 +++++++----- .../utils/validation/ValidationUtils.java | 14 +++++++++++++- .../types/transformer_2_w_type_input.csv | 8 ++++---- .../types/transformer_3_w_type_input.csv | 2 +- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java index 0a924a365..847358e97 100644 --- a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java @@ -80,7 +80,7 @@ private static void checkLine(LineInput line) { /** * Validates a line type if:
* - it is not null
- * - B is greater/equal to 0 (Phase-to-ground susceptance per length)
+ * - B is less than 0 (Phase-to-ground susceptance per length)
* - G is greater/equal to 0 (Phase-to-ground conductance per length)
* - R is greater 0 (Phase resistance per length)
* - X is greater 0 (Phase reactance per length)
@@ -124,7 +124,7 @@ private static void checkTransformer2W(Transformer2WInput transformer2W) { * - rSc is greater 0 (short circuit resistance)
* - xSc is greater 0 (short circuit impedance)
* - gM is greater/equal to 0 (no load conductance)
- * - bM is greater/equal to 0 (no load susceptance)
+ * - bM is less than to 0
* - sRated is greater 0 (rated apparent power)
* - vRatedA is greater 0 (rated voltage at higher voltage terminal)
* - vRatedB is greater 0 (rated voltage at lower voltage terminal)
@@ -153,6 +153,8 @@ protected static void checkTransformer2WType(Transformer2WTypeInput transformer2 transformer2WType.getxSc() }, transformer2WType); + detectZeroOrPositiveQuantities( + new Quantity[] {transformer2WType.getbM()}, transformer2WType); checkVoltageMagnitudeChangePerTapPosition(transformer2WType); checkMinimumTapPositionIsLowerThanMaximumTapPosition(transformer2WType); checkNeutralTapPositionLiesBetweenMinAndMaxTapPosition(transformer2WType); @@ -206,9 +208,7 @@ private static void checkTransformer3W(Transformer3WInput transformer3W) { protected static void checkTransformer3WType(Transformer3WTypeInput transformer3WType) { checkNonNull(transformer3WType, "a three winding transformer type"); detectNegativeQuantities( - new Quantity[] { - transformer3WType.getgM(), transformer3WType.getbM(), transformer3WType.getdPhi() - }, + new Quantity[] {transformer3WType.getgM(), transformer3WType.getdPhi()}, transformer3WType); detectZeroOrNegativeQuantities( new Quantity[] { @@ -220,6 +220,8 @@ protected static void checkTransformer3WType(Transformer3WTypeInput transformer3 transformer3WType.getxScA(), transformer3WType.getxScB(), transformer3WType.getxScC() }, transformer3WType); + detectZeroOrPositiveQuantities( + new Quantity[] {transformer3WType.getbM()}, transformer3WType); checkVoltageMagnitudeChangePerTapPosition(transformer3WType); checkMinimumTapPositionIsLowerThanMaximumTapPosition(transformer3WType); checkNeutralTapPositionLiesBetweenMinAndMaxTapPosition(transformer3WType); diff --git a/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java b/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java index e59cf8265..a6496ea89 100644 --- a/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java @@ -186,7 +186,19 @@ protected static void detectZeroOrNegativeQuantities( detectMalformedQuantities( quantities, entity, predicate, "The following quantities have to be positive"); } - + /** + * Goes through the provided quantities and reports those, that have zero or positive value via + * synoptic {@link UnsafeEntityException} + * + * @param quantities Array of quantities to check + * @param entity Unique entity holding the malformed quantities + */ + protected static void detectZeroOrPositiveQuantities( + Quantity[] quantities, UniqueEntity entity) { + Predicate> predicate = quantity -> quantity.getValue().doubleValue() >= 0d; + detectMalformedQuantities( + quantities, entity, predicate, "The following quantities have to be negative"); + } /** * Goes through the provided quantities and reports those, that do fulfill the given predicate via * synoptic {@link UnsafeEntityException} diff --git a/src/test/resources/testGridFiles/types/transformer_2_w_type_input.csv b/src/test/resources/testGridFiles/types/transformer_2_w_type_input.csv index 841e2c926..14f3114d4 100644 --- a/src/test/resources/testGridFiles/types/transformer_2_w_type_input.csv +++ b/src/test/resources/testGridFiles/types/transformer_2_w_type_input.csv @@ -1,5 +1,5 @@ uuid,b_m,d_phi,d_v,g_m,id,r_sc,s_rated,tap_max,tap_min,tap_neutr,tap_side,v_rated_a,v_rated_b,x_sc -202069a7-bcf8-422c-837c-273575220c8a,0.0,0.0,1.5,0.0,HS-MS_1,45.375,20000.0,10,-10,0,false,110.0,20.0,102.759 -ac30443b-29e7-4635-b399-1062cfb3ffda,0.0,0.0,1.777780055999756,0.0,transformer_type_gedfi89fc7c895076ff25ec6d3b2e7ab9a1b24b37f73ecf30f895005d766a8d8d2774aa,0.0,40000.0,19,1,10,false,110.0,10.0,51.72750115394592 -8441dd78-c528-4e63-830d-52d341131432,0.0,0.0,1.5,0.0,no_shunt_elements_mv-mv,1.5,250.0,5,-5,0,false,20.0,10.0,15.5 -08559390-d7c0-4427-a2dc-97ba312ae0ac,0.0,0.0,0.5,0.0,MS-NS_1,10.078,630.0,10,-10,0,false,20.0,0.4,23.312 +202069a7-bcf8-422c-837c-273575220c8a,-1000.0,0.0,1.5,0.0,HS-MS_1,45.375,20000.0,10,-10,0,false,110.0,20.0,102.759 +ac30443b-29e7-4635-b399-1062cfb3ffda,-1000.0,0.0,1.777780055999756,0.0,transformer_type_gedfi89fc7c895076ff25ec6d3b2e7ab9a1b24b37f73ecf30f895005d766a8d8d2774aa,0.0,40000.0,19,1,10,false,110.0,10.0,51.72750115394592 +8441dd78-c528-4e63-830d-52d341131432,-1000.0,0.0,1.5,0.0,no_shunt_elements_mv-mv,1.5,250.0,5,-5,0,false,20.0,10.0,15.5 +08559390-d7c0-4427-a2dc-97ba312ae0ac,-1000.0,0.0,0.5,0.0,MS-NS_1,10.078,630.0,10,-10,0,false,20.0,0.4,23.312 diff --git a/src/test/resources/testGridFiles/types/transformer_3_w_type_input.csv b/src/test/resources/testGridFiles/types/transformer_3_w_type_input.csv index bb078edac..86d1e5fb3 100644 --- a/src/test/resources/testGridFiles/types/transformer_3_w_type_input.csv +++ b/src/test/resources/testGridFiles/types/transformer_3_w_type_input.csv @@ -1,2 +1,2 @@ uuid,b_m,d_phi,d_v,g_m,id,r_sc_a,r_sc_b,r_sc_c,s_rated_a,s_rated_b,s_rated_c,tap_max,tap_min,tap_neutr,v_rated_a,v_rated_b,v_rated_c,x_sc_a,x_sc_b,x_sc_c -5b0ee546-21fb-4a7f-a801-5dbd3d7bb356,1000.0,0.0,1.5,40000.0,HöS-HS-MS_1,0.3,0.025,8.0E-4,120000.0,60000.0,40000.0,10,-10,0,380.0,110.0,20.0,1.0,0.08,0.003 +5b0ee546-21fb-4a7f-a801-5dbd3d7bb356,-1000.0,0.0,1.5,40000.0,HöS-HS-MS_1,0.3,0.025,8.0E-4,120000.0,60000.0,40000.0,10,-10,0,380.0,110.0,20.0,1.0,0.08,0.003 From 7d790092efec5e4fc5afb7390b0ca580f8637868 Mon Sep 17 00:00:00 2001 From: Utkarsha-dev05 Date: Wed, 12 Jan 2022 07:26:22 +0100 Subject: [PATCH 02/11] Making suggested changes from the review. --- .../utils/validation/ConnectorValidationUtils.java | 10 ++++------ .../datamodel/utils/validation/ValidationUtils.java | 5 ++--- .../groovy/edu/ie3/test/common/GridTestData.groovy | 2 +- .../testGridFiles/types/transformer_2_w_type_input.csv | 8 ++++---- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java index 847358e97..ccad9466d 100644 --- a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java @@ -124,7 +124,7 @@ private static void checkTransformer2W(Transformer2WInput transformer2W) { * - rSc is greater 0 (short circuit resistance)
* - xSc is greater 0 (short circuit impedance)
* - gM is greater/equal to 0 (no load conductance)
- * - bM is less than to 0
+ * - bM is less/equal to 0
* - sRated is greater 0 (rated apparent power)
* - vRatedA is greater 0 (rated voltage at higher voltage terminal)
* - vRatedB is greater 0 (rated voltage at lower voltage terminal)
@@ -153,8 +153,7 @@ protected static void checkTransformer2WType(Transformer2WTypeInput transformer2 transformer2WType.getxSc() }, transformer2WType); - detectZeroOrPositiveQuantities( - new Quantity[] {transformer2WType.getbM()}, transformer2WType); + detectPositiveQuantities(new Quantity[] {transformer2WType.getbM()}, transformer2WType); checkVoltageMagnitudeChangePerTapPosition(transformer2WType); checkMinimumTapPositionIsLowerThanMaximumTapPosition(transformer2WType); checkNeutralTapPositionLiesBetweenMinAndMaxTapPosition(transformer2WType); @@ -195,7 +194,7 @@ private static void checkTransformer3W(Transformer3WInput transformer3W) { * - rScA, rScB, rScC are greater 0 (short circuit resistance in branches A,B,C)
* - xScA, xScB, xScC are greater 0 (short circuit impedance in branches A,B,C)
* - gM is greater/equal to 0 (no load conductance)
- * - bM is greater/equal to 0 (no load susceptance)
+ * - bM is less/equal to 0
* - sRatedA, sRatedB, sRatedC are greater 0 (rated apparent power in branches A,B,C)
* - vRatedA, vRatedB, vRatedC are greater 0 (rated voltage at higher node A,B,C)
* - dV is between 0% and 100% (voltage magnitude increase per tap position
@@ -220,8 +219,7 @@ protected static void checkTransformer3WType(Transformer3WTypeInput transformer3 transformer3WType.getxScA(), transformer3WType.getxScB(), transformer3WType.getxScC() }, transformer3WType); - detectZeroOrPositiveQuantities( - new Quantity[] {transformer3WType.getbM()}, transformer3WType); + detectPositiveQuantities(new Quantity[] {transformer3WType.getbM()}, transformer3WType); checkVoltageMagnitudeChangePerTapPosition(transformer3WType); checkMinimumTapPositionIsLowerThanMaximumTapPosition(transformer3WType); checkNeutralTapPositionLiesBetweenMinAndMaxTapPosition(transformer3WType); diff --git a/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java b/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java index a6496ea89..877a563a3 100644 --- a/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java @@ -193,9 +193,8 @@ protected static void detectZeroOrNegativeQuantities( * @param quantities Array of quantities to check * @param entity Unique entity holding the malformed quantities */ - protected static void detectZeroOrPositiveQuantities( - Quantity[] quantities, UniqueEntity entity) { - Predicate> predicate = quantity -> quantity.getValue().doubleValue() >= 0d; + protected static void detectPositiveQuantities(Quantity[] quantities, UniqueEntity entity) { + Predicate> predicate = quantity -> quantity.getValue().doubleValue() > 0d; detectMalformedQuantities( quantities, entity, predicate, "The following quantities have to be negative"); } diff --git a/src/test/groovy/edu/ie3/test/common/GridTestData.groovy b/src/test/groovy/edu/ie3/test/common/GridTestData.groovy index f784a7719..ebaa42ba6 100644 --- a/src/test/groovy/edu/ie3/test/common/GridTestData.groovy +++ b/src/test/groovy/edu/ie3/test/common/GridTestData.groovy @@ -134,7 +134,7 @@ class GridTestData { Quantities.getQuantity(0.08d, IMPEDANCE), Quantities.getQuantity(0.003d, IMPEDANCE), Quantities.getQuantity(40000d, ADMITTANCE), - Quantities.getQuantity(1000d, ADMITTANCE), + Quantities.getQuantity(-1000d, ADMITTANCE), Quantities.getQuantity(1.5d, DV_TAP), Quantities.getQuantity(0d, DPHI_TAP), 0, diff --git a/src/test/resources/testGridFiles/types/transformer_2_w_type_input.csv b/src/test/resources/testGridFiles/types/transformer_2_w_type_input.csv index 14f3114d4..841e2c926 100644 --- a/src/test/resources/testGridFiles/types/transformer_2_w_type_input.csv +++ b/src/test/resources/testGridFiles/types/transformer_2_w_type_input.csv @@ -1,5 +1,5 @@ uuid,b_m,d_phi,d_v,g_m,id,r_sc,s_rated,tap_max,tap_min,tap_neutr,tap_side,v_rated_a,v_rated_b,x_sc -202069a7-bcf8-422c-837c-273575220c8a,-1000.0,0.0,1.5,0.0,HS-MS_1,45.375,20000.0,10,-10,0,false,110.0,20.0,102.759 -ac30443b-29e7-4635-b399-1062cfb3ffda,-1000.0,0.0,1.777780055999756,0.0,transformer_type_gedfi89fc7c895076ff25ec6d3b2e7ab9a1b24b37f73ecf30f895005d766a8d8d2774aa,0.0,40000.0,19,1,10,false,110.0,10.0,51.72750115394592 -8441dd78-c528-4e63-830d-52d341131432,-1000.0,0.0,1.5,0.0,no_shunt_elements_mv-mv,1.5,250.0,5,-5,0,false,20.0,10.0,15.5 -08559390-d7c0-4427-a2dc-97ba312ae0ac,-1000.0,0.0,0.5,0.0,MS-NS_1,10.078,630.0,10,-10,0,false,20.0,0.4,23.312 +202069a7-bcf8-422c-837c-273575220c8a,0.0,0.0,1.5,0.0,HS-MS_1,45.375,20000.0,10,-10,0,false,110.0,20.0,102.759 +ac30443b-29e7-4635-b399-1062cfb3ffda,0.0,0.0,1.777780055999756,0.0,transformer_type_gedfi89fc7c895076ff25ec6d3b2e7ab9a1b24b37f73ecf30f895005d766a8d8d2774aa,0.0,40000.0,19,1,10,false,110.0,10.0,51.72750115394592 +8441dd78-c528-4e63-830d-52d341131432,0.0,0.0,1.5,0.0,no_shunt_elements_mv-mv,1.5,250.0,5,-5,0,false,20.0,10.0,15.5 +08559390-d7c0-4427-a2dc-97ba312ae0ac,0.0,0.0,0.5,0.0,MS-NS_1,10.078,630.0,10,-10,0,false,20.0,0.4,23.312 From f17360164709c6956bd62294c4967b386207346a Mon Sep 17 00:00:00 2001 From: Utkarsha-dev05 Date: Wed, 12 Jan 2022 07:34:01 +0100 Subject: [PATCH 03/11] Removed check for negative susceptance. --- .../ie3/datamodel/utils/validation/ConnectorValidationUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java index ccad9466d..f137f57ec 100644 --- a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java @@ -140,7 +140,6 @@ protected static void checkTransformer2WType(Transformer2WTypeInput transformer2 detectNegativeQuantities( new Quantity[] { transformer2WType.getgM(), - transformer2WType.getbM(), transformer2WType.getdPhi(), transformer2WType.getrSc() }, From 88d7f7772e656829100bcf7d62461f5aa8ea5a4f Mon Sep 17 00:00:00 2001 From: Utkarsha-dev05 Date: Wed, 12 Jan 2022 08:17:36 +0100 Subject: [PATCH 04/11] Updated sfter spotlessApply --- .../datamodel/utils/validation/ConnectorValidationUtils.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java index f137f57ec..07b156550 100644 --- a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java @@ -139,9 +139,7 @@ protected static void checkTransformer2WType(Transformer2WTypeInput transformer2 checkNonNull(transformer2WType, "a two winding transformer type"); detectNegativeQuantities( new Quantity[] { - transformer2WType.getgM(), - transformer2WType.getdPhi(), - transformer2WType.getrSc() + transformer2WType.getgM(), transformer2WType.getdPhi(), transformer2WType.getrSc() }, transformer2WType); detectZeroOrNegativeQuantities( From 1d5d7fafd858a10113b16b6ffd4d678d9e36c49e Mon Sep 17 00:00:00 2001 From: Utkarsha-dev05 Date: Wed, 12 Jan 2022 08:32:08 +0100 Subject: [PATCH 05/11] Updating test data for negative susceptance --- .../io/processor/input/InputEntityProcessorTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy index b553f6477..e439fe380 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy @@ -472,7 +472,7 @@ class InputEntityProcessorTest extends Specification { "xScB" : "0.08", "xScC" : "0.003", "gM" : "40000.0", - "bM" : "1000.0", + "bM" : "-1000.0", "dV" : "1.5", "dPhi" : "0.0", "tapNeutr": "0", From b75613f2fb44705b819521ace0f1a76b9c22f6d8 Mon Sep 17 00:00:00 2001 From: Utkarsha-dev05 <64724637+Utkarsha-dev05@users.noreply.github.com> Date: Fri, 14 Jan 2022 12:08:02 +0100 Subject: [PATCH 06/11] Update src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java Co-authored-by: Chris Kittl <44838605+ckittl@users.noreply.github.com> --- .../datamodel/utils/validation/ConnectorValidationUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java index 07b156550..c90e2979c 100644 --- a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java @@ -80,7 +80,7 @@ private static void checkLine(LineInput line) { /** * Validates a line type if:
* - it is not null
- * - B is less than 0 (Phase-to-ground susceptance per length)
+ * - B is less than / equal to 0 (Phase-to-ground susceptance per length)
* - G is greater/equal to 0 (Phase-to-ground conductance per length)
* - R is greater 0 (Phase resistance per length)
* - X is greater 0 (Phase reactance per length)
From 9de647cf1311954da8a388e20380bfe879dc7220 Mon Sep 17 00:00:00 2001 From: Utkarsha-dev05 <64724637+Utkarsha-dev05@users.noreply.github.com> Date: Fri, 14 Jan 2022 12:08:22 +0100 Subject: [PATCH 07/11] Update src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java Co-authored-by: Chris Kittl <44838605+ckittl@users.noreply.github.com> --- .../datamodel/utils/validation/ConnectorValidationUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java index c90e2979c..637b3d40c 100644 --- a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java @@ -124,7 +124,7 @@ private static void checkTransformer2W(Transformer2WInput transformer2W) { * - rSc is greater 0 (short circuit resistance)
* - xSc is greater 0 (short circuit impedance)
* - gM is greater/equal to 0 (no load conductance)
- * - bM is less/equal to 0
+ * - bM is less/equal to 0 (no load susceptance)
* - sRated is greater 0 (rated apparent power)
* - vRatedA is greater 0 (rated voltage at higher voltage terminal)
* - vRatedB is greater 0 (rated voltage at lower voltage terminal)
From 12c8e8fcadc517cfb8b555df56874ae47aa2a888 Mon Sep 17 00:00:00 2001 From: Utkarsha-dev05 <64724637+Utkarsha-dev05@users.noreply.github.com> Date: Fri, 14 Jan 2022 12:08:41 +0100 Subject: [PATCH 08/11] Update src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java Co-authored-by: Chris Kittl <44838605+ckittl@users.noreply.github.com> --- .../edu/ie3/datamodel/utils/validation/ValidationUtils.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java b/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java index 877a563a3..cb3d73b4b 100644 --- a/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java @@ -187,8 +187,7 @@ protected static void detectZeroOrNegativeQuantities( quantities, entity, predicate, "The following quantities have to be positive"); } /** - * Goes through the provided quantities and reports those, that have zero or positive value via - * synoptic {@link UnsafeEntityException} + * Goes through the provided quantities and reports those, that have positive value via * * @param quantities Array of quantities to check * @param entity Unique entity holding the malformed quantities From 4adb63eb7d49680dc84bb5b05ce8ddf1acb6ba1c Mon Sep 17 00:00:00 2001 From: "Kittl, Chris" Date: Wed, 19 Jan 2022 08:21:16 +0100 Subject: [PATCH 09/11] Adapt CHANGELOG --- CHANGELOG.md | 4 ++++ .../datamodel/utils/validation/ConnectorValidationUtils.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ab797092..2f775f950 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Create JavaDoc with java 17 instead of java 8 - Let JavDoc pass, if there are warnings **ATTENTION:** Should be removed, when JavaDoc is fixed! (cf. Issue [#494](https://github.com/ie3-institute/PowerSystemDataModel/issues/494)) +### Changed +- BREAKING: Transformer's no load susceptance needs to be zero or negative to pass model validation [#378](https://github.com/ie3-institute/PowerSystemDataModel/issues/378) + - All input data sets for version < 3.0.0 need to be altered! + ## [2.1.0] - 2022-01-05 ### Added diff --git a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java index 637b3d40c..29cf29044 100644 --- a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java @@ -191,7 +191,7 @@ private static void checkTransformer3W(Transformer3WInput transformer3W) { * - rScA, rScB, rScC are greater 0 (short circuit resistance in branches A,B,C)
* - xScA, xScB, xScC are greater 0 (short circuit impedance in branches A,B,C)
* - gM is greater/equal to 0 (no load conductance)
- * - bM is less/equal to 0
+ * - bM is less/equal to 0 (no load susceptance)
* - sRatedA, sRatedB, sRatedC are greater 0 (rated apparent power in branches A,B,C)
* - vRatedA, vRatedB, vRatedC are greater 0 (rated voltage at higher node A,B,C)
* - dV is between 0% and 100% (voltage magnitude increase per tap position
From 5474e2d115c11c5ad1b5d9ced7217f452c8ce72b Mon Sep 17 00:00:00 2001 From: "Kittl, Chris" Date: Wed, 19 Jan 2022 08:26:20 +0100 Subject: [PATCH 10/11] Minor improvement in documentation --- .../datamodel/utils/validation/ConnectorValidationUtils.java | 2 +- .../edu/ie3/datamodel/utils/validation/ValidationUtils.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java index 29cf29044..4a0c35379 100644 --- a/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/validation/ConnectorValidationUtils.java @@ -80,7 +80,7 @@ private static void checkLine(LineInput line) { /** * Validates a line type if:
* - it is not null
- * - B is less than / equal to 0 (Phase-to-ground susceptance per length)
+ * - B is greater/equal to 0 (Phase-to-ground susceptance per length)
* - G is greater/equal to 0 (Phase-to-ground conductance per length)
* - R is greater 0 (Phase resistance per length)
* - X is greater 0 (Phase reactance per length)
diff --git a/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java b/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java index cb3d73b4b..a0fbe3848 100644 --- a/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/validation/ValidationUtils.java @@ -197,6 +197,7 @@ protected static void detectPositiveQuantities(Quantity[] quantities, UniqueE detectMalformedQuantities( quantities, entity, predicate, "The following quantities have to be negative"); } + /** * Goes through the provided quantities and reports those, that do fulfill the given predicate via * synoptic {@link UnsafeEntityException} From bb8a6a143fcfd9fc6d30c473b2c1bd21c3e1a969 Mon Sep 17 00:00:00 2001 From: "Kittl, Chris" Date: Wed, 19 Jan 2022 08:31:16 +0100 Subject: [PATCH 11/11] Improving test logging --- gradle/scripts/tests.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gradle/scripts/tests.gradle b/gradle/scripts/tests.gradle index 44f17c2e0..78732aa55 100644 --- a/gradle/scripts/tests.gradle +++ b/gradle/scripts/tests.gradle @@ -1,7 +1,11 @@ test { useJUnitPlatform() testLogging { - events "skipped", "failed", "passed" + events "skipped", "failed" + } + + testLogging { + exceptionFormat "Full" } }