Skip to content

Commit

Permalink
Compiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@sebastian-peter
sebastian-peter committed Dec 15, 2023
1 parent 5ecbce6 commit 46c19fb
Show file tree
Hide file tree
Showing 35 changed files with 438 additions and 506 deletions.
3 changes: 2 additions & 1 deletion src/main/java/edu/ie3/datamodel/io/factory/input/participant/BmInputFactory.java
View file
Expand Up @@ -10,6 +10,7 @@
import edu.ie3.datamodel.models.input.NodeInput;
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.system.BmInput;
import edu.ie3.datamodel.models.input.system.EmInput;
import edu.ie3.datamodel.models.input.system.characteristic.ReactivePowerCharacteristic;
import edu.ie3.datamodel.models.input.system.type.BmTypeInput;
import edu.ie3.util.quantities.interfaces.EnergyPrice;
Expand Down Expand Up @@ -39,9 +40,9 @@ protected BmInput buildModel(
String id,
NodeInput node,
ReactivePowerCharacteristic qCharacteristics,
UUID em,
OperatorInput operator,
OperationTime operationTime) {
final EmInput em = data.getEm().orElse(null);
final BmTypeInput typeInput = data.getTypeInput();
final boolean marketReaction = data.getBoolean(MARKET_REACTION);
final boolean costControlled = data.getBoolean(COST_CONTROLLED);
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/edu/ie3/datamodel/io/factory/input/participant/ChpInputEntityData.java
View file
Expand Up @@ -8,6 +8,7 @@
import edu.ie3.datamodel.models.input.NodeInput;
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.system.ChpInput;
import edu.ie3.datamodel.models.input.system.EmInput;
import edu.ie3.datamodel.models.input.system.type.ChpTypeInput;
import edu.ie3.datamodel.models.input.thermal.ThermalBusInput;
import edu.ie3.datamodel.models.input.thermal.ThermalStorageInput;
Expand All @@ -21,10 +22,11 @@ public class ChpInputEntityData extends SystemParticipantTypedEntityData<ChpType
public ChpInputEntityData(
Map<String, String> fieldsToAttributes,
NodeInput node,
EmInput em,
ChpTypeInput typeInput,
ThermalBusInput thermalBusInput,
ThermalStorageInput thermalStorageInput) {
super(fieldsToAttributes, ChpInput.class, node, typeInput);
super(fieldsToAttributes, ChpInput.class, node, em, typeInput);
this.thermalBusInput = thermalBusInput;
this.thermalStorageInput = thermalStorageInput;
}
Expand All @@ -33,10 +35,11 @@ public ChpInputEntityData(
Map<String, String> fieldsToAttributes,
OperatorInput operator,
NodeInput node,
EmInput em,
ChpTypeInput typeInput,
ThermalBusInput thermalBusInput,
ThermalStorageInput thermalStorageInput) {
super(fieldsToAttributes, ChpInput.class, operator, node, typeInput);
super(fieldsToAttributes, ChpInput.class, operator, node, em, typeInput);
this.thermalBusInput = thermalBusInput;
this.thermalStorageInput = thermalStorageInput;
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/edu/ie3/datamodel/io/factory/input/participant/ChpInputFactory.java
View file
Expand Up @@ -9,6 +9,7 @@
import edu.ie3.datamodel.models.input.NodeInput;
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.system.ChpInput;
import edu.ie3.datamodel.models.input.system.EmInput;
import edu.ie3.datamodel.models.input.system.characteristic.ReactivePowerCharacteristic;
import java.util.UUID;

Expand All @@ -32,9 +33,9 @@ protected ChpInput buildModel(
String id,
NodeInput node,
ReactivePowerCharacteristic qCharacteristics,
UUID em,
OperatorInput operator,
OperationTime operationTime) {
final EmInput em = data.getEm().orElse(null);
final boolean marketReaction = data.getBoolean(MARKET_REACTION);

return new ChpInput(
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/edu/ie3/datamodel/io/factory/input/participant/EvInputFactory.java
View file
Expand Up @@ -8,6 +8,7 @@
import edu.ie3.datamodel.models.OperationTime;
import edu.ie3.datamodel.models.input.NodeInput;
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.system.EmInput;
import edu.ie3.datamodel.models.input.system.EvInput;
import edu.ie3.datamodel.models.input.system.characteristic.ReactivePowerCharacteristic;
import edu.ie3.datamodel.models.input.system.type.EvTypeInput;
Expand All @@ -33,9 +34,10 @@ protected EvInput buildModel(
String id,
NodeInput node,
ReactivePowerCharacteristic qCharacteristics,
UUID em,
OperatorInput operator,
OperationTime operationTime) {
final EmInput em = data.getEm().orElse(null);

return new EvInput(
uuid, id, operator, operationTime, node, qCharacteristics, em, data.getTypeInput());
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/edu/ie3/datamodel/io/factory/input/participant/EvcsInputFactory.java
View file
Expand Up @@ -11,6 +11,7 @@
import edu.ie3.datamodel.models.OperationTime;
import edu.ie3.datamodel.models.input.NodeInput;
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.system.EmInput;
import edu.ie3.datamodel.models.input.system.EvcsInput;
import edu.ie3.datamodel.models.input.system.characteristic.ReactivePowerCharacteristic;
import edu.ie3.datamodel.models.input.system.type.chargingpoint.ChargingPointType;
Expand Down Expand Up @@ -53,7 +54,7 @@ protected EvcsInput buildModel(
ReactivePowerCharacteristic qCharacteristics,
OperatorInput operator,
OperationTime operationTime) {

final EmInput em = data.getEm().orElse(null);
final ChargingPointType type;
try {
type = ChargingPointTypeUtils.parse(data.getField(TYPE));
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactory.java
View file
Expand Up @@ -5,19 +5,19 @@
*/
package edu.ie3.datamodel.io.factory.input.participant;

import edu.ie3.datamodel.io.factory.input.NodeAssetInputEntityData;
import edu.ie3.datamodel.models.OperationTime;
import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.datamodel.models.input.NodeInput;
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.system.EmInput;
import edu.ie3.datamodel.models.input.system.FixedFeedInInput;
import edu.ie3.datamodel.models.input.system.characteristic.ReactivePowerCharacteristic;
import java.util.UUID;
import javax.measure.quantity.Power;
import tech.units.indriya.ComparableQuantity;

public class FixedFeedInInputFactory
extends SystemParticipantInputEntityFactory<FixedFeedInInput, NodeAssetInputEntityData> {
extends SystemParticipantInputEntityFactory<FixedFeedInInput, SystemParticipantEntityData> {

private static final String S_RATED = "srated";
private static final String COSPHI_RATED = "cosphirated";
Expand All @@ -33,14 +33,14 @@ protected String[] getAdditionalFields() {

@Override
protected FixedFeedInInput buildModel(
NodeAssetInputEntityData data,
SystemParticipantEntityData data,
UUID uuid,
String id,
NodeInput node,
ReactivePowerCharacteristic qCharacteristics,
UUID em,
OperatorInput operator,
OperationTime operationTime) {
final EmInput em = data.getEm().orElse(null);
final ComparableQuantity<Power> sRated = data.getQuantity(S_RATED, StandardUnits.S_RATED);
final double cosPhiRated = data.getDouble(COSPHI_RATED);

Expand Down
7 changes: 5 additions & 2 deletions src/main/java/edu/ie3/datamodel/io/factory/input/participant/HpInputEntityData.java
View file
Expand Up @@ -7,6 +7,7 @@

import edu.ie3.datamodel.models.input.NodeInput;
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.system.EmInput;
import edu.ie3.datamodel.models.input.system.HpInput;
import edu.ie3.datamodel.models.input.system.type.HpTypeInput;
import edu.ie3.datamodel.models.input.thermal.ThermalBusInput;
Expand All @@ -19,19 +20,21 @@ public class HpInputEntityData extends SystemParticipantTypedEntityData<HpTypeIn
public HpInputEntityData(
Map<String, String> fieldsToAttributes,
NodeInput node,
EmInput em,
HpTypeInput typeInput,
ThermalBusInput thermalBusInput) {
super(fieldsToAttributes, HpInput.class, node, typeInput);
super(fieldsToAttributes, HpInput.class, node, em, typeInput);
this.thermalBusInput = thermalBusInput;
}

public HpInputEntityData(
Map<String, String> fieldsToAttributes,
OperatorInput operator,
NodeInput node,
EmInput em,
HpTypeInput typeInput,
ThermalBusInput thermalBusInput) {
super(fieldsToAttributes, HpInput.class, operator, node, typeInput);
super(fieldsToAttributes, HpInput.class, operator, node, em, typeInput);
this.thermalBusInput = thermalBusInput;
}

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/edu/ie3/datamodel/io/factory/input/participant/HpInputFactory.java
View file
Expand Up @@ -8,6 +8,7 @@
import edu.ie3.datamodel.models.OperationTime;
import edu.ie3.datamodel.models.input.NodeInput;
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.system.EmInput;
import edu.ie3.datamodel.models.input.system.HpInput;
import edu.ie3.datamodel.models.input.system.characteristic.ReactivePowerCharacteristic;
import java.util.UUID;
Expand All @@ -31,9 +32,10 @@ protected HpInput buildModel(
String id,
NodeInput node,
ReactivePowerCharacteristic qCharacteristics,
UUID em,
OperatorInput operator,
OperationTime operationTime) {
final EmInput em = data.getEm().orElse(null);

return new HpInput(
uuid,
id,
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactory.java
View file
Expand Up @@ -10,6 +10,7 @@
import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.datamodel.models.input.NodeInput;
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.system.EmInput;
import edu.ie3.datamodel.models.input.system.LoadInput;
import edu.ie3.datamodel.models.input.system.characteristic.ReactivePowerCharacteristic;
import edu.ie3.datamodel.models.profile.LoadProfile;
Expand Down Expand Up @@ -46,7 +47,6 @@ protected LoadInput buildModel(
String id,
NodeInput node,
ReactivePowerCharacteristic qCharacteristics,
UUID em,
OperatorInput operator,
OperationTime operationTime) {
LoadProfile loadProfile;
Expand All @@ -59,6 +59,7 @@ protected LoadInput buildModel(
id);
loadProfile = LoadProfile.DefaultLoadProfiles.NO_LOAD_PROFILE;
}
final EmInput em = data.getEm().orElse(null);
final boolean dsm = data.getBoolean(DSM);
final ComparableQuantity<Energy> eConsAnnual =
data.getQuantity(E_CONS_ANNUAL, StandardUnits.ENERGY_IN);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/edu/ie3/datamodel/io/factory/input/participant/PvInputFactory.java
View file
Expand Up @@ -9,6 +9,7 @@
import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.datamodel.models.input.NodeInput;
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.system.EmInput;
import edu.ie3.datamodel.models.input.system.PvInput;
import edu.ie3.datamodel.models.input.system.characteristic.ReactivePowerCharacteristic;
import java.util.UUID;
Expand Down Expand Up @@ -47,9 +48,9 @@ protected PvInput buildModel(
String id,
NodeInput node,
ReactivePowerCharacteristic qCharacteristics,
UUID em,
OperatorInput operator,
OperationTime operationTime) {
final EmInput em = data.getEm().orElse(null);
final double albedo = data.getDouble(ALBEDO);
final ComparableQuantity<Angle> azimuth = data.getQuantity(AZIMUTH, StandardUnits.AZIMUTH);
final ComparableQuantity<Dimensionless> etaConv =
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/edu/ie3/datamodel/io/factory/input/participant/StorageInputFactory.java
View file
Expand Up @@ -8,6 +8,7 @@
import edu.ie3.datamodel.models.OperationTime;
import edu.ie3.datamodel.models.input.NodeInput;
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.system.EmInput;
import edu.ie3.datamodel.models.input.system.StorageInput;
import edu.ie3.datamodel.models.input.system.characteristic.ReactivePowerCharacteristic;
import edu.ie3.datamodel.models.input.system.type.StorageTypeInput;
Expand All @@ -33,9 +34,9 @@ protected StorageInput buildModel(
String id,
NodeInput node,
ReactivePowerCharacteristic qCharacteristics,
UUID em,
OperatorInput operator,
OperationTime operationTime) {
final EmInput em = data.getEm().orElse(null);
final StorageTypeInput typeInput = data.getTypeInput();
return new StorageInput(
uuid, id, operator, operationTime, node, qCharacteristics, em, typeInput);
Expand Down
39 changes: 0 additions & 39 deletions ...main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantEntityData.java
View file
Expand Up @@ -5,18 +5,14 @@
*/
package edu.ie3.datamodel.io.factory.input.participant;

import edu.ie3.datamodel.exceptions.SourceException;
import edu.ie3.datamodel.io.factory.input.NodeAssetInputEntityData;
import edu.ie3.datamodel.models.UniqueEntity;
import edu.ie3.datamodel.models.input.NodeInput;
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.system.EmInput;
import edu.ie3.datamodel.utils.Try;

import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.UUID;

/**
* Data used for those classes of {@link
Expand Down Expand Up @@ -114,39 +110,4 @@ public boolean equals(Object o) {
public int hashCode() {
return Objects.hash(super.hashCode(), getEm());
}

public static Try<SystemParticipantEntityData, SourceException> build(
NodeAssetInputEntityData nodeAssetInputEntityData, Map<UUID, EmInput> ems) {

Map<String, String> fieldsToAttributes = nodeAssetInputEntityData.getFieldsToValues();

Try<Optional<EmInput>, SourceException> tryEm =
Optional.ofNullable(
nodeAssetInputEntityData.getUUID(SystemParticipantInputEntityFactory.EM))
.map(
// System participant has been given a proper UUID. This means we either...
emUuid ->
Optional.ofNullable(ems.get(emUuid))
// ... find a matching EmInput for given UUID, thus return a success with
// the EM
.map(
emInput ->
(Try<Optional<EmInput>, SourceException>)
new Try.Success<Optional<EmInput>, SourceException>(
Optional.of(emInput)))
// ... or find no matching EmInput, returning a failure.
.orElse(new Try.Failure<>(new SourceException(""))))
// If, on the other hand, no UUID was given (column does not exist, or field is empty),
// this is totally fine - we return an "empty success"
.orElse(new Try.Success<>(Optional.empty()));

return tryEm.map(
// if the operation was successful, transform and return to the data
optionalEm -> {
// remove fields that are passed as objects to constructor
fieldsToAttributes.keySet().remove(SystemParticipantInputEntityFactory.EM);

return new SystemParticipantEntityData(nodeAssetInputEntityData, optionalEm.orElse(null));
});
}
}

0 comments on commit 46c19fb

Please sign in to comment.