From 5a7fc521968a4636ab3b9fc559d65dbefb587433 Mon Sep 17 00:00:00 2001 From: Marvin Heintze Date: Sun, 9 Mar 2025 13:00:47 +0100 Subject: [PATCH 1/8] Added CopyBuilders --- .../input/connector/type/LineTypeInput.java | 88 +++++++ .../type/Transformer2WTypeInput.java | 165 +++++++++++++ .../type/Transformer3WTypeInput.java | 231 ++++++++++++++++++ 3 files changed, 484 insertions(+) diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java index 013403d12..c856cf37d 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java @@ -121,4 +121,92 @@ public String toString() { + vRated + '}'; } + + /** + * Abstract class for all builder that build child entities of abstract class {@link + * LineTypeInput} + */ + public abstract static class LineTypeInputCopyBuilder< + B extends LineTypeInput.LineTypeInputCopyBuilder> + extends AssetTypeInput.AssetTypeInputCopyBuilder { + + private ComparableQuantity b; + private ComparableQuantity g; + private ComparableQuantity r; + private ComparableQuantity x; + private ComparableQuantity iMax; + private ComparableQuantity vRated; + + protected LineTypeInputCopyBuilder(LineTypeInput entity) { + super(entity); + this.b = entity.b; + this.g = entity.g; + this.r = entity.r; + this.x = entity.x; + this.iMax = entity.iMax; + this.vRated = entity.vRated; + } + + /** Setter */ + public B setB(ComparableQuantity b) { + this.b = b; + return thisInstance(); + } + + public B setG(ComparableQuantity g) { + this.g = g; + return thisInstance(); + } + + public B setR(ComparableQuantity r) { + this.r = r; + return thisInstance(); + } + + public B setX(ComparableQuantity x) { + this.x = x; + return thisInstance(); + } + + public B setiMax(ComparableQuantity iMax) { + this.iMax = iMax; + return thisInstance(); + } + + public B setvRated(ComparableQuantity vRated) { + this.vRated = vRated; + return thisInstance(); + } + + /** Getter */ + public ComparableQuantity getB() { + return b; + } + + public ComparableQuantity getG() { + return g; + } + + public ComparableQuantity getR() { + return r; + } + + public ComparableQuantity getX() { + return x; + } + + public ComparableQuantity getiMax() { + return iMax; + } + + public ComparableQuantity getvRated() { + return vRated; + } + + @Override + public abstract LineTypeInput build(); + + @Override + protected abstract B thisInstance(); + } } diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java index 319c4cf3f..0a519a11c 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java @@ -216,4 +216,169 @@ public String toString() { + tapMax + '}'; } + + /** + * Abstract class for all builder that build child entities of abstract class {@link + * Transformer2WTypeInput} + */ + public abstract static class Transformer2WTypeInputCopyBuilder< + B extends Transformer2WTypeInputCopyBuilder> + extends AssetTypeInput.AssetTypeInputCopyBuilder { + + private ComparableQuantity rSc; + private ComparableQuantity xSc; + private ComparableQuantity sRated; + private ComparableQuantity vRatedA; + private ComparableQuantity vRatedB; + private ComparableQuantity gM; + private ComparableQuantity bM; + private ComparableQuantity dV; + private ComparableQuantity dPhi; + private boolean tapSide; + private int tapNeutr; + private int tapMin; + private int tapMax; + + protected Transformer2WTypeInputCopyBuilder(Transformer2WTypeInput entity) { + super(entity); + this.rSc = entity.rSc; + this.xSc = entity.xSc; + this.sRated = entity.sRated; + this.vRatedA = entity.vRatedA; + this.vRatedB = entity.vRatedB; + this.gM = entity.gM; + this.bM = entity.bM; + this.dV = entity.dV; + this.dPhi = entity.dPhi; + this.tapSide = entity.tapSide; + this.tapNeutr = entity.tapNeutr; + this.tapMin = entity.tapMin; + this.tapMax = entity.tapMax; + } + + /** Setter */ + public B setRSc(ComparableQuantity rSc) { + this.rSc = rSc; + return thisInstance(); + } + + public B setXSc(ComparableQuantity xSc) { + this.xSc = xSc; + return thisInstance(); + } + + public B setsRated(ComparableQuantity sRated) { + this.sRated = sRated; + return thisInstance(); + } + + public B setvRatedA(ComparableQuantity vRatedA) { + this.vRatedA = vRatedA; + return thisInstance(); + } + + public B setvRatedB(ComparableQuantity vRatedB) { + this.vRatedB = vRatedB; + return thisInstance(); + } + + public B setgM(ComparableQuantity gM) { + this.gM = gM; + return thisInstance(); + } + + public B setbM(ComparableQuantity bM) { + this.bM = bM; + return thisInstance(); + } + + public B setdV(ComparableQuantity dV) { + this.dV = dV; + return thisInstance(); + } + + public B setdPhi(ComparableQuantity dPhi) { + this.dPhi = dPhi; + return thisInstance(); + } + + public B settapSide(boolean tapSide) { + this.tapSide = tapSide; + return thisInstance(); + } + + public B settapNeutr(int tapNeutr) { + this.tapNeutr = tapNeutr; + return thisInstance(); + } + + public B settapMin(int tapMin) { + this.tapMin = tapMin; + return thisInstance(); + } + + public B settapMax(int tapMax) { + this.tapMax = tapMax; + return thisInstance(); + } + + /** Getter */ + public ComparableQuantity getrSc() { + return rSc; + } + + public ComparableQuantity getxSc() { + return xSc; + } + + public ComparableQuantity getsRated() { + return sRated; + } + + public ComparableQuantity getvRatedA() { + return vRatedA; + } + + public ComparableQuantity getvRatedB() { + return vRatedB; + } + + public ComparableQuantity getgM() { + return gM; + } + + public ComparableQuantity getbM() { + return bM; + } + + public ComparableQuantity getdV() { + return dV; + } + + public ComparableQuantity getdPhi() { + return dPhi; + } + + public boolean isTapSide() { + return tapSide; + } + + public int getTapNeutr() { + return tapNeutr; + } + + public int getTapMin() { + return tapMin; + } + + public int getTapMax() { + return tapMax; + } + + @Override + public abstract Transformer2WTypeInput build(); + + @Override + protected abstract B thisInstance(); + } } diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java index 65c308071..bc347d532 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java @@ -294,4 +294,235 @@ public String toString() { + tapMax + '}'; } + + /** + * Abstract class for all builder that build child entities of abstract class {@link + * Transformer3WTypeInput} + */ + public abstract static class Transformer3WTypeInputCopyBuilder< + B extends Transformer3WTypeInput.Transformer3WTypeInputCopyBuilder> + extends AssetTypeInput.AssetTypeInputCopyBuilder { + + private ComparableQuantity sRatedA; + private ComparableQuantity sRatedB; + private ComparableQuantity sRatedC; + private ComparableQuantity vRatedA; + private ComparableQuantity vRatedB; + private ComparableQuantity vRatedC; + private ComparableQuantity rScA; + private ComparableQuantity rScB; + private ComparableQuantity rScC; + private ComparableQuantity xScA; + private ComparableQuantity xScB; + private ComparableQuantity xScC; + private ComparableQuantity gM; + private ComparableQuantity bM; + private ComparableQuantity dV; + private ComparableQuantity dPhi; + private int tapNeutr; + private int tapMin; + private int tapMax; + + protected Transformer3WTypeInputCopyBuilder(Transformer3WTypeInput entity) { + super(entity); + this.sRatedA = entity.sRatedA; + this.sRatedB = entity.sRatedB; + this.sRatedC = entity.sRatedC; + this.vRatedA = entity.vRatedA; + this.vRatedB = entity.vRatedB; + this.vRatedC = entity.vRatedC; + this.rScA = entity.rScA; + this.rScB = entity.rScB; + this.rScC = entity.rScC; + this.xScA = entity.xScA; + this.xScB = entity.xScB; + this.xScC = entity.xScC; + this.gM = entity.gM; + this.bM = entity.bM; + this.dV = entity.dV; + this.dPhi = entity.dPhi; + this.tapNeutr = entity.tapNeutr; + this.tapMin = entity.tapMin; + this.tapMax = entity.tapMax; + } + + /** Setter */ + public B setsRatedA(ComparableQuantity sRatedA) { + this.sRatedA = sRatedA; + return thisInstance(); + } + + public B setsRatedB(ComparableQuantity sRatedB) { + this.sRatedB = sRatedB; + return thisInstance(); + } + + public B setsRatedC(ComparableQuantity sRatedC) { + this.sRatedC = sRatedC; + return thisInstance(); + } + + public B setvRatedA(ComparableQuantity vRatedA) { + this.vRatedA = vRatedA; + return thisInstance(); + } + + public B setvRatedB(ComparableQuantity vRatedB) { + this.vRatedB = vRatedB; + return thisInstance(); + } + + public B setrScA(ComparableQuantity rScA) { + this.rScA = rScA; + return thisInstance(); + } + + public B setvRatedC(ComparableQuantity vRatedC) { + this.vRatedC = vRatedC; + return thisInstance(); + } + + public B setrScB(ComparableQuantity rScB) { + this.rScB = rScB; + return thisInstance(); + } + + public B setrScC(ComparableQuantity rScC) { + this.rScC = rScC; + return thisInstance(); + } + + public B setxScA(ComparableQuantity xScA) { + this.xScA = xScA; + return thisInstance(); + } + + public B setxScB(ComparableQuantity xScB) { + this.xScB = xScB; + return thisInstance(); + } + + public B setxScC(ComparableQuantity xScC) { + this.xScC = xScC; + return thisInstance(); + } + + public B setgM(ComparableQuantity gM) { + this.gM = gM; + return thisInstance(); + } + + public B setbM(ComparableQuantity bM) { + this.bM = bM; + return thisInstance(); + } + + public B setdV(ComparableQuantity dV) { + this.dV = dV; + return thisInstance(); + } + + public B setdPhi(ComparableQuantity dPhi) { + this.dPhi = dPhi; + return thisInstance(); + } + + public B setTapNeutr(int tapNeutr) { + this.tapNeutr = tapNeutr; + return thisInstance(); + } + + public B setTapMin(int tapMin) { + this.tapMin = tapMin; + return thisInstance(); + } + + public B setTapMax(int tapMax) { + this.tapMax = tapMax; + return thisInstance(); + } + + /** Getter */ + public ComparableQuantity getsRatedA() { + return sRatedA; + } + + public ComparableQuantity getsRatedB() { + return sRatedB; + } + + public ComparableQuantity getsRatedC() { + return sRatedC; + } + + public ComparableQuantity getvRatedA() { + return vRatedA; + } + + public ComparableQuantity getvRatedB() { + return vRatedB; + } + + public ComparableQuantity getvRatedC() { + return vRatedC; + } + + public ComparableQuantity getrScA() { + return rScA; + } + + public ComparableQuantity getrScB() { + return rScB; + } + + public ComparableQuantity getrScC() { + return rScC; + } + + public ComparableQuantity getxScA() { + return xScA; + } + + public ComparableQuantity getxScB() { + return xScB; + } + + public ComparableQuantity getxScC() { + return xScC; + } + + public ComparableQuantity getgM() { + return gM; + } + + public ComparableQuantity getbM() { + return bM; + } + + public ComparableQuantity getdV() { + return dV; + } + + public ComparableQuantity getdPhi() { + return dPhi; + } + + public int getTapNeutr() { + return tapNeutr; + } + + public int getTapMin() { + return tapMin; + } + + public int getTapMax() { + return tapMax; + } + + @Override + public abstract Transformer2WTypeInput build(); + + @Override + protected abstract B thisInstance(); + } } From 764ef40e8e8ccd0c00ff2b87b6df68257f0e0d7f Mon Sep 17 00:00:00 2001 From: Marvin Heintze Date: Sun, 9 Mar 2025 13:02:58 +0100 Subject: [PATCH 2/8] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0653de1a..c0b70bfd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased/Snapshot] +- Added `CopyBuilders` to `Line-/Transformer2W-/Tranformer3WTypeInput` [#1275](https://github.com/ie3-institute/PowerSystemDataModel/issues/1275) ## [6.0.0] - 2025-02-27 From 093f0b9532b15a63b1344513649ec0ace6fd00c6 Mon Sep 17 00:00:00 2001 From: Marvin Heintze Date: Wed, 19 Mar 2025 14:26:03 +0100 Subject: [PATCH 3/8] added copy method + CopyBuilders not abstract --- .../models/input/AssetTypeInput.java | 2 + .../input/connector/type/LineTypeInput.java | 64 +++---- .../type/Transformer2WTypeInput.java | 120 +++++-------- .../type/Transformer3WTypeInput.java | 163 +++++++----------- .../validation/InvalidAssetTypeInput.groovy | 4 + 5 files changed, 138 insertions(+), 215 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/models/input/AssetTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/AssetTypeInput.java index 0737df4bc..57ef4258d 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/AssetTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/AssetTypeInput.java @@ -26,6 +26,8 @@ public String getId() { return id; } + public abstract AssetTypeInputCopyBuilder copy(); + @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java index c856cf37d..a17f21ca0 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java @@ -82,6 +82,11 @@ public ComparableQuantity getvRated() { return vRated; } + @Override + public LineTypeInputCopyBuilder copy() { + return new LineTypeInputCopyBuilder(this); + } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -126,9 +131,8 @@ public String toString() { * Abstract class for all builder that build child entities of abstract class {@link * LineTypeInput} */ - public abstract static class LineTypeInputCopyBuilder< - B extends LineTypeInput.LineTypeInputCopyBuilder> - extends AssetTypeInput.AssetTypeInputCopyBuilder { + public final static class LineTypeInputCopyBuilder + extends AssetTypeInput.AssetTypeInputCopyBuilder { private ComparableQuantity b; private ComparableQuantity g; @@ -148,65 +152,53 @@ protected LineTypeInputCopyBuilder(LineTypeInput entity) { } /** Setter */ - public B setB(ComparableQuantity b) { + public LineTypeInputCopyBuilder setB(ComparableQuantity b) { this.b = b; return thisInstance(); } - public B setG(ComparableQuantity g) { + public LineTypeInputCopyBuilder setG(ComparableQuantity g) { this.g = g; return thisInstance(); } - public B setR(ComparableQuantity r) { + public LineTypeInputCopyBuilder setR(ComparableQuantity r) { this.r = r; return thisInstance(); } - public B setX(ComparableQuantity x) { + public LineTypeInputCopyBuilder setX(ComparableQuantity x) { this.x = x; return thisInstance(); } - public B setiMax(ComparableQuantity iMax) { + public LineTypeInputCopyBuilder setiMax(ComparableQuantity iMax) { this.iMax = iMax; return thisInstance(); } - public B setvRated(ComparableQuantity vRated) { + public LineTypeInputCopyBuilder setvRated(ComparableQuantity vRated) { this.vRated = vRated; return thisInstance(); } - /** Getter */ - public ComparableQuantity getB() { - return b; - } - - public ComparableQuantity getG() { - return g; - } - - public ComparableQuantity getR() { - return r; - } - - public ComparableQuantity getX() { - return x; - } - - public ComparableQuantity getiMax() { - return iMax; - } - - public ComparableQuantity getvRated() { - return vRated; + @Override + public LineTypeInput build(){ + return new LineTypeInput( + getUuid(), + getId(), + b, + g, + r, + x, + iMax, + vRated); } - @Override - public abstract LineTypeInput build(); - @Override - protected abstract B thisInstance(); + @Override + protected LineTypeInputCopyBuilder thisInstance() { + return this; + } } } diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java index 0a519a11c..56e260579 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java @@ -142,6 +142,11 @@ public int getTapMax() { return tapMax; } + @Override + public Transformer2WTypeInputCopyBuilder copy() { + return new Transformer2WTypeInputCopyBuilder(this); + } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -221,9 +226,8 @@ public String toString() { * Abstract class for all builder that build child entities of abstract class {@link * Transformer2WTypeInput} */ - public abstract static class Transformer2WTypeInputCopyBuilder< - B extends Transformer2WTypeInputCopyBuilder> - extends AssetTypeInput.AssetTypeInputCopyBuilder { + public final static class Transformer2WTypeInputCopyBuilder + extends AssetTypeInput.AssetTypeInputCopyBuilder { private ComparableQuantity rSc; private ComparableQuantity xSc; @@ -239,7 +243,7 @@ public abstract static class Transformer2WTypeInputCopyBuilder< private int tapMin; private int tapMax; - protected Transformer2WTypeInputCopyBuilder(Transformer2WTypeInput entity) { + private Transformer2WTypeInputCopyBuilder(Transformer2WTypeInput entity) { super(entity); this.rSc = entity.rSc; this.xSc = entity.xSc; @@ -257,128 +261,96 @@ protected Transformer2WTypeInputCopyBuilder(Transformer2WTypeInput entity) { } /** Setter */ - public B setRSc(ComparableQuantity rSc) { + public Transformer2WTypeInputCopyBuilder setRSc(ComparableQuantity rSc) { this.rSc = rSc; return thisInstance(); } - public B setXSc(ComparableQuantity xSc) { + public Transformer2WTypeInputCopyBuilder setXSc(ComparableQuantity xSc) { this.xSc = xSc; return thisInstance(); } - public B setsRated(ComparableQuantity sRated) { + public Transformer2WTypeInputCopyBuilder setsRated(ComparableQuantity sRated) { this.sRated = sRated; return thisInstance(); } - public B setvRatedA(ComparableQuantity vRatedA) { + public Transformer2WTypeInputCopyBuilder setvRatedA(ComparableQuantity vRatedA) { this.vRatedA = vRatedA; return thisInstance(); } - public B setvRatedB(ComparableQuantity vRatedB) { + public Transformer2WTypeInputCopyBuilder setvRatedB(ComparableQuantity vRatedB) { this.vRatedB = vRatedB; return thisInstance(); } - public B setgM(ComparableQuantity gM) { + public Transformer2WTypeInputCopyBuilder setgM(ComparableQuantity gM) { this.gM = gM; return thisInstance(); } - public B setbM(ComparableQuantity bM) { + public Transformer2WTypeInputCopyBuilder setbM(ComparableQuantity bM) { this.bM = bM; return thisInstance(); } - public B setdV(ComparableQuantity dV) { + public Transformer2WTypeInputCopyBuilder setdV(ComparableQuantity dV) { this.dV = dV; return thisInstance(); } - public B setdPhi(ComparableQuantity dPhi) { + public Transformer2WTypeInputCopyBuilder setdPhi(ComparableQuantity dPhi) { this.dPhi = dPhi; return thisInstance(); } - public B settapSide(boolean tapSide) { + public Transformer2WTypeInputCopyBuilder settapSide(boolean tapSide) { this.tapSide = tapSide; return thisInstance(); } - public B settapNeutr(int tapNeutr) { + public Transformer2WTypeInputCopyBuilder settapNeutr(int tapNeutr) { this.tapNeutr = tapNeutr; return thisInstance(); } - public B settapMin(int tapMin) { + public Transformer2WTypeInputCopyBuilder settapMin(int tapMin) { this.tapMin = tapMin; return thisInstance(); } - public B settapMax(int tapMax) { + public Transformer2WTypeInputCopyBuilder settapMax(int tapMax) { this.tapMax = tapMax; return thisInstance(); } - /** Getter */ - public ComparableQuantity getrSc() { - return rSc; - } - - public ComparableQuantity getxSc() { - return xSc; - } - - public ComparableQuantity getsRated() { - return sRated; - } - - public ComparableQuantity getvRatedA() { - return vRatedA; - } - - public ComparableQuantity getvRatedB() { - return vRatedB; - } - - public ComparableQuantity getgM() { - return gM; - } - - public ComparableQuantity getbM() { - return bM; - } - - public ComparableQuantity getdV() { - return dV; - } - - public ComparableQuantity getdPhi() { - return dPhi; - } - - public boolean isTapSide() { - return tapSide; - } - - public int getTapNeutr() { - return tapNeutr; - } - - public int getTapMin() { - return tapMin; - } - - public int getTapMax() { - return tapMax; - } - - @Override - public abstract Transformer2WTypeInput build(); - @Override - protected abstract B thisInstance(); + @Override + public Transformer2WTypeInput build() { + return new Transformer2WTypeInput( + getUuid(), + getId(), + rSc, + xSc, + sRated, + vRatedA, + vRatedB, + gM, + bM, + dV, + dPhi, + tapSide, + tapNeutr, + tapMin, + tapMax + ); + } + + @Override + protected Transformer2WTypeInputCopyBuilder thisInstance() { + return this; + } } } diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java index bc347d532..ccbc2a0cd 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java @@ -196,6 +196,11 @@ public int getTapMax() { return tapMax; } + @Override + public Transformer3WTypeInputCopyBuilder copy() { + return new Transformer3WTypeInputCopyBuilder(this); + } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -299,9 +304,8 @@ public String toString() { * Abstract class for all builder that build child entities of abstract class {@link * Transformer3WTypeInput} */ - public abstract static class Transformer3WTypeInputCopyBuilder< - B extends Transformer3WTypeInput.Transformer3WTypeInputCopyBuilder> - extends AssetTypeInput.AssetTypeInputCopyBuilder { + public final static class Transformer3WTypeInputCopyBuilder + extends AssetTypeInput.AssetTypeInputCopyBuilder { private ComparableQuantity sRatedA; private ComparableQuantity sRatedB; @@ -323,7 +327,7 @@ public abstract static class Transformer3WTypeInputCopyBuilder< private int tapMin; private int tapMax; - protected Transformer3WTypeInputCopyBuilder(Transformer3WTypeInput entity) { + private Transformer3WTypeInputCopyBuilder(Transformer3WTypeInput entity) { super(entity); this.sRatedA = entity.sRatedA; this.sRatedB = entity.sRatedB; @@ -347,182 +351,131 @@ protected Transformer3WTypeInputCopyBuilder(Transformer3WTypeInput entity) { } /** Setter */ - public B setsRatedA(ComparableQuantity sRatedA) { + public Transformer3WTypeInputCopyBuilder setsRatedA(ComparableQuantity sRatedA) { this.sRatedA = sRatedA; return thisInstance(); } - public B setsRatedB(ComparableQuantity sRatedB) { + public Transformer3WTypeInputCopyBuilder setsRatedB(ComparableQuantity sRatedB) { this.sRatedB = sRatedB; return thisInstance(); } - public B setsRatedC(ComparableQuantity sRatedC) { + public Transformer3WTypeInputCopyBuilder setsRatedC(ComparableQuantity sRatedC) { this.sRatedC = sRatedC; return thisInstance(); } - public B setvRatedA(ComparableQuantity vRatedA) { + public Transformer3WTypeInputCopyBuilder setvRatedA(ComparableQuantity vRatedA) { this.vRatedA = vRatedA; return thisInstance(); } - public B setvRatedB(ComparableQuantity vRatedB) { + public Transformer3WTypeInputCopyBuilder setvRatedB(ComparableQuantity vRatedB) { this.vRatedB = vRatedB; return thisInstance(); } - public B setrScA(ComparableQuantity rScA) { + public Transformer3WTypeInputCopyBuilder setrScA(ComparableQuantity rScA) { this.rScA = rScA; return thisInstance(); } - public B setvRatedC(ComparableQuantity vRatedC) { + public Transformer3WTypeInputCopyBuilder setvRatedC(ComparableQuantity vRatedC) { this.vRatedC = vRatedC; return thisInstance(); } - public B setrScB(ComparableQuantity rScB) { + public Transformer3WTypeInputCopyBuilder setrScB(ComparableQuantity rScB) { this.rScB = rScB; return thisInstance(); } - public B setrScC(ComparableQuantity rScC) { + public Transformer3WTypeInputCopyBuilder setrScC(ComparableQuantity rScC) { this.rScC = rScC; return thisInstance(); } - public B setxScA(ComparableQuantity xScA) { + public Transformer3WTypeInputCopyBuilder setxScA(ComparableQuantity xScA) { this.xScA = xScA; return thisInstance(); } - public B setxScB(ComparableQuantity xScB) { + public Transformer3WTypeInputCopyBuilder setxScB(ComparableQuantity xScB) { this.xScB = xScB; return thisInstance(); } - public B setxScC(ComparableQuantity xScC) { + public Transformer3WTypeInputCopyBuilder setxScC(ComparableQuantity xScC) { this.xScC = xScC; return thisInstance(); } - public B setgM(ComparableQuantity gM) { + public Transformer3WTypeInputCopyBuilder setgM(ComparableQuantity gM) { this.gM = gM; return thisInstance(); } - public B setbM(ComparableQuantity bM) { + public Transformer3WTypeInputCopyBuilder setbM(ComparableQuantity bM) { this.bM = bM; return thisInstance(); } - public B setdV(ComparableQuantity dV) { + public Transformer3WTypeInputCopyBuilder setdV(ComparableQuantity dV) { this.dV = dV; return thisInstance(); } - public B setdPhi(ComparableQuantity dPhi) { + public Transformer3WTypeInputCopyBuilder setdPhi(ComparableQuantity dPhi) { this.dPhi = dPhi; return thisInstance(); } - public B setTapNeutr(int tapNeutr) { + public Transformer3WTypeInputCopyBuilder setTapNeutr(int tapNeutr) { this.tapNeutr = tapNeutr; return thisInstance(); } - public B setTapMin(int tapMin) { + public Transformer3WTypeInputCopyBuilder setTapMin(int tapMin) { this.tapMin = tapMin; return thisInstance(); } - public B setTapMax(int tapMax) { + public Transformer3WTypeInputCopyBuilder setTapMax(int tapMax) { this.tapMax = tapMax; return thisInstance(); } - /** Getter */ - public ComparableQuantity getsRatedA() { - return sRatedA; - } - - public ComparableQuantity getsRatedB() { - return sRatedB; - } - - public ComparableQuantity getsRatedC() { - return sRatedC; - } - - public ComparableQuantity getvRatedA() { - return vRatedA; - } - - public ComparableQuantity getvRatedB() { - return vRatedB; - } - - public ComparableQuantity getvRatedC() { - return vRatedC; - } - - public ComparableQuantity getrScA() { - return rScA; - } - - public ComparableQuantity getrScB() { - return rScB; - } - - public ComparableQuantity getrScC() { - return rScC; - } - - public ComparableQuantity getxScA() { - return xScA; - } - - public ComparableQuantity getxScB() { - return xScB; - } - - public ComparableQuantity getxScC() { - return xScC; - } - - public ComparableQuantity getgM() { - return gM; - } - - public ComparableQuantity getbM() { - return bM; - } - - public ComparableQuantity getdV() { - return dV; - } - - public ComparableQuantity getdPhi() { - return dPhi; - } - - public int getTapNeutr() { - return tapNeutr; - } - - public int getTapMin() { - return tapMin; - } - - public int getTapMax() { - return tapMax; - } - - @Override - public abstract Transformer2WTypeInput build(); - - @Override - protected abstract B thisInstance(); + @Override + public Transformer3WTypeInput build() { + return new Transformer3WTypeInput( + getUuid(), + getId(), + sRatedA, + sRatedB, + sRatedC, + vRatedA, + vRatedB, + vRatedC, + rScA, + rScB, + rScC, + xScA, + xScB, + xScC, + gM, + bM, + dV, + dPhi, + tapNeutr, + tapMin, + tapMax + ); + } + + @Override + protected Transformer3WTypeInputCopyBuilder thisInstance() { + return this; + } } } diff --git a/src/test/groovy/edu/ie3/datamodel/utils/validation/InvalidAssetTypeInput.groovy b/src/test/groovy/edu/ie3/datamodel/utils/validation/InvalidAssetTypeInput.groovy index 47b1a3e78..9fa1e2b31 100644 --- a/src/test/groovy/edu/ie3/datamodel/utils/validation/InvalidAssetTypeInput.groovy +++ b/src/test/groovy/edu/ie3/datamodel/utils/validation/InvalidAssetTypeInput.groovy @@ -12,6 +12,10 @@ class InvalidAssetTypeInput extends AssetTypeInput { super(uuid, id) } + AssetTypeInputCopyBuilder copy() { + return null + } + InvalidAssetTypeInput() { super(UUID.randomUUID(), "invalid_asset_type") } From 1438b70ce9459b0206e402bb15eaa9d024ff322c Mon Sep 17 00:00:00 2001 From: Marvin Heintze Date: Wed, 19 Mar 2025 14:26:24 +0100 Subject: [PATCH 4/8] spotless --- .../input/connector/type/LineTypeInput.java | 23 +++----- .../type/Transformer2WTypeInput.java | 43 ++++++--------- .../type/Transformer3WTypeInput.java | 53 +++++++------------ 3 files changed, 40 insertions(+), 79 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java index a17f21ca0..e8d6d60c9 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java @@ -131,7 +131,7 @@ public String toString() { * Abstract class for all builder that build child entities of abstract class {@link * LineTypeInput} */ - public final static class LineTypeInputCopyBuilder + public static final class LineTypeInputCopyBuilder extends AssetTypeInput.AssetTypeInputCopyBuilder { private ComparableQuantity b; @@ -183,22 +183,13 @@ public LineTypeInputCopyBuilder setvRated(ComparableQuantity } @Override - public LineTypeInput build(){ - return new LineTypeInput( - getUuid(), - getId(), - b, - g, - r, - x, - iMax, - vRated); + public LineTypeInput build() { + return new LineTypeInput(getUuid(), getId(), b, g, r, x, iMax, vRated); } - - @Override - protected LineTypeInputCopyBuilder thisInstance() { - return this; - } + @Override + protected LineTypeInputCopyBuilder thisInstance() { + return this; + } } } diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java index 56e260579..307d36a12 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java @@ -226,7 +226,7 @@ public String toString() { * Abstract class for all builder that build child entities of abstract class {@link * Transformer2WTypeInput} */ - public final static class Transformer2WTypeInputCopyBuilder + public static final class Transformer2WTypeInputCopyBuilder extends AssetTypeInput.AssetTypeInputCopyBuilder { private ComparableQuantity rSc; @@ -276,12 +276,14 @@ public Transformer2WTypeInputCopyBuilder setsRated(ComparableQuantity sRa return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setvRatedA(ComparableQuantity vRatedA) { + public Transformer2WTypeInputCopyBuilder setvRatedA( + ComparableQuantity vRatedA) { this.vRatedA = vRatedA; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setvRatedB(ComparableQuantity vRatedB) { + public Transformer2WTypeInputCopyBuilder setvRatedB( + ComparableQuantity vRatedB) { this.vRatedB = vRatedB; return thisInstance(); } @@ -326,31 +328,16 @@ public Transformer2WTypeInputCopyBuilder settapMax(int tapMax) { return thisInstance(); } + @Override + public Transformer2WTypeInput build() { + return new Transformer2WTypeInput( + getUuid(), getId(), rSc, xSc, sRated, vRatedA, vRatedB, gM, bM, dV, dPhi, tapSide, + tapNeutr, tapMin, tapMax); + } - @Override - public Transformer2WTypeInput build() { - return new Transformer2WTypeInput( - getUuid(), - getId(), - rSc, - xSc, - sRated, - vRatedA, - vRatedB, - gM, - bM, - dV, - dPhi, - tapSide, - tapNeutr, - tapMin, - tapMax - ); - } - - @Override - protected Transformer2WTypeInputCopyBuilder thisInstance() { - return this; - } + @Override + protected Transformer2WTypeInputCopyBuilder thisInstance() { + return this; + } } } diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java index ccbc2a0cd..02432fad5 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java @@ -304,7 +304,7 @@ public String toString() { * Abstract class for all builder that build child entities of abstract class {@link * Transformer3WTypeInput} */ - public final static class Transformer3WTypeInputCopyBuilder + public static final class Transformer3WTypeInputCopyBuilder extends AssetTypeInput.AssetTypeInputCopyBuilder { private ComparableQuantity sRatedA; @@ -366,12 +366,14 @@ public Transformer3WTypeInputCopyBuilder setsRatedC(ComparableQuantity sR return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setvRatedA(ComparableQuantity vRatedA) { + public Transformer3WTypeInputCopyBuilder setvRatedA( + ComparableQuantity vRatedA) { this.vRatedA = vRatedA; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setvRatedB(ComparableQuantity vRatedB) { + public Transformer3WTypeInputCopyBuilder setvRatedB( + ComparableQuantity vRatedB) { this.vRatedB = vRatedB; return thisInstance(); } @@ -381,7 +383,8 @@ public Transformer3WTypeInputCopyBuilder setrScA(ComparableQuantity vRatedC) { + public Transformer3WTypeInputCopyBuilder setvRatedC( + ComparableQuantity vRatedC) { this.vRatedC = vRatedC; return thisInstance(); } @@ -446,36 +449,16 @@ public Transformer3WTypeInputCopyBuilder setTapMax(int tapMax) { return thisInstance(); } - @Override - public Transformer3WTypeInput build() { - return new Transformer3WTypeInput( - getUuid(), - getId(), - sRatedA, - sRatedB, - sRatedC, - vRatedA, - vRatedB, - vRatedC, - rScA, - rScB, - rScC, - xScA, - xScB, - xScC, - gM, - bM, - dV, - dPhi, - tapNeutr, - tapMin, - tapMax - ); - } - - @Override - protected Transformer3WTypeInputCopyBuilder thisInstance() { - return this; - } + @Override + public Transformer3WTypeInput build() { + return new Transformer3WTypeInput( + getUuid(), getId(), sRatedA, sRatedB, sRatedC, vRatedA, vRatedB, vRatedC, rScA, rScB, + rScC, xScA, xScB, xScC, gM, bM, dV, dPhi, tapNeutr, tapMin, tapMax); + } + + @Override + protected Transformer3WTypeInputCopyBuilder thisInstance() { + return this; + } } } From 5b47fe3c25dae055a93589634fd9563450d76c46 Mon Sep 17 00:00:00 2001 From: Marvin Heintze Date: Wed, 19 Mar 2025 16:13:54 +0100 Subject: [PATCH 5/8] tests for new copybuilders --- .../type/Transformer2WTypeInput.java | 4 +- .../type/Transformer3WTypeInput.java | 6 +- .../models/typeInput/LineTypeInputTest.groovy | 44 ++++++++++++ .../Transformer2WTypeInputTest.groovy | 57 +++++++++++++++ .../Transformer3WTypeInputTest.groovy | 69 +++++++++++++++++++ 5 files changed, 175 insertions(+), 5 deletions(-) create mode 100644 src/test/groovy/edu/ie3/datamodel/models/typeInput/LineTypeInputTest.groovy create mode 100644 src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer2WTypeInputTest.groovy create mode 100644 src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer3WTypeInputTest.groovy diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java index 307d36a12..822bec4a2 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java @@ -261,12 +261,12 @@ private Transformer2WTypeInputCopyBuilder(Transformer2WTypeInput entity) { } /** Setter */ - public Transformer2WTypeInputCopyBuilder setRSc(ComparableQuantity rSc) { + public Transformer2WTypeInputCopyBuilder setrSc(ComparableQuantity rSc) { this.rSc = rSc; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setXSc(ComparableQuantity xSc) { + public Transformer2WTypeInputCopyBuilder setxSc(ComparableQuantity xSc) { this.xSc = xSc; return thisInstance(); } diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java index 02432fad5..92f70f0b7 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java @@ -434,17 +434,17 @@ public Transformer3WTypeInputCopyBuilder setdPhi(ComparableQuantity dPhi) return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setTapNeutr(int tapNeutr) { + public Transformer3WTypeInputCopyBuilder settapNeutr(int tapNeutr) { this.tapNeutr = tapNeutr; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setTapMin(int tapMin) { + public Transformer3WTypeInputCopyBuilder settapMin(int tapMin) { this.tapMin = tapMin; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setTapMax(int tapMax) { + public Transformer3WTypeInputCopyBuilder settapMax(int tapMax) { this.tapMax = tapMax; return thisInstance(); } diff --git a/src/test/groovy/edu/ie3/datamodel/models/typeInput/LineTypeInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/typeInput/LineTypeInputTest.groovy new file mode 100644 index 000000000..b54751b95 --- /dev/null +++ b/src/test/groovy/edu/ie3/datamodel/models/typeInput/LineTypeInputTest.groovy @@ -0,0 +1,44 @@ +/* + * © 2025. TU Dortmund University, + * Institute of Energy Systems, Energy Efficiency and Energy Economics, + * Research group Distribution grid planning and operation + */ +package edu.ie3.datamodel.models.typeInput + +import edu.ie3.test.common.GridTestData +import edu.ie3.util.quantities.PowerSystemUnits +import spock.lang.Specification +import tech.units.indriya.quantity.Quantities +import tech.units.indriya.unit.Units + +class LineTypeInputTest extends Specification { + + def "A LineTypeInput copy method should work as expected"(){ + given: + + def lineTypeInput = GridTestData.lineTypeInputCtoD + + when: + def alteredUnit = lineTypeInput.copy() + .id("lineTypeInput_copy") + .setB(Quantities.getQuantity(0.1d, PowerSystemUnits.MICRO_SIEMENS_PER_KILOMETRE)) + .setG(Quantities.getQuantity(0.1d, PowerSystemUnits.MICRO_SIEMENS_PER_KILOMETRE)) + .setR(Quantities.getQuantity(0.5d, PowerSystemUnits.OHM_PER_KILOMETRE)) + .setX(Quantities.getQuantity(0.4d, PowerSystemUnits.OHM_PER_KILOMETRE)) + .setiMax(Quantities.getQuantity(310d, Units.AMPERE)) + .setvRated(Quantities.getQuantity(30d, Units.VOLT)) + .build() + + then: + alteredUnit.with { + assert uuid == lineTypeInput.uuid + assert id == "lineTypeInput_copy" + assert b == Quantities.getQuantity(0.1d, PowerSystemUnits.MICRO_SIEMENS_PER_KILOMETRE) + assert g == Quantities.getQuantity(0.1d, PowerSystemUnits.MICRO_SIEMENS_PER_KILOMETRE) + assert r == Quantities.getQuantity(0.5d, PowerSystemUnits.OHM_PER_KILOMETRE) + assert x == Quantities.getQuantity(0.4d, PowerSystemUnits.OHM_PER_KILOMETRE) + assert iMax == Quantities.getQuantity(310d, Units.AMPERE) + assert vRated == Quantities.getQuantity(30d, Units.VOLT) + } + } +} diff --git a/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer2WTypeInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer2WTypeInputTest.groovy new file mode 100644 index 000000000..e1462e397 --- /dev/null +++ b/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer2WTypeInputTest.groovy @@ -0,0 +1,57 @@ +/* + * © 2025. TU Dortmund University, + * Institute of Energy Systems, Energy Efficiency and Energy Economics, + * Research group Distribution grid planning and operation + */ +package edu.ie3.datamodel.models.typeInput + +import edu.ie3.test.common.GridTestData +import edu.ie3.util.quantities.PowerSystemUnits +import spock.lang.Specification +import tech.units.indriya.quantity.Quantities +import tech.units.indriya.unit.Units + +class Transformer2WTypeInputTest extends Specification{ + + def "A Transformer2WTypeInput copy method should work as expected"() { + given: + def transformer2WTypeInput = GridTestData.transformerTypeBtoD + + when: + def alteredUnit = transformer2WTypeInput.copy() + .id("transformer2WTypeInput_copy") + .setrSc(Quantities.getQuantity(1, Units.OHM)) + .setxSc(Quantities.getQuantity(52, Units.OHM)) + .setsRated(Quantities.getQuantity(50000, PowerSystemUnits.KILOWATT)) + .setvRatedA(Quantities.getQuantity(111, PowerSystemUnits.KILOVOLT)) + .setvRatedB(Quantities.getQuantity(11, PowerSystemUnits.KILOVOLT)) + .setgM(Quantities.getQuantity(1, PowerSystemUnits.NANOSIEMENS)) + .setbM(Quantities.getQuantity(1, PowerSystemUnits.NANOSIEMENS)) + .setdV(Quantities.getQuantity(2, PowerSystemUnits.PERCENT)) + .setdPhi(Quantities.getQuantity(1, PowerSystemUnits.DEGREE_GEOM)) + .settapSide(true) + .settapNeutr(11) + .settapMin(2) + .settapMax(20) + .build() + + then: + alteredUnit.with { + assert uuid == transformer2WTypeInput.uuid + assert id == "transformer2WTypeInput_copy" + assert rSc == Quantities.getQuantity(1, Units.OHM) + assert xSc == Quantities.getQuantity(52, Units.OHM) + assert sRated == Quantities.getQuantity(50000, PowerSystemUnits.KILOWATT) + assert vRatedA == Quantities.getQuantity(111, PowerSystemUnits.KILOVOLT) + assert vRatedB == Quantities.getQuantity(11, PowerSystemUnits.KILOVOLT) + assert gM == Quantities.getQuantity(1, PowerSystemUnits.NANOSIEMENS) + assert bM == Quantities.getQuantity(1, PowerSystemUnits.NANOSIEMENS) + assert dV == Quantities.getQuantity(2, PowerSystemUnits.PERCENT) + assert dPhi == Quantities.getQuantity(1, PowerSystemUnits.DEGREE_GEOM) + assert tapSide + assert tapNeutr == 11 + assert tapMin == 2 + assert tapMax == 20 + } + } +} diff --git a/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer3WTypeInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer3WTypeInputTest.groovy new file mode 100644 index 000000000..29cef9074 --- /dev/null +++ b/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer3WTypeInputTest.groovy @@ -0,0 +1,69 @@ +/* + * © 2025. TU Dortmund University, + * Institute of Energy Systems, Energy Efficiency and Energy Economics, + * Research group Distribution grid planning and operation + */ +package edu.ie3.datamodel.models.typeInput + +import edu.ie3.test.common.GridTestData +import edu.ie3.util.quantities.PowerSystemUnits +import spock.lang.Specification +import tech.units.indriya.quantity.Quantities +import tech.units.indriya.unit.Units + +class Transformer3WTypeInputTest extends Specification{ + + def "A Transformer2WTypeInput copy method should work as expected"() { + given: + def transformer3WTypeInput = GridTestData.transformerTypeAtoBtoC + + when: + def alteredUnit = transformer3WTypeInput.copy() + .id("transformer3WTypeInput_copy") + .setsRatedA(Quantities.getQuantity(100000, PowerSystemUnits.KILOWATT)) + .setsRatedB(Quantities.getQuantity(70000, PowerSystemUnits.KILOWATT)) + .setsRatedC(Quantities.getQuantity(50000, PowerSystemUnits.KILOWATT)) + .setvRatedA(Quantities.getQuantity(400, PowerSystemUnits.KILOVOLT)) + .setvRatedB(Quantities.getQuantity(120, PowerSystemUnits.KILOVOLT)) + .setvRatedC(Quantities.getQuantity(30, PowerSystemUnits.KILOVOLT)) + .setrScA(Quantities.getQuantity(3, Units.OHM)) + .setrScB(Quantities.getQuantity(2, Units.OHM)) + .setrScC(Quantities.getQuantity(1, Units.OHM)) + .setxScA(Quantities.getQuantity(3, Units.OHM)) + .setxScB(Quantities.getQuantity(2, Units.OHM)) + .setxScC(Quantities.getQuantity(1, Units.OHM)) + .setgM(Quantities.getQuantity(50000, PowerSystemUnits.NANOSIEMENS)) + .setbM(Quantities.getQuantity(-2000, PowerSystemUnits.NANOSIEMENS)) + .setdV(Quantities.getQuantity(2, PowerSystemUnits.PERCENT)) + .setdPhi(Quantities.getQuantity(1, PowerSystemUnits.DEGREE_GEOM)) + .settapNeutr(1) + .settapMin(-11) + .settapMax(20) + .build() + + then: + alteredUnit.with { + assert uuid == transformer3WTypeInput.uuid + assert id == "transformer3WTypeInput_copy" + assert rScA == Quantities.getQuantity(3, Units.OHM) + assert rScB == Quantities.getQuantity(2, Units.OHM) + assert rScC == Quantities.getQuantity(1, Units.OHM) + assert xScA == Quantities.getQuantity(3, Units.OHM) + assert xScB == Quantities.getQuantity(2, Units.OHM) + assert xScC == Quantities.getQuantity(1, Units.OHM) + assert sRatedA == Quantities.getQuantity(100000, PowerSystemUnits.KILOWATT) + assert sRatedB == Quantities.getQuantity(70000, PowerSystemUnits.KILOWATT) + assert sRatedC == Quantities.getQuantity(50000, PowerSystemUnits.KILOWATT) + assert vRatedA == Quantities.getQuantity(400, PowerSystemUnits.KILOVOLT) + assert vRatedB == Quantities.getQuantity(120, PowerSystemUnits.KILOVOLT) + assert vRatedC == Quantities.getQuantity(30, PowerSystemUnits.KILOVOLT) + assert gM == Quantities.getQuantity(50000, PowerSystemUnits.NANOSIEMENS) + assert bM == Quantities.getQuantity(-2000, PowerSystemUnits.NANOSIEMENS) + assert dV == Quantities.getQuantity(2, PowerSystemUnits.PERCENT) + assert dPhi == Quantities.getQuantity(1, PowerSystemUnits.DEGREE_GEOM) + assert tapNeutr == 1 + assert tapMin == -11 + assert tapMax == 20 + } + } +} From 51dd97a34dc875a5f5d0f1ade13ca7460cf5ae83 Mon Sep 17 00:00:00 2001 From: Marvin Heintze Date: Sat, 22 Mar 2025 13:13:39 +0100 Subject: [PATCH 6/8] corrected setter naming --- CHANGELOG.md | 2 +- .../input/connector/type/LineTypeInput.java | 4 +- .../type/Transformer2WTypeInput.java | 26 ++++++------- .../type/Transformer3WTypeInput.java | 38 +++++++++---------- .../models/typeInput/LineTypeInputTest.groovy | 4 +- .../Transformer2WTypeInputTest.groovy | 26 ++++++------- .../Transformer3WTypeInputTest.groovy | 38 +++++++++---------- 7 files changed, 69 insertions(+), 69 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ee440c1c..915dfd9d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased/Snapshot] -- Added `CopyBuilders` to `Line-/Transformer2W-/Tranformer3WTypeInput` [#1275](https://github.com/ie3-institute/PowerSystemDataModel/issues/1275) ### Added - Implemented GitHub Actions for automatic code integration. [#1237](https://github.com/ie3-institute/PowerSystemDataModel/issues/1237) +- Added `CopyBuilders` to `Line-/Transformer2W-/Tranformer3WTypeInput` [#1275](https://github.com/ie3-institute/PowerSystemDataModel/issues/1275) ### Fixed - Fixed SonarQube junit path issue in GitHub Actions [#1284](https://github.com/ie3-institute/PowerSystemDataModel/issues/1284) diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java index e8d6d60c9..3fdc2b995 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java @@ -172,12 +172,12 @@ public LineTypeInputCopyBuilder setX(ComparableQuantity x) { return thisInstance(); } - public LineTypeInputCopyBuilder setiMax(ComparableQuantity iMax) { + public LineTypeInputCopyBuilder setIMax(ComparableQuantity iMax) { this.iMax = iMax; return thisInstance(); } - public LineTypeInputCopyBuilder setvRated(ComparableQuantity vRated) { + public LineTypeInputCopyBuilder setVRated(ComparableQuantity vRated) { this.vRated = vRated; return thisInstance(); } diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java index 822bec4a2..38c960794 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java @@ -261,69 +261,69 @@ private Transformer2WTypeInputCopyBuilder(Transformer2WTypeInput entity) { } /** Setter */ - public Transformer2WTypeInputCopyBuilder setrSc(ComparableQuantity rSc) { + public Transformer2WTypeInputCopyBuilder setRSc(ComparableQuantity rSc) { this.rSc = rSc; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setxSc(ComparableQuantity xSc) { + public Transformer2WTypeInputCopyBuilder setXSc(ComparableQuantity xSc) { this.xSc = xSc; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setsRated(ComparableQuantity sRated) { + public Transformer2WTypeInputCopyBuilder setSRated(ComparableQuantity sRated) { this.sRated = sRated; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setvRatedA( + public Transformer2WTypeInputCopyBuilder setVRatedA( ComparableQuantity vRatedA) { this.vRatedA = vRatedA; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setvRatedB( + public Transformer2WTypeInputCopyBuilder setVRatedB( ComparableQuantity vRatedB) { this.vRatedB = vRatedB; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setgM(ComparableQuantity gM) { + public Transformer2WTypeInputCopyBuilder setGM(ComparableQuantity gM) { this.gM = gM; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setbM(ComparableQuantity bM) { + public Transformer2WTypeInputCopyBuilder setBM(ComparableQuantity bM) { this.bM = bM; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setdV(ComparableQuantity dV) { + public Transformer2WTypeInputCopyBuilder setDV(ComparableQuantity dV) { this.dV = dV; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setdPhi(ComparableQuantity dPhi) { + public Transformer2WTypeInputCopyBuilder setDPhi(ComparableQuantity dPhi) { this.dPhi = dPhi; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder settapSide(boolean tapSide) { + public Transformer2WTypeInputCopyBuilder setTapSide(boolean tapSide) { this.tapSide = tapSide; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder settapNeutr(int tapNeutr) { + public Transformer2WTypeInputCopyBuilder setTapNeutr(int tapNeutr) { this.tapNeutr = tapNeutr; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder settapMin(int tapMin) { + public Transformer2WTypeInputCopyBuilder setTapMin(int tapMin) { this.tapMin = tapMin; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder settapMax(int tapMax) { + public Transformer2WTypeInputCopyBuilder setTapMax(int tapMax) { this.tapMax = tapMax; return thisInstance(); } diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java index 92f70f0b7..cc2d7956b 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java @@ -351,100 +351,100 @@ private Transformer3WTypeInputCopyBuilder(Transformer3WTypeInput entity) { } /** Setter */ - public Transformer3WTypeInputCopyBuilder setsRatedA(ComparableQuantity sRatedA) { + public Transformer3WTypeInputCopyBuilder setSRatedA(ComparableQuantity sRatedA) { this.sRatedA = sRatedA; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setsRatedB(ComparableQuantity sRatedB) { + public Transformer3WTypeInputCopyBuilder setSRatedB(ComparableQuantity sRatedB) { this.sRatedB = sRatedB; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setsRatedC(ComparableQuantity sRatedC) { + public Transformer3WTypeInputCopyBuilder setSRatedC(ComparableQuantity sRatedC) { this.sRatedC = sRatedC; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setvRatedA( + public Transformer3WTypeInputCopyBuilder setVRatedA( ComparableQuantity vRatedA) { this.vRatedA = vRatedA; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setvRatedB( + public Transformer3WTypeInputCopyBuilder setVRatedB( ComparableQuantity vRatedB) { this.vRatedB = vRatedB; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setrScA(ComparableQuantity rScA) { + public Transformer3WTypeInputCopyBuilder setRScA(ComparableQuantity rScA) { this.rScA = rScA; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setvRatedC( + public Transformer3WTypeInputCopyBuilder setVRatedC( ComparableQuantity vRatedC) { this.vRatedC = vRatedC; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setrScB(ComparableQuantity rScB) { + public Transformer3WTypeInputCopyBuilder setRScB(ComparableQuantity rScB) { this.rScB = rScB; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setrScC(ComparableQuantity rScC) { + public Transformer3WTypeInputCopyBuilder setRScC(ComparableQuantity rScC) { this.rScC = rScC; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setxScA(ComparableQuantity xScA) { + public Transformer3WTypeInputCopyBuilder setXScA(ComparableQuantity xScA) { this.xScA = xScA; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setxScB(ComparableQuantity xScB) { + public Transformer3WTypeInputCopyBuilder setXScB(ComparableQuantity xScB) { this.xScB = xScB; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setxScC(ComparableQuantity xScC) { + public Transformer3WTypeInputCopyBuilder setXScC(ComparableQuantity xScC) { this.xScC = xScC; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setgM(ComparableQuantity gM) { + public Transformer3WTypeInputCopyBuilder setGM(ComparableQuantity gM) { this.gM = gM; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setbM(ComparableQuantity bM) { + public Transformer3WTypeInputCopyBuilder setBM(ComparableQuantity bM) { this.bM = bM; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setdV(ComparableQuantity dV) { + public Transformer3WTypeInputCopyBuilder setDV(ComparableQuantity dV) { this.dV = dV; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setdPhi(ComparableQuantity dPhi) { + public Transformer3WTypeInputCopyBuilder setDPhi(ComparableQuantity dPhi) { this.dPhi = dPhi; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder settapNeutr(int tapNeutr) { + public Transformer3WTypeInputCopyBuilder setTapNeutr(int tapNeutr) { this.tapNeutr = tapNeutr; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder settapMin(int tapMin) { + public Transformer3WTypeInputCopyBuilder setTapMin(int tapMin) { this.tapMin = tapMin; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder settapMax(int tapMax) { + public Transformer3WTypeInputCopyBuilder setTapMax(int tapMax) { this.tapMax = tapMax; return thisInstance(); } diff --git a/src/test/groovy/edu/ie3/datamodel/models/typeInput/LineTypeInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/typeInput/LineTypeInputTest.groovy index b54751b95..fe10b827a 100644 --- a/src/test/groovy/edu/ie3/datamodel/models/typeInput/LineTypeInputTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/models/typeInput/LineTypeInputTest.groovy @@ -25,8 +25,8 @@ class LineTypeInputTest extends Specification { .setG(Quantities.getQuantity(0.1d, PowerSystemUnits.MICRO_SIEMENS_PER_KILOMETRE)) .setR(Quantities.getQuantity(0.5d, PowerSystemUnits.OHM_PER_KILOMETRE)) .setX(Quantities.getQuantity(0.4d, PowerSystemUnits.OHM_PER_KILOMETRE)) - .setiMax(Quantities.getQuantity(310d, Units.AMPERE)) - .setvRated(Quantities.getQuantity(30d, Units.VOLT)) + .setIMax(Quantities.getQuantity(310d, Units.AMPERE)) + .setVRated(Quantities.getQuantity(30d, Units.VOLT)) .build() then: diff --git a/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer2WTypeInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer2WTypeInputTest.groovy index e1462e397..b3d0b63bd 100644 --- a/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer2WTypeInputTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer2WTypeInputTest.groovy @@ -20,19 +20,19 @@ class Transformer2WTypeInputTest extends Specification{ when: def alteredUnit = transformer2WTypeInput.copy() .id("transformer2WTypeInput_copy") - .setrSc(Quantities.getQuantity(1, Units.OHM)) - .setxSc(Quantities.getQuantity(52, Units.OHM)) - .setsRated(Quantities.getQuantity(50000, PowerSystemUnits.KILOWATT)) - .setvRatedA(Quantities.getQuantity(111, PowerSystemUnits.KILOVOLT)) - .setvRatedB(Quantities.getQuantity(11, PowerSystemUnits.KILOVOLT)) - .setgM(Quantities.getQuantity(1, PowerSystemUnits.NANOSIEMENS)) - .setbM(Quantities.getQuantity(1, PowerSystemUnits.NANOSIEMENS)) - .setdV(Quantities.getQuantity(2, PowerSystemUnits.PERCENT)) - .setdPhi(Quantities.getQuantity(1, PowerSystemUnits.DEGREE_GEOM)) - .settapSide(true) - .settapNeutr(11) - .settapMin(2) - .settapMax(20) + .setRSc(Quantities.getQuantity(1, Units.OHM)) + .setXSc(Quantities.getQuantity(52, Units.OHM)) + .setSRated(Quantities.getQuantity(50000, PowerSystemUnits.KILOWATT)) + .setVRatedA(Quantities.getQuantity(111, PowerSystemUnits.KILOVOLT)) + .setVRatedB(Quantities.getQuantity(11, PowerSystemUnits.KILOVOLT)) + .setGM(Quantities.getQuantity(1, PowerSystemUnits.NANOSIEMENS)) + .setBM(Quantities.getQuantity(1, PowerSystemUnits.NANOSIEMENS)) + .setDV(Quantities.getQuantity(2, PowerSystemUnits.PERCENT)) + .setDPhi(Quantities.getQuantity(1, PowerSystemUnits.DEGREE_GEOM)) + .setTapSide(true) + .setTapNeutr(11) + .setTapMin(2) + .setTapMax(20) .build() then: diff --git a/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer3WTypeInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer3WTypeInputTest.groovy index 29cef9074..2625f7c7f 100644 --- a/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer3WTypeInputTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer3WTypeInputTest.groovy @@ -20,25 +20,25 @@ class Transformer3WTypeInputTest extends Specification{ when: def alteredUnit = transformer3WTypeInput.copy() .id("transformer3WTypeInput_copy") - .setsRatedA(Quantities.getQuantity(100000, PowerSystemUnits.KILOWATT)) - .setsRatedB(Quantities.getQuantity(70000, PowerSystemUnits.KILOWATT)) - .setsRatedC(Quantities.getQuantity(50000, PowerSystemUnits.KILOWATT)) - .setvRatedA(Quantities.getQuantity(400, PowerSystemUnits.KILOVOLT)) - .setvRatedB(Quantities.getQuantity(120, PowerSystemUnits.KILOVOLT)) - .setvRatedC(Quantities.getQuantity(30, PowerSystemUnits.KILOVOLT)) - .setrScA(Quantities.getQuantity(3, Units.OHM)) - .setrScB(Quantities.getQuantity(2, Units.OHM)) - .setrScC(Quantities.getQuantity(1, Units.OHM)) - .setxScA(Quantities.getQuantity(3, Units.OHM)) - .setxScB(Quantities.getQuantity(2, Units.OHM)) - .setxScC(Quantities.getQuantity(1, Units.OHM)) - .setgM(Quantities.getQuantity(50000, PowerSystemUnits.NANOSIEMENS)) - .setbM(Quantities.getQuantity(-2000, PowerSystemUnits.NANOSIEMENS)) - .setdV(Quantities.getQuantity(2, PowerSystemUnits.PERCENT)) - .setdPhi(Quantities.getQuantity(1, PowerSystemUnits.DEGREE_GEOM)) - .settapNeutr(1) - .settapMin(-11) - .settapMax(20) + .setSRatedA(Quantities.getQuantity(100000, PowerSystemUnits.KILOWATT)) + .setSRatedB(Quantities.getQuantity(70000, PowerSystemUnits.KILOWATT)) + .setSRatedC(Quantities.getQuantity(50000, PowerSystemUnits.KILOWATT)) + .setVRatedA(Quantities.getQuantity(400, PowerSystemUnits.KILOVOLT)) + .setVRatedB(Quantities.getQuantity(120, PowerSystemUnits.KILOVOLT)) + .setVRatedC(Quantities.getQuantity(30, PowerSystemUnits.KILOVOLT)) + .setRScA(Quantities.getQuantity(3, Units.OHM)) + .setRScB(Quantities.getQuantity(2, Units.OHM)) + .setRScC(Quantities.getQuantity(1, Units.OHM)) + .setXScA(Quantities.getQuantity(3, Units.OHM)) + .setXScB(Quantities.getQuantity(2, Units.OHM)) + .setXScC(Quantities.getQuantity(1, Units.OHM)) + .setGM(Quantities.getQuantity(50000, PowerSystemUnits.NANOSIEMENS)) + .setBM(Quantities.getQuantity(-2000, PowerSystemUnits.NANOSIEMENS)) + .setDV(Quantities.getQuantity(2, PowerSystemUnits.PERCENT)) + .setDPhi(Quantities.getQuantity(1, PowerSystemUnits.DEGREE_GEOM)) + .setTapNeutr(1) + .setTapMin(-11) + .setTapMax(20) .build() then: From d8cbc7e060ce5667f9ffedd1488835964cda7668 Mon Sep 17 00:00:00 2001 From: Marvin Heintze Date: Wed, 26 Mar 2025 14:21:58 +0100 Subject: [PATCH 7/8] copybuilder setter name only variable --- .../input/connector/type/LineTypeInput.java | 12 +++--- .../type/Transformer2WTypeInput.java | 26 ++++++------- .../type/Transformer3WTypeInput.java | 38 +++++++++---------- .../models/input/system/type/BmTypeInput.java | 4 +- .../input/system/type/ChpTypeInput.java | 16 ++++---- .../models/input/system/type/EvTypeInput.java | 4 +- .../models/input/system/type/HpTypeInput.java | 8 ++-- .../input/system/type/StorageTypeInput.java | 4 +- .../type/SystemParticipantTypeInput.java | 8 ++-- .../input/system/type/WecTypeInput.java | 4 +- .../input/system/type/BmTypeInputTest.groovy | 6 +-- .../input/system/type/ChpTypeInputTest.groovy | 6 +-- .../input/system/type/HpTypeInputTest.groovy | 4 +- .../models/typeInput/LineTypeInputTest.groovy | 12 +++--- .../Transformer2WTypeInputTest.groovy | 26 ++++++------- .../Transformer3WTypeInputTest.groovy | 38 +++++++++---------- 16 files changed, 108 insertions(+), 108 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java index 3fdc2b995..9e18c980b 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java @@ -152,32 +152,32 @@ protected LineTypeInputCopyBuilder(LineTypeInput entity) { } /** Setter */ - public LineTypeInputCopyBuilder setB(ComparableQuantity b) { + public LineTypeInputCopyBuilder b(ComparableQuantity b) { this.b = b; return thisInstance(); } - public LineTypeInputCopyBuilder setG(ComparableQuantity g) { + public LineTypeInputCopyBuilder g(ComparableQuantity g) { this.g = g; return thisInstance(); } - public LineTypeInputCopyBuilder setR(ComparableQuantity r) { + public LineTypeInputCopyBuilder r(ComparableQuantity r) { this.r = r; return thisInstance(); } - public LineTypeInputCopyBuilder setX(ComparableQuantity x) { + public LineTypeInputCopyBuilder x(ComparableQuantity x) { this.x = x; return thisInstance(); } - public LineTypeInputCopyBuilder setIMax(ComparableQuantity iMax) { + public LineTypeInputCopyBuilder iMax(ComparableQuantity iMax) { this.iMax = iMax; return thisInstance(); } - public LineTypeInputCopyBuilder setVRated(ComparableQuantity vRated) { + public LineTypeInputCopyBuilder vRated(ComparableQuantity vRated) { this.vRated = vRated; return thisInstance(); } diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java index 38c960794..b5a81b6aa 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java @@ -261,69 +261,69 @@ private Transformer2WTypeInputCopyBuilder(Transformer2WTypeInput entity) { } /** Setter */ - public Transformer2WTypeInputCopyBuilder setRSc(ComparableQuantity rSc) { + public Transformer2WTypeInputCopyBuilder rSc(ComparableQuantity rSc) { this.rSc = rSc; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setXSc(ComparableQuantity xSc) { + public Transformer2WTypeInputCopyBuilder xSc(ComparableQuantity xSc) { this.xSc = xSc; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setSRated(ComparableQuantity sRated) { + public Transformer2WTypeInputCopyBuilder sRated(ComparableQuantity sRated) { this.sRated = sRated; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setVRatedA( + public Transformer2WTypeInputCopyBuilder vRatedA( ComparableQuantity vRatedA) { this.vRatedA = vRatedA; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setVRatedB( + public Transformer2WTypeInputCopyBuilder vRatedB( ComparableQuantity vRatedB) { this.vRatedB = vRatedB; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setGM(ComparableQuantity gM) { + public Transformer2WTypeInputCopyBuilder gM(ComparableQuantity gM) { this.gM = gM; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setBM(ComparableQuantity bM) { + public Transformer2WTypeInputCopyBuilder bM(ComparableQuantity bM) { this.bM = bM; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setDV(ComparableQuantity dV) { + public Transformer2WTypeInputCopyBuilder dV(ComparableQuantity dV) { this.dV = dV; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setDPhi(ComparableQuantity dPhi) { + public Transformer2WTypeInputCopyBuilder dPhi(ComparableQuantity dPhi) { this.dPhi = dPhi; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setTapSide(boolean tapSide) { + public Transformer2WTypeInputCopyBuilder tapSide(boolean tapSide) { this.tapSide = tapSide; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setTapNeutr(int tapNeutr) { + public Transformer2WTypeInputCopyBuilder tapNeutr(int tapNeutr) { this.tapNeutr = tapNeutr; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setTapMin(int tapMin) { + public Transformer2WTypeInputCopyBuilder tapMin(int tapMin) { this.tapMin = tapMin; return thisInstance(); } - public Transformer2WTypeInputCopyBuilder setTapMax(int tapMax) { + public Transformer2WTypeInputCopyBuilder tapMax(int tapMax) { this.tapMax = tapMax; return thisInstance(); } diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java index cc2d7956b..b57402b44 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java @@ -351,100 +351,100 @@ private Transformer3WTypeInputCopyBuilder(Transformer3WTypeInput entity) { } /** Setter */ - public Transformer3WTypeInputCopyBuilder setSRatedA(ComparableQuantity sRatedA) { + public Transformer3WTypeInputCopyBuilder sRatedA(ComparableQuantity sRatedA) { this.sRatedA = sRatedA; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setSRatedB(ComparableQuantity sRatedB) { + public Transformer3WTypeInputCopyBuilder sRatedB(ComparableQuantity sRatedB) { this.sRatedB = sRatedB; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setSRatedC(ComparableQuantity sRatedC) { + public Transformer3WTypeInputCopyBuilder sRatedC(ComparableQuantity sRatedC) { this.sRatedC = sRatedC; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setVRatedA( + public Transformer3WTypeInputCopyBuilder vRatedA( ComparableQuantity vRatedA) { this.vRatedA = vRatedA; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setVRatedB( + public Transformer3WTypeInputCopyBuilder vRatedB( ComparableQuantity vRatedB) { this.vRatedB = vRatedB; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setRScA(ComparableQuantity rScA) { + public Transformer3WTypeInputCopyBuilder rScA(ComparableQuantity rScA) { this.rScA = rScA; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setVRatedC( + public Transformer3WTypeInputCopyBuilder vRatedC( ComparableQuantity vRatedC) { this.vRatedC = vRatedC; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setRScB(ComparableQuantity rScB) { + public Transformer3WTypeInputCopyBuilder rScB(ComparableQuantity rScB) { this.rScB = rScB; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setRScC(ComparableQuantity rScC) { + public Transformer3WTypeInputCopyBuilder rScC(ComparableQuantity rScC) { this.rScC = rScC; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setXScA(ComparableQuantity xScA) { + public Transformer3WTypeInputCopyBuilder xScA(ComparableQuantity xScA) { this.xScA = xScA; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setXScB(ComparableQuantity xScB) { + public Transformer3WTypeInputCopyBuilder xScB(ComparableQuantity xScB) { this.xScB = xScB; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setXScC(ComparableQuantity xScC) { + public Transformer3WTypeInputCopyBuilder xScC(ComparableQuantity xScC) { this.xScC = xScC; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setGM(ComparableQuantity gM) { + public Transformer3WTypeInputCopyBuilder gM(ComparableQuantity gM) { this.gM = gM; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setBM(ComparableQuantity bM) { + public Transformer3WTypeInputCopyBuilder bM(ComparableQuantity bM) { this.bM = bM; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setDV(ComparableQuantity dV) { + public Transformer3WTypeInputCopyBuilder dV(ComparableQuantity dV) { this.dV = dV; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setDPhi(ComparableQuantity dPhi) { + public Transformer3WTypeInputCopyBuilder dPhi(ComparableQuantity dPhi) { this.dPhi = dPhi; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setTapNeutr(int tapNeutr) { + public Transformer3WTypeInputCopyBuilder tapNeutr(int tapNeutr) { this.tapNeutr = tapNeutr; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setTapMin(int tapMin) { + public Transformer3WTypeInputCopyBuilder tapMin(int tapMin) { this.tapMin = tapMin; return thisInstance(); } - public Transformer3WTypeInputCopyBuilder setTapMax(int tapMax) { + public Transformer3WTypeInputCopyBuilder tapMax(int tapMax) { this.tapMax = tapMax; return thisInstance(); } diff --git a/src/main/java/edu/ie3/datamodel/models/input/system/type/BmTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/system/type/BmTypeInput.java index 5faeb730b..42857cf38 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/system/type/BmTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/system/type/BmTypeInput.java @@ -132,8 +132,8 @@ public ComparableQuantity getEtaConv() { @Override public BmTypeInputCopyBuilder scale(Double factor) { - setCapex(getCapex().multiply(factor)); - setsRated(getsRated().multiply(factor)); + capex(getCapex().multiply(factor)); + sRated(getsRated().multiply(factor)); return thisInstance(); } diff --git a/src/main/java/edu/ie3/datamodel/models/input/system/type/ChpTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/system/type/ChpTypeInput.java index d409d6802..46f6456fc 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/system/type/ChpTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/system/type/ChpTypeInput.java @@ -138,22 +138,22 @@ private ChpTypeInputCopyBuilder(ChpTypeInput entity) { this.pOwn = entity.getpOwn(); } - public ChpTypeInputCopyBuilder setEtaEl(ComparableQuantity etaEl) { + public ChpTypeInputCopyBuilder etaEl(ComparableQuantity etaEl) { this.etaEl = etaEl; return thisInstance(); } - public ChpTypeInputCopyBuilder setEtaThermal(ComparableQuantity etaThermal) { + public ChpTypeInputCopyBuilder etaThermal(ComparableQuantity etaThermal) { this.etaThermal = etaThermal; return thisInstance(); } - public ChpTypeInputCopyBuilder setpThermal(ComparableQuantity pThermal) { + public ChpTypeInputCopyBuilder pThermal(ComparableQuantity pThermal) { this.pThermal = pThermal; return thisInstance(); } - public ChpTypeInputCopyBuilder setpOwn(ComparableQuantity pOwn) { + public ChpTypeInputCopyBuilder pOwn(ComparableQuantity pOwn) { this.pOwn = pOwn; return thisInstance(); } @@ -176,10 +176,10 @@ public ComparableQuantity getpOwn() { @Override public ChpTypeInput.ChpTypeInputCopyBuilder scale(Double factor) { - setCapex(getCapex().multiply(factor)); - setsRated(getsRated().multiply(factor)); - setpThermal(getpThermal().multiply(factor)); - setpOwn(getpOwn().multiply(factor)); + capex(getCapex().multiply(factor)); + sRated(getsRated().multiply(factor)); + pThermal(getpThermal().multiply(factor)); + pOwn(getpOwn().multiply(factor)); return thisInstance(); } diff --git a/src/main/java/edu/ie3/datamodel/models/input/system/type/EvTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/system/type/EvTypeInput.java index d1b767b88..335a3577f 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/system/type/EvTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/system/type/EvTypeInput.java @@ -154,8 +154,8 @@ public ComparableQuantity getsRatedDC() { @Override public EvTypeInput.EvTypeInputCopyBuilder scale(Double factor) { - setCapex(getCapex().multiply(factor)); - setsRated(getsRated().multiply(factor)); + capex(getCapex().multiply(factor)); + sRated(getsRated().multiply(factor)); seteStorage(geteStorage().multiply(factor)); seteCons(geteCons().multiply(factor)); setsRatedDC(getsRatedDC().multiply(factor)); diff --git a/src/main/java/edu/ie3/datamodel/models/input/system/type/HpTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/system/type/HpTypeInput.java index d7c20074d..9962e9578 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/system/type/HpTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/system/type/HpTypeInput.java @@ -96,7 +96,7 @@ private HpTypeInputCopyBuilder(HpTypeInput entity) { this.pThermal = entity.getpThermal(); } - public HpTypeInputCopyBuilder setpThermal(ComparableQuantity pThermal) { + public HpTypeInputCopyBuilder pThermal(ComparableQuantity pThermal) { this.pThermal = pThermal; return thisInstance(); } @@ -107,9 +107,9 @@ public ComparableQuantity getpThermal() { @Override public HpTypeInput.HpTypeInputCopyBuilder scale(Double factor) { - setCapex(getCapex().multiply(factor)); - setsRated(getsRated().multiply(factor)); - setpThermal(getpThermal().multiply(factor)); + capex(getCapex().multiply(factor)); + sRated(getsRated().multiply(factor)); + pThermal(getpThermal().multiply(factor)); return thisInstance(); } diff --git a/src/main/java/edu/ie3/datamodel/models/input/system/type/StorageTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/system/type/StorageTypeInput.java index ece9ef539..fea673886 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/system/type/StorageTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/system/type/StorageTypeInput.java @@ -211,8 +211,8 @@ public int getLifeCycle() { @Override public StorageTypeInput.StorageTypeInputCopyBuilder scale(Double factor) { - setCapex(getCapex().multiply(factor)); - setsRated(getsRated().multiply(factor)); + capex(getCapex().multiply(factor)); + sRated(getsRated().multiply(factor)); seteStorage(geteStorage().multiply(factor)); setpMax(getpMax().multiply(factor)); return thisInstance(); diff --git a/src/main/java/edu/ie3/datamodel/models/input/system/type/SystemParticipantTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/system/type/SystemParticipantTypeInput.java index 2ca58506f..c287c55ab 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/system/type/SystemParticipantTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/system/type/SystemParticipantTypeInput.java @@ -119,22 +119,22 @@ protected SystemParticipantTypeInputCopyBuilder(SystemParticipantTypeInput entit this.cosPhiRated = entity.getCosPhiRated(); } - public B setCapex(ComparableQuantity capex) { + public B capex(ComparableQuantity capex) { this.capex = capex; return thisInstance(); } - public B setOpex(ComparableQuantity opex) { + public B opex(ComparableQuantity opex) { this.opex = opex; return thisInstance(); } - public B setsRated(ComparableQuantity sRated) { + public B sRated(ComparableQuantity sRated) { this.sRated = sRated; return thisInstance(); } - public B setCosPhiRated(double cosPhiRated) { + public B cosPhiRated(double cosPhiRated) { this.cosPhiRated = cosPhiRated; return thisInstance(); } diff --git a/src/main/java/edu/ie3/datamodel/models/input/system/type/WecTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/system/type/WecTypeInput.java index 4b096ce28..219525eaf 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/system/type/WecTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/system/type/WecTypeInput.java @@ -179,8 +179,8 @@ public ComparableQuantity getHubHeight() { @Override public WecTypeInput.WecTypeInputCopyBuilder scale(Double factor) { - setCapex(getCapex().multiply(factor)); - setsRated(getsRated().multiply(factor)); + capex(getCapex().multiply(factor)); + sRated(getsRated().multiply(factor)); setRotorArea(getRotorArea().multiply(factor)); return thisInstance(); } diff --git a/src/test/groovy/edu/ie3/datamodel/models/input/system/type/BmTypeInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/input/system/type/BmTypeInputTest.groovy index ebf8077ff..258a9a181 100644 --- a/src/test/groovy/edu/ie3/datamodel/models/input/system/type/BmTypeInputTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/models/input/system/type/BmTypeInputTest.groovy @@ -21,9 +21,9 @@ class BmTypeInputTest extends Specification { when: def alteredUnit = bmTypeInput.copy() - .setsRated(Quantities.getQuantity(50d, ACTIVE_POWER_IN)) - .setCapex(Quantities.getQuantity(110d, CAPEX)) - .setOpex(Quantities.getQuantity(20d, ENERGY_PRICE)) + .sRated(Quantities.getQuantity(50d, ACTIVE_POWER_IN)) + .capex(Quantities.getQuantity(110d, CAPEX)) + .opex(Quantities.getQuantity(20d, ENERGY_PRICE)) .build() then: diff --git a/src/test/groovy/edu/ie3/datamodel/models/input/system/type/ChpTypeInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/input/system/type/ChpTypeInputTest.groovy index caf079216..0c43f8c27 100644 --- a/src/test/groovy/edu/ie3/datamodel/models/input/system/type/ChpTypeInputTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/models/input/system/type/ChpTypeInputTest.groovy @@ -20,9 +20,9 @@ class ChpTypeInputTest extends Specification { when: def alteredUnit = chpTypeInput.copy() - .setsRated(Quantities.getQuantity(50d, ACTIVE_POWER_IN)) - .setEtaEl(Quantities.getQuantity(20, EFFICIENCY)) - .setpThermal(Quantities.getQuantity(15, ACTIVE_POWER_IN)) + .sRated(Quantities.getQuantity(50d, ACTIVE_POWER_IN)) + .etaEl(Quantities.getQuantity(20, EFFICIENCY)) + .pThermal(Quantities.getQuantity(15, ACTIVE_POWER_IN)) .build() then: diff --git a/src/test/groovy/edu/ie3/datamodel/models/input/system/type/HpTypeInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/input/system/type/HpTypeInputTest.groovy index 1cd6ebf65..01fb1513d 100644 --- a/src/test/groovy/edu/ie3/datamodel/models/input/system/type/HpTypeInputTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/models/input/system/type/HpTypeInputTest.groovy @@ -19,8 +19,8 @@ class HpTypeInputTest extends Specification { when: def alteredUnit = hpTypeInput.copy() - .setpThermal(Quantities.getQuantity(10, ACTIVE_POWER_IN)) - .setCosPhiRated(0.97d) + .pThermal(Quantities.getQuantity(10, ACTIVE_POWER_IN)) + .cosPhiRated(0.97d) .build() then: diff --git a/src/test/groovy/edu/ie3/datamodel/models/typeInput/LineTypeInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/typeInput/LineTypeInputTest.groovy index fe10b827a..a8ba2964c 100644 --- a/src/test/groovy/edu/ie3/datamodel/models/typeInput/LineTypeInputTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/models/typeInput/LineTypeInputTest.groovy @@ -21,12 +21,12 @@ class LineTypeInputTest extends Specification { when: def alteredUnit = lineTypeInput.copy() .id("lineTypeInput_copy") - .setB(Quantities.getQuantity(0.1d, PowerSystemUnits.MICRO_SIEMENS_PER_KILOMETRE)) - .setG(Quantities.getQuantity(0.1d, PowerSystemUnits.MICRO_SIEMENS_PER_KILOMETRE)) - .setR(Quantities.getQuantity(0.5d, PowerSystemUnits.OHM_PER_KILOMETRE)) - .setX(Quantities.getQuantity(0.4d, PowerSystemUnits.OHM_PER_KILOMETRE)) - .setIMax(Quantities.getQuantity(310d, Units.AMPERE)) - .setVRated(Quantities.getQuantity(30d, Units.VOLT)) + .b(Quantities.getQuantity(0.1d, PowerSystemUnits.MICRO_SIEMENS_PER_KILOMETRE)) + .g(Quantities.getQuantity(0.1d, PowerSystemUnits.MICRO_SIEMENS_PER_KILOMETRE)) + .r(Quantities.getQuantity(0.5d, PowerSystemUnits.OHM_PER_KILOMETRE)) + .x(Quantities.getQuantity(0.4d, PowerSystemUnits.OHM_PER_KILOMETRE)) + .iMax(Quantities.getQuantity(310d, Units.AMPERE)) + .vRated(Quantities.getQuantity(30d, Units.VOLT)) .build() then: diff --git a/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer2WTypeInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer2WTypeInputTest.groovy index b3d0b63bd..eed815823 100644 --- a/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer2WTypeInputTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer2WTypeInputTest.groovy @@ -20,19 +20,19 @@ class Transformer2WTypeInputTest extends Specification{ when: def alteredUnit = transformer2WTypeInput.copy() .id("transformer2WTypeInput_copy") - .setRSc(Quantities.getQuantity(1, Units.OHM)) - .setXSc(Quantities.getQuantity(52, Units.OHM)) - .setSRated(Quantities.getQuantity(50000, PowerSystemUnits.KILOWATT)) - .setVRatedA(Quantities.getQuantity(111, PowerSystemUnits.KILOVOLT)) - .setVRatedB(Quantities.getQuantity(11, PowerSystemUnits.KILOVOLT)) - .setGM(Quantities.getQuantity(1, PowerSystemUnits.NANOSIEMENS)) - .setBM(Quantities.getQuantity(1, PowerSystemUnits.NANOSIEMENS)) - .setDV(Quantities.getQuantity(2, PowerSystemUnits.PERCENT)) - .setDPhi(Quantities.getQuantity(1, PowerSystemUnits.DEGREE_GEOM)) - .setTapSide(true) - .setTapNeutr(11) - .setTapMin(2) - .setTapMax(20) + .rSc(Quantities.getQuantity(1, Units.OHM)) + .xSc(Quantities.getQuantity(52, Units.OHM)) + .sRated(Quantities.getQuantity(50000, PowerSystemUnits.KILOWATT)) + .vRatedA(Quantities.getQuantity(111, PowerSystemUnits.KILOVOLT)) + .vRatedB(Quantities.getQuantity(11, PowerSystemUnits.KILOVOLT)) + .gM(Quantities.getQuantity(1, PowerSystemUnits.NANOSIEMENS)) + .bM(Quantities.getQuantity(1, PowerSystemUnits.NANOSIEMENS)) + .dV(Quantities.getQuantity(2, PowerSystemUnits.PERCENT)) + .dPhi(Quantities.getQuantity(1, PowerSystemUnits.DEGREE_GEOM)) + .tapSide(true) + .tapNeutr(11) + .tapMin(2) + .tapMax(20) .build() then: diff --git a/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer3WTypeInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer3WTypeInputTest.groovy index 2625f7c7f..9537e3c22 100644 --- a/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer3WTypeInputTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/models/typeInput/Transformer3WTypeInputTest.groovy @@ -20,25 +20,25 @@ class Transformer3WTypeInputTest extends Specification{ when: def alteredUnit = transformer3WTypeInput.copy() .id("transformer3WTypeInput_copy") - .setSRatedA(Quantities.getQuantity(100000, PowerSystemUnits.KILOWATT)) - .setSRatedB(Quantities.getQuantity(70000, PowerSystemUnits.KILOWATT)) - .setSRatedC(Quantities.getQuantity(50000, PowerSystemUnits.KILOWATT)) - .setVRatedA(Quantities.getQuantity(400, PowerSystemUnits.KILOVOLT)) - .setVRatedB(Quantities.getQuantity(120, PowerSystemUnits.KILOVOLT)) - .setVRatedC(Quantities.getQuantity(30, PowerSystemUnits.KILOVOLT)) - .setRScA(Quantities.getQuantity(3, Units.OHM)) - .setRScB(Quantities.getQuantity(2, Units.OHM)) - .setRScC(Quantities.getQuantity(1, Units.OHM)) - .setXScA(Quantities.getQuantity(3, Units.OHM)) - .setXScB(Quantities.getQuantity(2, Units.OHM)) - .setXScC(Quantities.getQuantity(1, Units.OHM)) - .setGM(Quantities.getQuantity(50000, PowerSystemUnits.NANOSIEMENS)) - .setBM(Quantities.getQuantity(-2000, PowerSystemUnits.NANOSIEMENS)) - .setDV(Quantities.getQuantity(2, PowerSystemUnits.PERCENT)) - .setDPhi(Quantities.getQuantity(1, PowerSystemUnits.DEGREE_GEOM)) - .setTapNeutr(1) - .setTapMin(-11) - .setTapMax(20) + .sRatedA(Quantities.getQuantity(100000, PowerSystemUnits.KILOWATT)) + .sRatedB(Quantities.getQuantity(70000, PowerSystemUnits.KILOWATT)) + .sRatedC(Quantities.getQuantity(50000, PowerSystemUnits.KILOWATT)) + .vRatedA(Quantities.getQuantity(400, PowerSystemUnits.KILOVOLT)) + .vRatedB(Quantities.getQuantity(120, PowerSystemUnits.KILOVOLT)) + .vRatedC(Quantities.getQuantity(30, PowerSystemUnits.KILOVOLT)) + .rScA(Quantities.getQuantity(3, Units.OHM)) + .rScB(Quantities.getQuantity(2, Units.OHM)) + .rScC(Quantities.getQuantity(1, Units.OHM)) + .xScA(Quantities.getQuantity(3, Units.OHM)) + .xScB(Quantities.getQuantity(2, Units.OHM)) + .xScC(Quantities.getQuantity(1, Units.OHM)) + .gM(Quantities.getQuantity(50000, PowerSystemUnits.NANOSIEMENS)) + .bM(Quantities.getQuantity(-2000, PowerSystemUnits.NANOSIEMENS)) + .dV(Quantities.getQuantity(2, PowerSystemUnits.PERCENT)) + .dPhi(Quantities.getQuantity(1, PowerSystemUnits.DEGREE_GEOM)) + .tapNeutr(1) + .tapMin(-11) + .tapMax(20) .build() then: From 5152700d6e3e0d152d72755111228a1342024f89 Mon Sep 17 00:00:00 2001 From: staudtMarius Date: Wed, 26 Mar 2025 14:43:16 +0100 Subject: [PATCH 8/8] fmt --- .../input/connector/type/Transformer3WTypeInput.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java index b57402b44..6b2013300 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java @@ -378,17 +378,17 @@ public Transformer3WTypeInputCopyBuilder vRatedB( return thisInstance(); } - public Transformer3WTypeInputCopyBuilder rScA(ComparableQuantity rScA) { - this.rScA = rScA; - return thisInstance(); - } - public Transformer3WTypeInputCopyBuilder vRatedC( ComparableQuantity vRatedC) { this.vRatedC = vRatedC; return thisInstance(); } + public Transformer3WTypeInputCopyBuilder rScA(ComparableQuantity rScA) { + this.rScA = rScA; + return thisInstance(); + } + public Transformer3WTypeInputCopyBuilder rScB(ComparableQuantity rScB) { this.rScB = rScB; return thisInstance();