Skip to content

Commit 215e1a8

Browse files
Merge pull request #1436 from ie3-institute/kk/#1412-Create-getter-for-sRated-in-SystemParticipantInput
Kk/#1412 create getter for s rated in system participant input
2 parents 14e5276 + b793d8f commit 215e1a8

20 files changed

+92
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
### Added
1010
- Added weathersource documentation [#1390](https://github.com/ie3-institute/PowerSystemDataModel/issues/1390)
1111
- Added standard asset parameter for `3wTransformer` in `ReadTheDocs` [#1417](https://github.com/ie3-institute/PowerSystemDataModel/issues/1417)
12+
- Added getter sRated for SystemParticipant inputs and updated them in tests in src[#1412](https://github.com/ie3-institute/PowerSystemDataModel/issues/1412)
1213

1314
### Fixed
1415
- Fixed small issues in tests [#1400](https://github.com/ie3-institute/PowerSystemDataModel/issues/1400)

src/main/java/edu/ie3/datamodel/models/input/system/BmInput.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import edu.ie3.util.quantities.interfaces.EnergyPrice;
1717
import java.util.Objects;
1818
import java.util.UUID;
19+
import javax.measure.quantity.Power;
1920
import tech.units.indriya.ComparableQuantity;
2021

2122
/** Describes a biomass plant */
@@ -117,6 +118,11 @@ public ComparableQuantity<EnergyPrice> getFeedInTariff() {
117118
return feedInTariff;
118119
}
119120

121+
@Override
122+
public ComparableQuantity<Power> sRated() {
123+
return this.type.getsRated();
124+
}
125+
120126
public BmInputCopyBuilder copy() {
121127
return new BmInputCopyBuilder(this);
122128
}

src/main/java/edu/ie3/datamodel/models/input/system/ChpInput.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import edu.ie3.datamodel.models.input.thermal.ThermalStorageInput;
1919
import java.util.Objects;
2020
import java.util.UUID;
21+
import javax.measure.quantity.Power;
22+
import tech.units.indriya.ComparableQuantity;
2123

2224
/** Describes a combined heat and power plant */
2325
public class ChpInput extends SystemParticipantInput
@@ -119,6 +121,11 @@ public boolean isMarketReaction() {
119121
return marketReaction;
120122
}
121123

124+
@Override
125+
public ComparableQuantity<Power> sRated() {
126+
return this.type.getsRated();
127+
}
128+
122129
public ChpInputCopyBuilder copy() {
123130
return new ChpInputCopyBuilder(this);
124131
}

src/main/java/edu/ie3/datamodel/models/input/system/EvInput.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import edu.ie3.datamodel.models.input.system.type.EvTypeInput;
1515
import java.util.Objects;
1616
import java.util.UUID;
17+
import javax.measure.quantity.Power;
18+
import tech.units.indriya.ComparableQuantity;
1719

1820
/** Describes an electric vehicle */
1921
public class EvInput extends SystemParticipantInput implements HasType {
@@ -71,6 +73,11 @@ public EvTypeInput getType() {
7173
return type;
7274
}
7375

76+
@Override
77+
public ComparableQuantity<Power> sRated() {
78+
return this.type.getsRated();
79+
}
80+
7481
public EvInputCopyBuilder copy() {
7582
return new EvInputCopyBuilder(this);
7683
}

src/main/java/edu/ie3/datamodel/models/input/system/EvcsInput.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import edu.ie3.datamodel.models.input.system.type.evcslocation.EvcsLocationType;
1515
import java.util.Objects;
1616
import java.util.UUID;
17+
import javax.measure.quantity.Power;
18+
import tech.units.indriya.ComparableQuantity;
1719

1820
public class EvcsInput extends SystemParticipantInput {
1921

@@ -182,6 +184,11 @@ public boolean getV2gSupport() {
182184
return v2gSupport;
183185
}
184186

187+
@Override
188+
public ComparableQuantity<Power> sRated() {
189+
return this.type.getsRated();
190+
}
191+
185192
@Override
186193
public EvcsInputCopyBuilder copy() {
187194
return new EvcsInputCopyBuilder(this);

src/main/java/edu/ie3/datamodel/models/input/system/FixedFeedInInput.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ public ComparableQuantity<Power> getsRated() {
8080
return sRated;
8181
}
8282

83+
@Override
84+
public ComparableQuantity<Power> sRated() {
85+
return sRated;
86+
}
87+
8388
public double getCosPhiRated() {
8489
return cosPhiRated;
8590
}

src/main/java/edu/ie3/datamodel/models/input/system/HpInput.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import edu.ie3.datamodel.models.input.thermal.ThermalBusInput;
1717
import java.util.Objects;
1818
import java.util.UUID;
19+
import javax.measure.quantity.Power;
20+
import tech.units.indriya.ComparableQuantity;
1921

2022
/** Describes a heat pump */
2123
public class HpInput extends SystemParticipantInput implements HasType, HasThermalBus {
@@ -87,6 +89,11 @@ public ThermalBusInput getThermalBus() {
8789
return thermalBus;
8890
}
8991

92+
@Override
93+
public ComparableQuantity<Power> sRated() {
94+
return this.type.getsRated();
95+
}
96+
9097
public HpInputCopyBuilder copy() {
9198
return new HpInputCopyBuilder(this);
9299
}

src/main/java/edu/ie3/datamodel/models/input/system/LoadInput.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,11 @@ public ComparableQuantity<Power> getsRated() {
199199
return sRated;
200200
}
201201

202+
@Override
203+
public ComparableQuantity<Power> sRated() {
204+
return sRated;
205+
}
206+
202207
public double getCosPhiRated() {
203208
return cosPhiRated;
204209
}

src/main/java/edu/ie3/datamodel/models/input/system/PvInput.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,11 @@ public ComparableQuantity<Power> getsRated() {
178178
return sRated;
179179
}
180180

181+
@Override
182+
public ComparableQuantity<Power> sRated() {
183+
return sRated;
184+
}
185+
181186
public PvInputCopyBuilder copy() {
182187
return new PvInputCopyBuilder(this);
183188
}

src/main/java/edu/ie3/datamodel/models/input/system/StorageInput.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import edu.ie3.datamodel.models.input.system.type.StorageTypeInput;
1515
import java.util.Objects;
1616
import java.util.UUID;
17+
import javax.measure.quantity.Power;
18+
import tech.units.indriya.ComparableQuantity;
1719

1820
/** Describes a battery storage */
1921
public class StorageInput extends SystemParticipantInput implements HasType {
@@ -71,6 +73,11 @@ public StorageTypeInput getType() {
7173
return type;
7274
}
7375

76+
@Override
77+
public ComparableQuantity<Power> sRated() {
78+
return this.type.getsRated();
79+
}
80+
7481
public StorageInputCopyBuilder copy() {
7582
return new StorageInputCopyBuilder(this);
7683
}

0 commit comments

Comments
 (0)