Skip to content

Commit d7f5631

Browse files
vickybung1vickybung1
committed
Update
1 parent 2afdaa1 commit d7f5631

File tree

10 files changed

+38
-38
lines changed

10 files changed

+38
-38
lines changed

‎docs/uml/main/input/CharacteristicDatamodelConcept.puml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ package models {
3333
+ {static} REQUIRED_FORMAT: String
3434
- x: ComparableQuantity<A>
3535
- y: ComparableQuantity<O>
36-
+ deSerialize(int): String
36+
+ serialize(int): String
3737
- {static} buildExceptionMessage(String): String
3838
- {static} buildExceptionMessage(String, String): String
3939
}
@@ -43,7 +43,7 @@ package models {
4343
# characteristicPrefix: String
4444
# decimalPlaces: int
4545
# points: SortedSet<CharacteristicPoint<A,O>>
46-
+ deSerialize(): String
46+
+ serialize(): String
4747
+ {static} buildStartingRegex(String): String
4848
- extractCoordinateList(String): String
4949
- buildCoordinatesFromString(String, Unit<A>, Unit<O>): SortedSet<CharacteristicPoint<A, O>>

‎src/main/java/edu/ie3/datamodel/io/processor/Processor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ protected String processMethodResult(Object methodReturnObject, Method method, S
279279
"QV",
280280
"ReactivePowerCharacteristic",
281281
"CharacteristicInput" -> resultStringBuilder.append(
282-
((CharacteristicInput<?, ?>) methodReturnObject).Serialize());
282+
((CharacteristicInput<?, ?>) methodReturnObject).serialize());
283283
case "UUID[]" -> resultStringBuilder.append(processUUIDArray((UUID[]) methodReturnObject));
284284
case "ControlStrategy" -> resultStringBuilder.append(
285285
((ControlStrategy) methodReturnObject).getKey());

‎src/main/java/edu/ie3/datamodel/models/input/system/characteristic/CharacteristicInput.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ public SortedSet<CharacteristicPoint<A, O>> getPoints() {
110110
*
111111
* @return the characteristic as de-serialized string
112112
*/
113-
public String Serialize() {
113+
public String serialize() {
114114
return characteristicPrefix
115115
+ ":{"
116-
+ points.stream().map(CharacteristicPoint::deSerialize).collect(Collectors.joining(","))
116+
+ points.stream().map(CharacteristicPoint::serialize).collect(Collectors.joining(","))
117117
+ "}";
118118
}
119119

‎src/main/java/edu/ie3/datamodel/models/input/system/characteristic/CharacteristicPoint.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public ComparableQuantity<O> getY() {
100100
*
101101
* @return The de-serialized point
102102
*/
103-
public String deSerialize() {
103+
public String serialize() {
104104
return String.format(
105105
Locale.ENGLISH, "(%s,%s)", x.getValue().doubleValue(), y.getValue().doubleValue());
106106
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class InputEntityProcessorTest extends Specification {
163163
"operatesUntil" : SystemParticipantTestData.fixedFeedInInput.operationTime.endDate.orElse(ZonedDateTime.now()).toString(),
164164
"operatesFrom" : SystemParticipantTestData.fixedFeedInInput.operationTime.startDate.orElse(ZonedDateTime.now()).toString(),
165165
"operator" : SystemParticipantTestData.fixedFeedInInput.operator.getUuid().toString(),
166-
"qCharacteristics": SystemParticipantTestData.cosPhiFixedDeSerialized,
166+
"qCharacteristics": SystemParticipantTestData.cosPhiFixedSerialized,
167167
"sRated" : SystemParticipantTestData.fixedFeedInInput.sRated.to(StandardUnits.S_RATED).getValue().doubleValue().toString()
168168
]
169169
PvInput | SystemParticipantTestData.pvInput || [
@@ -181,7 +181,7 @@ class InputEntityProcessorTest extends Specification {
181181
"operatesUntil" : SystemParticipantTestData.pvInput.operationTime.endDate.orElse(ZonedDateTime.now()).toString(),
182182
"operatesFrom" : SystemParticipantTestData.pvInput.operationTime.startDate.orElse(ZonedDateTime.now()).toString(),
183183
"operator" : SystemParticipantTestData.pvInput.operator.getUuid().toString(),
184-
"qCharacteristics": SystemParticipantTestData.cosPhiFixedDeSerialized,
184+
"qCharacteristics": SystemParticipantTestData.cosPhiFixedSerialized,
185185
"sRated" : SystemParticipantTestData.pvInput.sRated.to(StandardUnits.S_RATED).getValue().doubleValue().toString()
186186
]
187187
WecInput | SystemParticipantTestData.wecInput || [
@@ -192,7 +192,7 @@ class InputEntityProcessorTest extends Specification {
192192
"operatesUntil" : SystemParticipantTestData.wecInput.operationTime.endDate.orElse(ZonedDateTime.now()).toString(),
193193
"operatesFrom" : SystemParticipantTestData.wecInput.operationTime.startDate.orElse(ZonedDateTime.now()).toString(),
194194
"operator" : SystemParticipantTestData.wecInput.operator.uuid.toString(),
195-
"qCharacteristics": SystemParticipantTestData.cosPhiPDeSerialized,
195+
"qCharacteristics": SystemParticipantTestData.cosPhiPSerialized,
196196
"type" : SystemParticipantTestData.wecInput.type.uuid.toString()
197197
]
198198
ChpInput | SystemParticipantTestData.chpInput || [
@@ -203,7 +203,7 @@ class InputEntityProcessorTest extends Specification {
203203
"operatesUntil" : SystemParticipantTestData.chpInput.operationTime.endDate.orElse(ZonedDateTime.now()).toString(),
204204
"operatesFrom" : SystemParticipantTestData.chpInput.operationTime.startDate.orElse(ZonedDateTime.now()).toString(),
205205
"operator" : SystemParticipantTestData.chpInput.operator.uuid.toString(),
206-
"qCharacteristics": SystemParticipantTestData.cosPhiFixedDeSerialized,
206+
"qCharacteristics": SystemParticipantTestData.cosPhiFixedSerialized,
207207
"thermalBus" : SystemParticipantTestData.chpInput.thermalBus.uuid.toString(),
208208
"thermalStorage" : SystemParticipantTestData.chpInput.thermalStorage.uuid.toString(),
209209
"type" : SystemParticipantTestData.chpInput.type.uuid.toString(),
@@ -218,7 +218,7 @@ class InputEntityProcessorTest extends Specification {
218218
"operatesUntil" : SystemParticipantTestData.bmInput.operationTime.endDate.orElse(ZonedDateTime.now()).toString(),
219219
"operatesFrom" : SystemParticipantTestData.bmInput.operationTime.startDate.orElse(ZonedDateTime.now()).toString(),
220220
"operator" : SystemParticipantTestData.bmInput.operator.uuid.toString(),
221-
"qCharacteristics": SystemParticipantTestData.qVDeSerialized,
221+
"qCharacteristics": SystemParticipantTestData.qVSerialized,
222222
"type" : SystemParticipantTestData.bmInput.type.uuid.toString()
223223
]
224224
EvInput | SystemParticipantTestData.evInput || [
@@ -228,7 +228,7 @@ class InputEntityProcessorTest extends Specification {
228228
"operatesUntil" : SystemParticipantTestData.evInput.operationTime.endDate.orElse(ZonedDateTime.now()).toString(),
229229
"operatesFrom" : SystemParticipantTestData.evInput.operationTime.startDate.orElse(ZonedDateTime.now()).toString(),
230230
"operator" : SystemParticipantTestData.evInput.operator.getUuid().toString(),
231-
"qCharacteristics": SystemParticipantTestData.cosPhiFixedDeSerialized,
231+
"qCharacteristics": SystemParticipantTestData.cosPhiFixedSerialized,
232232
"type" : SystemParticipantTestData.evInput.type.getUuid().toString()
233233
]
234234

@@ -242,7 +242,7 @@ class InputEntityProcessorTest extends Specification {
242242
"operatesUntil" : SystemParticipantTestData.loadInput.operationTime.endDate.orElse(ZonedDateTime.now()).toString(),
243243
"operatesFrom" : SystemParticipantTestData.loadInput.operationTime.startDate.orElse(ZonedDateTime.now()).toString(),
244244
"operator" : SystemParticipantTestData.loadInput.operator.uuid.toString(),
245-
"qCharacteristics" : SystemParticipantTestData.cosPhiFixedDeSerialized,
245+
"qCharacteristics" : SystemParticipantTestData.cosPhiFixedSerialized,
246246
"sRated" : SystemParticipantTestData.loadInput.sRated.getValue().doubleValue().toString(),
247247
"loadProfile" : SystemParticipantTestData.loadInput.loadProfile.key
248248
]
@@ -253,7 +253,7 @@ class InputEntityProcessorTest extends Specification {
253253
"operatesUntil" : SystemParticipantTestData.storageInput.operationTime.endDate.orElse(ZonedDateTime.now()).toString(),
254254
"operatesFrom" : SystemParticipantTestData.storageInput.operationTime.startDate.orElse(ZonedDateTime.now()).toString(),
255255
"operator" : SystemParticipantTestData.storageInput.operator.uuid.toString(),
256-
"qCharacteristics": SystemParticipantTestData.cosPhiFixedDeSerialized,
256+
"qCharacteristics": SystemParticipantTestData.cosPhiFixedSerialized,
257257
"type" : SystemParticipantTestData.storageInput.type.uuid.toString()
258258
]
259259
HpInput | SystemParticipantTestData.hpInput || [
@@ -263,7 +263,7 @@ class InputEntityProcessorTest extends Specification {
263263
"operatesUntil" : SystemParticipantTestData.hpInput.operationTime.endDate.orElse(ZonedDateTime.now()).toString(),
264264
"operatesFrom" : SystemParticipantTestData.hpInput.operationTime.startDate.orElse(ZonedDateTime.now()).toString(),
265265
"operator" : SystemParticipantTestData.hpInput.operator.uuid.toString(),
266-
"qCharacteristics": SystemParticipantTestData.cosPhiFixedDeSerialized,
266+
"qCharacteristics": SystemParticipantTestData.cosPhiFixedSerialized,
267267
"thermalBus" : SystemParticipantTestData.hpInput.thermalBus.uuid.toString(),
268268
"type" : SystemParticipantTestData.hpInput.type.uuid.toString()
269269
]
@@ -274,7 +274,7 @@ class InputEntityProcessorTest extends Specification {
274274
"operatesUntil" : SystemParticipantTestData.evcsInput.operationTime.endDate.orElse(ZonedDateTime.now()).toString(),
275275
"operatesFrom" : SystemParticipantTestData.evcsInput.operationTime.startDate.orElse(ZonedDateTime.now()).toString(),
276276
"operator" : SystemParticipantTestData.evcsInput.operator.uuid.toString(),
277-
"qCharacteristics": SystemParticipantTestData.cosPhiFixedDeSerialized,
277+
"qCharacteristics": SystemParticipantTestData.cosPhiFixedSerialized,
278278
"type" : SystemParticipantTestData.evcsInput.type.toString(),
279279
"cosPhiRated" : SystemParticipantTestData.evcsInput.cosPhiRated.toString(),
280280
"chargingPoints" : SystemParticipantTestData.evcsInput.chargingPoints.toString(),
@@ -632,7 +632,7 @@ class InputEntityProcessorTest extends Specification {
632632
actual.get() == expected
633633
}
634634

635-
def "The InputEntityProcessor should deserialize an entity but ignore the operator field when OperatorInput is equal to NO_OPERATOR_ASSIGNED"() {
635+
def "The InputEntityProcessor should serialize an entity but ignore the operator field when OperatorInput is equal to NO_OPERATOR_ASSIGNED"() {
636636
given:
637637
InputEntityProcessor processor = new InputEntityProcessor(NodeInput)
638638
def nodeWithOutOperator = new NodeInput(

‎src/test/groovy/edu/ie3/datamodel/models/system/characteristic/CharacteristicPointTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class CharacteristicPointTest extends Specification {
6666
Quantities.getQuantity(4d, PERCENT))
6767

6868
when: "de-serialized"
69-
String result = point.deSerialize()
69+
String result = point.serialize()
7070

7171
then: "the result is correct"
7272
result == "(3.0,4.0)"

‎src/test/groovy/edu/ie3/datamodel/models/system/characteristic/OlmCharacteristicTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class OlmCharacteristicTest extends Specification {
3737

3838
def "A OlmCharacteristicInput is correctly de-serialized"() {
3939
when:
40-
String actual = validInput.Serialize()
40+
String actual = validInput.serialize()
4141

4242
then:
4343
actual == "olm:{(10.0,0.05),(15.0,0.1),(20.0,0.2)}"

‎src/test/groovy/edu/ie3/datamodel/models/system/characteristic/ReactivePowerCharacteristicTest.groovy‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ class ReactivePowerCharacteristicTest extends Specification {
2020
CosPhiFixed validCosPhiFixed
2121

2222
@Shared
23-
String validCosPhiFixedDeSerialized = "cosPhiFixed:{(0.0,0.95)}"
23+
String validCosPhiFixedSerialized = "cosPhiFixed:{(0.0,0.95)}"
2424

2525
@Shared
2626
CosPhiP validCosPhiP
2727

2828
@Shared
29-
String validCosPhiPDeSerialized = "cosPhiP:{(0.0,1.0),(0.9,1.0),(1.2,-0.3)}"
29+
String validCosPhiPSerialized = "cosPhiP:{(0.0,1.0),(0.9,1.0),(1.2,-0.3)}"
3030

3131
@Shared
3232
QV validQV
3333

3434
@Shared
35-
String validQVDeSerialized = "qV:{(0.9,-0.3),(0.95,0.0),(1.05,0.0),(1.1,0.3)}"
35+
String validQVSerialized = "qV:{(0.9,-0.3),(0.95,0.0),(1.05,0.0),(1.1,0.3)}"
3636

3737
def setupSpec() {
3838
validCosPhiFixed = new CosPhiFixed(
@@ -69,15 +69,15 @@ class ReactivePowerCharacteristicTest extends Specification {
6969

7070
def "A valid CosPhiFixed is correctly de-serialized"() {
7171
when: "De-serializing a valid input"
72-
String actual = validCosPhiFixed.Serialize()
72+
String actual = validCosPhiFixed.serialize()
7373

7474
then: "it returns the correct string"
75-
actual == validCosPhiFixedDeSerialized
75+
actual == validCosPhiFixedSerialized
7676
}
7777

7878
def "A CosPhiFixed is correctly set up from a correctly formatted string"() {
7979
when:
80-
CosPhiFixed actual = new CosPhiFixed(validCosPhiFixedDeSerialized)
80+
CosPhiFixed actual = new CosPhiFixed(validCosPhiFixedSerialized)
8181

8282
then:
8383
actual.points == validCosPhiFixed.points
@@ -94,15 +94,15 @@ class ReactivePowerCharacteristicTest extends Specification {
9494

9595
def "A valid CosPhiP is correctly de-serialized"() {
9696
when: "De-serializing a valid input"
97-
String actual = validCosPhiP.Serialize()
97+
String actual = validCosPhiP.serialize()
9898

9999
then: "it returns the correct string"
100-
actual == validCosPhiPDeSerialized
100+
actual == validCosPhiPSerialized
101101
}
102102

103103
def "A CosPhiP is correctly set up from a correctly formatted string"() {
104104
when:
105-
CosPhiP actual = new CosPhiP(validCosPhiPDeSerialized)
105+
CosPhiP actual = new CosPhiP(validCosPhiPSerialized)
106106

107107
then:
108108
actual.points == validCosPhiP.points
@@ -119,15 +119,15 @@ class ReactivePowerCharacteristicTest extends Specification {
119119

120120
def "A valid QV is correctly de-serialized"() {
121121
when: "De-serializing a valid input"
122-
String actual = validQV.Serialize()
122+
String actual = validQV.serialize()
123123

124124
then: "it returns the correct string"
125-
actual == validQVDeSerialized
125+
actual == validQVSerialized
126126
}
127127

128128
def "A QV is correctly set up from a correctly formatted string"() {
129129
when:
130-
QV actual = new QV(validQVDeSerialized)
130+
QV actual = new QV(validQVSerialized)
131131

132132
then:
133133
actual.points == validQV.points
@@ -144,7 +144,7 @@ class ReactivePowerCharacteristicTest extends Specification {
144144

145145
def "The ReactivePowerCharacteristic is able to parse a fixed power factor correctly from string"() {
146146
when:
147-
ReactivePowerCharacteristic actual = ReactivePowerCharacteristic.parse(validCosPhiFixedDeSerialized)
147+
ReactivePowerCharacteristic actual = ReactivePowerCharacteristic.parse(validCosPhiFixedSerialized)
148148

149149
then:
150150
actual instanceof CosPhiFixed
@@ -153,7 +153,7 @@ class ReactivePowerCharacteristicTest extends Specification {
153153

154154
def "The ReactivePowerCharacteristic is able to parse a power dependent power factor correctly from string"() {
155155
when:
156-
ReactivePowerCharacteristic actual = ReactivePowerCharacteristic.parse(validCosPhiPDeSerialized)
156+
ReactivePowerCharacteristic actual = ReactivePowerCharacteristic.parse(validCosPhiPSerialized)
157157

158158
then:
159159
actual instanceof CosPhiP
@@ -162,7 +162,7 @@ class ReactivePowerCharacteristicTest extends Specification {
162162

163163
def "The ReactivePowerCharacteristic is able to parse voltage dependent reactive power correctly from string"() {
164164
when:
165-
ReactivePowerCharacteristic actual = ReactivePowerCharacteristic.parse(validQVDeSerialized)
165+
ReactivePowerCharacteristic actual = ReactivePowerCharacteristic.parse(validQVSerialized)
166166

167167
then:
168168
actual instanceof QV

‎src/test/groovy/edu/ie3/datamodel/models/system/characteristic/WecCharacteristicTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class WecCharacteristicTest extends Specification {
3737

3838
def "A WecCharacteristicInput is correctly de-serialized"() {
3939
when:
40-
String actual = validInput.Serialize()
40+
String actual = validInput.serialize()
4141

4242
then:
4343
actual == "cP:{(10.0,0.05),(15.0,0.1),(20.0,0.2)}"

‎src/test/groovy/edu/ie3/test/common/SystemParticipantTestData.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ class SystemParticipantTestData {
4545
static final CosPhiFixed cosPhiFixed = new CosPhiFixed("cosPhiFixed:{(0.0,0.95)}")
4646
private static final CosPhiP cosPhiP = new CosPhiP("cosPhiP:{(0.0,1.0),(0.9,1.0),(1.2,-0.3)}")
4747
private static final QV qV = new QV("qV:{(0.9,-0.3),(0.95,0.0),(1.05,0.0),(1.1,0.3)}")
48-
public static final String cosPhiFixedDeSerialized = "cosPhiFixed:{(0.0,0.95)}"
49-
public static final String cosPhiPDeSerialized = "cosPhiP:{(0.0,1.0),(0.9,1.0),(1.2,-0.3)}"
50-
public static final String qVDeSerialized = "qV:{(0.9,-0.3),(0.95,0.0),(1.05,0.0),(1.1,0.3)}"
48+
public static final String cosPhiFixedSerialized = "cosPhiFixed:{(0.0,0.95)}"
49+
public static final String cosPhiPSerialized = "cosPhiP:{(0.0,1.0),(0.9,1.0),(1.2,-0.3)}"
50+
public static final String qVSerialized = "qV:{(0.9,-0.3),(0.95,0.0),(1.05,0.0),(1.1,0.3)}"
5151
static final ComparableQuantity<Power> sRated = Quantities.getQuantity(25d, ACTIVE_POWER_IN)
5252
static final double cosPhiRated = 0.95
5353
private static final UUID typeUuid = UUID.fromString("5ebd8f7e-dedb-4017-bb86-6373c4b68eb8")

0 commit comments

Comments
 (0)