Skip to content

Commit 13a4d95

Browse files
committed
removed dsm variable from tests and documentation
1 parent 83beee8 commit 13a4d95

File tree

9 files changed

+3
-15
lines changed

9 files changed

+3
-15
lines changed

docs/readthedocs/models/input/participant/load.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ Model of (mainly) domestic loads.
4444
-
4545
- [Load profile](#load-lp) as model behaviour
4646
47-
* - dsm
48-
-
49-
- Whether the load is able to follow demand side management signals
50-
5147
* - eConsAnnual
5248
- kWh
5349
- Annual energy consumption

docs/uml/main/input/SystemDatamodelConcept.puml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ package models {
218218

219219
class LoadInput {
220220
- standardLoadProfile: StandardLoadProfile
221-
- dsm: Boolean
222221
- sRated: ComparableQuantity<Power> [kVA]
223222
- eConsAnnual: ComparableQuantity<Energy> [kWh]
224223
- cosPhiRated: double

src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactoryTest.groovy

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ class LoadInputFactoryTest extends Specification implements FactoryTestHelper {
4747
"id" : "TestID",
4848
"qcharacteristics" : "cosPhiFixed:{(0.0,1.0)}",
4949
"loadprofile" : profileKey,
50-
"dsm" : "true",
5150
"econsannual" : "3",
5251
"srated" : "4",
5352
"cosphirated" : "5"
@@ -72,7 +71,6 @@ class LoadInputFactoryTest extends Specification implements FactoryTestHelper {
7271
}
7372
assert controllingEm == Optional.of(emUnit)
7473
assert loadProfile == profile
75-
assert dsm
7674
assert eConsAnnual == getQuant(parameter["econsannual"], StandardUnits.ENERGY_IN)
7775
assert sRated == getQuant(parameter["srated"], StandardUnits.S_RATED)
7876
assert cosPhiRated == Double.parseDouble(parameter["cosphirated"])

src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ class InputEntityProcessorTest extends Specification {
239239
LoadInput | SystemParticipantTestData.loadInput || [
240240
"uuid" : SystemParticipantTestData.loadInput.uuid.toString(),
241241
"cosPhiRated" : SystemParticipantTestData.loadInput.cosPhiRated.toString(),
242-
"dsm" : SystemParticipantTestData.loadInput.dsm.toString(),
243242
"eConsAnnual" : SystemParticipantTestData.loadInput.eConsAnnual.getValue().doubleValue().toString(),
244243
"id" : SystemParticipantTestData.loadInput.id,
245244
"node" : SystemParticipantTestData.loadInput.node.uuid.toString(),

src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvDataSourceTest.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ class CsvDataSourceTest extends Specification implements CsvTestDataMeta {
9393
"q_characteristics",
9494
"e_cons_annual",
9595
"operator",
96-
"dsm",
9796
"em"
9897
] as Set
9998
}

src/test/groovy/edu/ie3/datamodel/models/input/system/LoadInputTest.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class LoadInputTest extends Specification {
2323
def loadInput = SystemParticipantTestData.loadInput
2424

2525
when:
26-
def alteredUnit = loadInput.copy().loadprofile(BdewStandardLoadProfile.G0).dsm(true)
26+
def alteredUnit = loadInput.copy().loadprofile(BdewStandardLoadProfile.G0)
2727
.eConsAnnual(Quantities.getQuantity(6000, KILOWATTHOUR)).sRated(Quantities.getQuantity(0d, KILOVOLTAMPERE))
2828
.cosPhiRated(0.8).node(GridTestData.nodeG)
2929
.qCharacteristics(CosPhiFixed.CONSTANT_CHARACTERISTIC).build()
@@ -35,7 +35,6 @@ class LoadInputTest extends Specification {
3535
assert operator == loadInput.operator
3636
assert id == loadInput.id
3737
assert loadProfile == BdewStandardLoadProfile.G0
38-
assert dsm
3938
assert node == GridTestData.nodeG
4039
assert qCharacteristics == CosPhiFixed.CONSTANT_CHARACTERISTIC
4140
assert eConsAnnual == Quantities.getQuantity(6000, KILOWATTHOUR)
@@ -59,7 +58,6 @@ class LoadInputTest extends Specification {
5958
assert operator == loadInput.operator
6059
assert id == loadInput.id
6160
assert loadProfile == loadInput.loadProfile
62-
assert dsm == loadInput.dsm
6361
assert node == loadInput.node
6462
assert qCharacteristics == loadInput.qCharacteristics
6563
assert eConsAnnual == loadInput.eConsAnnual * 2d

src/test/resources/edu/ie3/datamodel/io/sink/_sql/input_entities.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ CREATE TABLE public.load_input
157157
uuid UUID PRIMARY KEY,
158158
controlling_em UUID NOT NULL,
159159
cos_phi_rated TEXT NOT NULL,
160-
dsm BOOL NOT NULL,
161160
e_cons_annual DOUBLE PRECISION NOT NULL,
162161
id TEXT NOT NULL,
163162
load_profile TEXT NOT NULL,

src/test/resources/edu/ie3/datamodel/io/source/csv/_joint_grid/load_input.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"uuid","cos_phi_rated","dsm","e_cons_annual","id","node","operates_from","operates_until","operator","q_characteristics","s_rated","load_profile"
1+
"uuid","cos_phi_rated","e_cons_annual","id","node","operates_from","operates_until","operator","q_characteristics","s_rated","load_profile"
22
c2402412-97fa-4ca4-aa66-e6e04d010001,0.9700000286102295,false,4000.0,NS_NET126_L_F1_(36),ca3391eb-ca94-4945-ac72-e116f396f82c,,,,"cosPhiFixed:{(0.00,1.00)}",2.0618600845336914,h0
33
fa8ef266-5b15-4fdd-a145-71ba95e3463d,0.949999988079071,false,4000.0,NS_NET146_L_F3_(17),0f3ba59d-a9ce-4669-aa12-bebec42238b7,,,,"cosPhiFixed:{(0.00,1.00)}",2.3157899379730225,h0
44
4dd0785a-482c-47e3-bb82-e315083684d1,0.9700000286102295,false,4000.0,NS_NET116_L_S3_2(6),550ebca7-1455-44eb-9431-ffbf08e58bd4,,,,"cosPhiFixed:{(0.00,1.00)}",4.1237101554870605,h0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
uuid,cos_phi_rated,dsm,e_cons_annual,id,node,operates_from,operates_until,operator,q_characteristics,s_rated,load_profile,em
1+
uuid,cos_phi_rated,e_cons_annual,id,node,operates_from,operates_until,operator,q_characteristics,s_rated,load_profile,em
22
eaf77f7e-9001-479f-94ca-7fb657766f5f,0.95,false,4000.0,test_loadInput,4ca90220-74c2-4369-9afa-a18bf068840d,2020-03-24T15:11:31Z,2020-03-25T15:11:31Z,8f9682df-0744-4b58-a122-f0dc730f6510,"cosPhiFixed:{(0.00,0.95)}",25.0,h0,977157f4-25e5-4c72-bf34-440edc778792

0 commit comments

Comments
 (0)