diff --git a/CHANGELOG.md b/CHANGELOG.md index 37d4cc181..8ce3dfdc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Fixed handling of `CongestionResult.InputModelType` in `EntityProcessor` [#1325](https://github.com/ie3-institute/PowerSystemDataModel/issues/1325) +- -Fixed em fields in input models [#1331](https://github.com/ie3-institute/PowerSystemDataModel/issues/1331) ### Changed - Updated dependabot workflow and added CODEOWNERS [#1328](https://github.com/ie3-institute/PowerSystemDataModel/issues/1328) diff --git a/docs/readthedocs/models/input/em.md b/docs/readthedocs/models/input/em.md index cbb562109..1e875e09f 100644 --- a/docs/readthedocs/models/input/em.md +++ b/docs/readthedocs/models/input/em.md @@ -37,7 +37,7 @@ Participants are connected to an EM each via their `em` field. - - String representation (e.g. name) of a control strategy - * - parentEm + * - controllingEm - - Reference to a superior Energy Management Unit that is controlling this EM. Field can be empty or missing, if this EM itself is not controlled. diff --git a/docs/readthedocs/models/input/participant/bm.md b/docs/readthedocs/models/input/participant/bm.md index f75407f12..57af584c8 100644 --- a/docs/readthedocs/models/input/participant/bm.md +++ b/docs/readthedocs/models/input/participant/bm.md @@ -107,7 +107,7 @@ Model of a biomass power plant. - € / MWh - Fixed feed in tariff - * - em + * - controllingEm - - UUID reference to an [Energy Management Unit](#em_model) that is controlling this system participant. Field can be empty or missing, if this participant diff --git a/docs/readthedocs/models/input/participant/chp.md b/docs/readthedocs/models/input/participant/chp.md index 9be96519d..ed1898998 100644 --- a/docs/readthedocs/models/input/participant/chp.md +++ b/docs/readthedocs/models/input/participant/chp.md @@ -114,7 +114,7 @@ Combined heat and power plant. - Whether to adapt output based on (volatile) market price or not - * - em + * - controllingEm - - UUID reference to an [Energy Management Unit](em_model) that is controlling this system participant. Field can be empty or missing, if this participant diff --git a/docs/readthedocs/models/input/participant/ev.md b/docs/readthedocs/models/input/participant/ev.md index b9669eed6..21c191200 100644 --- a/docs/readthedocs/models/input/participant/ev.md +++ b/docs/readthedocs/models/input/participant/ev.md @@ -97,7 +97,7 @@ Model of an electric vehicle, that is occasionally connected to the grid via an - - - * - em + * - controllingEm - - UUID reference to an [Energy Management Unit](#em_model) that is controlling this system participant. Field can be empty or missing, if this participant diff --git a/docs/readthedocs/models/input/participant/evcs.md b/docs/readthedocs/models/input/participant/evcs.md index 83d3218a7..7f187be02 100644 --- a/docs/readthedocs/models/input/participant/evcs.md +++ b/docs/readthedocs/models/input/participant/evcs.md @@ -63,7 +63,7 @@ station and has some limitations outlined below. - Boolean - Vehicle to grid (V2G) support, true if the charging station supports feed in. - * - em + * - controllingEm - - UUID reference to an [Energy Management Unit](#em_model) that is controlling this system participant. Field can be empty or missing, if this participant diff --git a/docs/readthedocs/models/input/participant/fixedfeedin.md b/docs/readthedocs/models/input/participant/fixedfeedin.md index c83570a04..3c17a23e9 100644 --- a/docs/readthedocs/models/input/participant/fixedfeedin.md +++ b/docs/readthedocs/models/input/participant/fixedfeedin.md @@ -49,7 +49,7 @@ model can be derived. - - Rated power factor - * - em + * - controllingEm - - UUID reference to an [Energy Management Unit](#em_model) that is controlling this system participant. Field can be empty or missing, if this participant diff --git a/docs/readthedocs/models/input/participant/hp.md b/docs/readthedocs/models/input/participant/hp.md index 2559c79c5..61c577916 100644 --- a/docs/readthedocs/models/input/participant/hp.md +++ b/docs/readthedocs/models/input/participant/hp.md @@ -93,7 +93,7 @@ Model of a heat pump. - - - * - em + * - controllingEm - - UUID reference to an [Energy Management Unit](#em_model) that is controlling this system participant. Field can be empty or missing, if this participant diff --git a/docs/readthedocs/models/input/participant/load.md b/docs/readthedocs/models/input/participant/load.md index 4ad7f4667..f774f9b87 100644 --- a/docs/readthedocs/models/input/participant/load.md +++ b/docs/readthedocs/models/input/participant/load.md @@ -56,7 +56,7 @@ Model of (mainly) domestic loads. - - Rated power factor - * - em + * - controllingEm - - UUID reference to an [Energy Management Unit](#em_model) that is controlling this system participant. Field can be empty or missing, if this participant diff --git a/docs/readthedocs/models/input/participant/pv.md b/docs/readthedocs/models/input/participant/pv.md index f91f1801b..db954e852 100644 --- a/docs/readthedocs/models/input/participant/pv.md +++ b/docs/readthedocs/models/input/participant/pv.md @@ -76,7 +76,7 @@ Detailed model of a photovoltaic power plant. - - Rated power factor - * - em + * - controllingEm - - UUID reference to an [Energy Management Unit](#em_model) that is controlling this system participant. Field can be empty or missing, if this participant diff --git a/docs/readthedocs/models/input/participant/storage.md b/docs/readthedocs/models/input/participant/storage.md index 51c25f359..952995c5d 100644 --- a/docs/readthedocs/models/input/participant/storage.md +++ b/docs/readthedocs/models/input/participant/storage.md @@ -107,7 +107,7 @@ Model of an ideal electrical battery energy storage. - Foreseen operation strategy of the storage. Eligible input: *"market"*, *"grid"*, *"self"* - * - em + * - controllingEm - - UUID reference to an [Energy Management Unit](#em_model) that is controlling this system participant. Field can be empty or missing, if this participant diff --git a/docs/readthedocs/models/input/participant/wec.md b/docs/readthedocs/models/input/participant/wec.md index b7d62498c..9ea86fdde 100644 --- a/docs/readthedocs/models/input/participant/wec.md +++ b/docs/readthedocs/models/input/participant/wec.md @@ -106,7 +106,7 @@ Model of a wind energy converter. - Whether to adapt output based on (volatile) market price or not - * - em + * - controllingEm - - UUID reference to an [Energy Management Unit](#em_model) that is controlling this system participant. Field can be empty or missing, if this participant diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/EmAssetInputEntityData.java b/src/main/java/edu/ie3/datamodel/io/factory/input/EmAssetInputEntityData.java index d001c405e..a51835568 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/EmAssetInputEntityData.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/EmAssetInputEntityData.java @@ -19,23 +19,23 @@ */ public class EmAssetInputEntityData extends AssetInputEntityData { - private final EmInput emUnit; + private final EmInput controllingEm; public EmAssetInputEntityData( Map fieldsToAttributes, Class entityClass, - EmInput emUnit) { + EmInput controllingEm) { super(fieldsToAttributes, entityClass); - this.emUnit = emUnit; + this.controllingEm = controllingEm; } public EmAssetInputEntityData( Map fieldsToAttributes, Class entityClass, OperatorInput operator, - EmInput emUnit) { + EmInput controllingEm) { super(fieldsToAttributes, entityClass, operator); - this.emUnit = emUnit; + this.controllingEm = controllingEm; } /** @@ -43,15 +43,15 @@ public EmAssetInputEntityData( * object and given em unit * * @param entityData The entity data object to use attributes of - * @param emUnit The em input to use + * @param controllingEm The controlling em input to use */ - public EmAssetInputEntityData(AssetInputEntityData entityData, EmInput emUnit) { + public EmAssetInputEntityData(AssetInputEntityData entityData, EmInput controllingEm) { super(entityData, entityData.getOperatorInput()); - this.emUnit = emUnit; + this.controllingEm = controllingEm; } - public EmInput getEmUnit() { - return emUnit; + public EmInput getControllingEm() { + return controllingEm; } @Override @@ -60,11 +60,11 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; if (!super.equals(o)) return false; EmAssetInputEntityData that = (EmAssetInputEntityData) o; - return Objects.equals(emUnit, that.emUnit); + return Objects.equals(controllingEm, that.controllingEm); } @Override public int hashCode() { - return Objects.hash(super.hashCode(), emUnit); + return Objects.hash(super.hashCode(), controllingEm); } } diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/EmInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/EmInputFactory.java similarity index 78% rename from src/main/java/edu/ie3/datamodel/io/factory/input/participant/EmInputFactory.java rename to src/main/java/edu/ie3/datamodel/io/factory/input/EmInputFactory.java index 3c4590d6e..4e2535f70 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/EmInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/EmInputFactory.java @@ -3,10 +3,8 @@ * Institute of Energy Systems, Energy Efficiency and Energy Economics, * Research group Distribution grid planning and operation */ -package edu.ie3.datamodel.io.factory.input.participant; +package edu.ie3.datamodel.io.factory.input; -import edu.ie3.datamodel.io.factory.input.AssetInputEntityFactory; -import edu.ie3.datamodel.io.factory.input.EmAssetInputEntityData; import edu.ie3.datamodel.models.OperationTime; import edu.ie3.datamodel.models.input.EmInput; import edu.ie3.datamodel.models.input.OperatorInput; @@ -19,7 +17,7 @@ public class EmInputFactory extends AssetInputEntityFactory> getFields(Class entityClass) { List> fields = new ArrayList<>(super.getFields(entityClass)); List> withEm = - fields.stream().map(f -> (Set) expandSet(f, PARENT_EM)).toList(); + fields.stream().map(f -> (Set) expandSet(f, CONTROLLING_EM)).toList(); fields.addAll(withEm); @@ -51,7 +49,7 @@ protected EmInput buildModel( OperationTime operationTime) { String controlStrategy = data.getField(CONTROL_STRATEGY); - EmInput parentEm = data.getEmUnit(); + EmInput parentEm = data.getControllingEm(); return new EmInput(uuid, id, operator, operationTime, controlStrategy, parentEm); } diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/BmInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/BmInputFactory.java index 8a1c58b9e..dd17b0fb0 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/BmInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/BmInputFactory.java @@ -42,7 +42,7 @@ protected BmInput buildModel( ReactivePowerCharacteristic qCharacteristics, OperatorInput operator, OperationTime operationTime) { - final EmInput em = data.getEm().orElse(null); + final EmInput em = data.getControllingEm().orElse(null); final BmTypeInput typeInput = data.getTypeInput(); final boolean marketReaction = data.getBoolean(MARKET_REACTION); final boolean costControlled = data.getBoolean(COST_CONTROLLED); diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/ChpInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/ChpInputFactory.java index d398f5a59..db7bb3cdf 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/ChpInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/ChpInputFactory.java @@ -35,7 +35,7 @@ protected ChpInput buildModel( ReactivePowerCharacteristic qCharacteristics, OperatorInput operator, OperationTime operationTime) { - final EmInput em = data.getEm().orElse(null); + final EmInput em = data.getControllingEm().orElse(null); final boolean marketReaction = data.getBoolean(MARKET_REACTION); return new ChpInput( diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/EvInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/EvInputFactory.java index b2d492ce5..a24abad06 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/EvInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/EvInputFactory.java @@ -36,7 +36,7 @@ protected EvInput buildModel( ReactivePowerCharacteristic qCharacteristics, OperatorInput operator, OperationTime operationTime) { - final EmInput em = data.getEm().orElse(null); + final EmInput em = data.getControllingEm().orElse(null); return new EvInput( uuid, id, operator, operationTime, node, qCharacteristics, em, data.getTypeInput()); diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/EvcsInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/EvcsInputFactory.java index a0bc9e9c0..46b75a9f9 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/EvcsInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/EvcsInputFactory.java @@ -54,7 +54,7 @@ protected EvcsInput buildModel( ReactivePowerCharacteristic qCharacteristics, OperatorInput operator, OperationTime operationTime) { - final EmInput em = data.getEm().orElse(null); + final EmInput em = data.getControllingEm().orElse(null); final ChargingPointType type; try { type = ChargingPointTypeUtils.parse(data.getField(TYPE)); diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactory.java index f0b6e28a9..257c40974 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactory.java @@ -40,7 +40,7 @@ protected FixedFeedInInput buildModel( ReactivePowerCharacteristic qCharacteristics, OperatorInput operator, OperationTime operationTime) { - final EmInput em = data.getEm().orElse(null); + final EmInput em = data.getControllingEm().orElse(null); final ComparableQuantity sRated = data.getQuantity(S_RATED, StandardUnits.S_RATED); final double cosPhiRated = data.getDouble(COSPHI_RATED); diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/HpInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/HpInputFactory.java index b01ede298..d075d64a3 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/HpInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/HpInputFactory.java @@ -34,7 +34,7 @@ protected HpInput buildModel( ReactivePowerCharacteristic qCharacteristics, OperatorInput operator, OperationTime operationTime) { - final EmInput em = data.getEm().orElse(null); + final EmInput em = data.getControllingEm().orElse(null); return new HpInput( uuid, diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactory.java index c66cec08f..71af7c515 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactory.java @@ -58,7 +58,7 @@ protected LoadInput buildModel( id); loadProfile = LoadProfile.DefaultLoadProfiles.NO_LOAD_PROFILE; } - final EmInput em = data.getEm().orElse(null); + final EmInput em = data.getControllingEm().orElse(null); final ComparableQuantity eConsAnnual = data.getQuantity(E_CONS_ANNUAL, StandardUnits.ENERGY_IN); diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/PvInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/PvInputFactory.java index 6cb13b79f..70f7253fc 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/PvInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/PvInputFactory.java @@ -50,7 +50,7 @@ protected PvInput buildModel( ReactivePowerCharacteristic qCharacteristics, OperatorInput operator, OperationTime operationTime) { - final EmInput em = data.getEm().orElse(null); + final EmInput em = data.getControllingEm().orElse(null); final double albedo = data.getDouble(ALBEDO); final ComparableQuantity azimuth = data.getQuantity(AZIMUTH, StandardUnits.AZIMUTH); final ComparableQuantity etaConv = diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/StorageInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/StorageInputFactory.java index aea43ba85..4b9149525 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/StorageInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/StorageInputFactory.java @@ -36,7 +36,7 @@ protected StorageInput buildModel( ReactivePowerCharacteristic qCharacteristics, OperatorInput operator, OperationTime operationTime) { - final EmInput em = data.getEm().orElse(null); + final EmInput em = data.getControllingEm().orElse(null); final StorageTypeInput typeInput = data.getTypeInput(); return new StorageInput( uuid, id, operator, operationTime, node, qCharacteristics, em, typeInput); diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantEntityData.java b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantEntityData.java index 971832be4..5304124f2 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantEntityData.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantEntityData.java @@ -22,7 +22,7 @@ public class SystemParticipantEntityData extends NodeAssetInputEntityData { /** Energy management unit that is managing the system participant. Can be null. */ - private final EmInput em; + private final EmInput controllingEm; /** * Creates a new SystemParticipantEntityData object for an operated, always on system participant @@ -31,20 +31,20 @@ public class SystemParticipantEntityData extends NodeAssetInputEntityData { * @param fieldsToAttributes attribute map: field name to value * @param entityClass class of the entity to be created with this data * @param node input node - * @param em The energy management unit that is managing the system participant. Null, if the - * system participant is not managed. + * @param controllingEm The energy management unit that is managing the system participant. Null, + * if the system participant is not managed. */ public SystemParticipantEntityData( Map fieldsToAttributes, Class entityClass, NodeInput node, - EmInput em) { + EmInput controllingEm) { super(fieldsToAttributes, entityClass, node); - this.em = em; + this.controllingEm = controllingEm; } - public Optional getEm() { - return Optional.ofNullable(em); + public Optional getControllingEm() { + return Optional.ofNullable(controllingEm); } /** @@ -54,17 +54,17 @@ public Optional getEm() { * @param entityClass class of the entity to be created with this data * @param operator operator input * @param node input node - * @param em The energy management unit that is managing the system participant. Null, if the - * system participant is not managed. + * @param controllingEm The energy management unit that is managing the system participant. Null, + * if the system participant is not managed. */ public SystemParticipantEntityData( Map fieldsToAttributes, Class entityClass, OperatorInput operator, NodeInput node, - EmInput em) { + EmInput controllingEm) { super(fieldsToAttributes, entityClass, operator, node); - this.em = em; + this.controllingEm = controllingEm; } /** @@ -72,20 +72,20 @@ public SystemParticipantEntityData( * NodeAssetInputEntityData} object and given energy management unit * * @param nodeAssetInputEntityData The node asset entity data object to use attributes of - * @param em The energy management unit that is managing the system participant. Null, if the - * system participant is not managed. + * @param controllingEm The energy management unit that is managing the system participant. Null, + * if the system participant is not managed. */ public SystemParticipantEntityData( - NodeAssetInputEntityData nodeAssetInputEntityData, EmInput em) { + NodeAssetInputEntityData nodeAssetInputEntityData, EmInput controllingEm) { super(nodeAssetInputEntityData, nodeAssetInputEntityData.getNode()); - this.em = em; + this.controllingEm = controllingEm; } @Override public String toString() { return "SystemParticipantEntityData{" + "em=" - + getEm().map(EmInput::toString).orElse("") + + getControllingEm().map(EmInput::toString).orElse("") + ", node=" + getNode().getUuid() + ", operatorInput=" @@ -103,11 +103,11 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; if (!super.equals(o)) return false; SystemParticipantEntityData that = (SystemParticipantEntityData) o; - return getEm().equals(that.getEm()); + return getControllingEm().equals(that.getControllingEm()); } @Override public int hashCode() { - return Objects.hash(super.hashCode(), getEm()); + return Objects.hash(super.hashCode(), getControllingEm()); } } diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantInputEntityFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantInputEntityFactory.java index 298bdfe92..d3a1939c6 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantInputEntityFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantInputEntityFactory.java @@ -32,7 +32,7 @@ public abstract class SystemParticipantInputEntityFactory< private static final String Q_CHARACTERISTICS = "qCharacteristics"; - public static final String EM = "em"; + public static final String CONTROLLING_EM = "controllingEm"; protected SystemParticipantInputEntityFactory(Class... allowedClasses) { super(allowedClasses); @@ -43,7 +43,8 @@ protected List> getFields(Class entityClass) { List> fields = new ArrayList<>(super.getFields(entityClass)); for (Set set : fields) set.add(Q_CHARACTERISTICS); - List> withEm = fields.stream().map(f -> (Set) expandSet(f, EM)).toList(); + List> withEm = + fields.stream().map(f -> (Set) expandSet(f, CONTROLLING_EM)).toList(); fields.addAll(withEm); diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantTypedEntityData.java b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantTypedEntityData.java index ab0bbe4b3..a57d814ed 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantTypedEntityData.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantTypedEntityData.java @@ -80,7 +80,7 @@ public SystemParticipantTypedEntityData( */ public SystemParticipantTypedEntityData( SystemParticipantEntityData systemParticipantEntityData, T typeInput) { - super(systemParticipantEntityData, systemParticipantEntityData.getEm().orElse(null)); + super(systemParticipantEntityData, systemParticipantEntityData.getControllingEm().orElse(null)); this.typeInput = typeInput; } @@ -94,7 +94,7 @@ public String toString() { + "typeInput=" + typeInput.getUuid() + ", em=" - + getEm().map(EmInput::toString).orElse("") + + getControllingEm().map(EmInput::toString).orElse("") + ", node=" + getNode().getUuid() + ", operatorInput=" diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/WecInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/WecInputFactory.java index 5d8fbca71..a1724fcac 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/WecInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/WecInputFactory.java @@ -38,7 +38,7 @@ protected WecInput buildModel( OperatorInput operator, OperationTime operationTime) { WecTypeInput typeInput = data.getTypeInput(); - EmInput em = data.getEm().orElse(null); + EmInput em = data.getControllingEm().orElse(null); final boolean marketReaction = data.getBoolean(MARKET_REACTION); return new WecInput( diff --git a/src/main/java/edu/ie3/datamodel/io/source/EnergyManagementSource.java b/src/main/java/edu/ie3/datamodel/io/source/EnergyManagementSource.java index 8a5cce317..5cea8a531 100644 --- a/src/main/java/edu/ie3/datamodel/io/source/EnergyManagementSource.java +++ b/src/main/java/edu/ie3/datamodel/io/source/EnergyManagementSource.java @@ -5,13 +5,13 @@ */ package edu.ie3.datamodel.io.source; -import static edu.ie3.datamodel.io.factory.input.participant.EmInputFactory.PARENT_EM; +import static edu.ie3.datamodel.io.factory.input.EmInputFactory.CONTROLLING_EM; import edu.ie3.datamodel.exceptions.SourceException; import edu.ie3.datamodel.exceptions.ValidationException; import edu.ie3.datamodel.io.factory.input.AssetInputEntityData; import edu.ie3.datamodel.io.factory.input.EmAssetInputEntityData; -import edu.ie3.datamodel.io.factory.input.participant.EmInputFactory; +import edu.ie3.datamodel.io.factory.input.EmInputFactory; import edu.ie3.datamodel.models.input.EmInput; import edu.ie3.datamodel.models.input.OperatorInput; import edu.ie3.datamodel.utils.Try; @@ -96,7 +96,8 @@ private static Map createEmInputs( dataTry .map( data -> - data.containsKey(PARENT_EM) && !data.getField(PARENT_EM).isBlank()) + data.containsKey(CONTROLLING_EM) + && !data.getField(CONTROLLING_EM).isBlank()) .getOrElse(() -> true))); List> rootEmsEntityData = split.get(false); @@ -129,7 +130,7 @@ private static Map createEmInputs( data -> { // we already filtered out those entities that do not have a parent, // so the field should exist - String uuidString = data.getField(PARENT_EM); + String uuidString = data.getField(CONTROLLING_EM); return Try.of( () -> UUID.fromString(uuidString), IllegalArgumentException.class) @@ -138,7 +139,7 @@ private static Map createEmInputs( new SourceException( String.format( "Exception while trying to parse UUID of field \"%s\" with value \"%s\"", - PARENT_EM, uuidString), + CONTROLLING_EM, uuidString), iae)) // failed UUID parses are filtered out at this point. We save // the parsed UUID with the asset data @@ -199,7 +200,7 @@ private static Map createHierarchicalEmInputs( /** * Helper data record that holds an {@link AssetInputEntityData} and the UUID successfully parsed - * from {@link EmInputFactory#PARENT_EM} field + * from {@link EmInputFactory#CONTROLLING_EM} field */ private record AssetDataAndValidParentUuid(AssetInputEntityData entityData, UUID parentEm) {} } diff --git a/src/main/java/edu/ie3/datamodel/io/source/SystemParticipantSource.java b/src/main/java/edu/ie3/datamodel/io/source/SystemParticipantSource.java index 3df433dac..48aba751e 100644 --- a/src/main/java/edu/ie3/datamodel/io/source/SystemParticipantSource.java +++ b/src/main/java/edu/ie3/datamodel/io/source/SystemParticipantSource.java @@ -64,7 +64,7 @@ public class SystemParticipantSource extends AssetEntitySource { .andThen(enrich(NODE, nodes, NodeAssetInputEntityData::new)) .andThen( enrichWithDefault( - SystemParticipantInputEntityFactory.EM, + SystemParticipantInputEntityFactory.CONTROLLING_EM, emUnits, null, SystemParticipantEntityData::new)) diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EmInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/EmInputFactoryTest.groovy similarity index 97% rename from src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EmInputFactoryTest.groovy rename to src/test/groovy/edu/ie3/datamodel/io/factory/input/EmInputFactoryTest.groovy index 6a0734f07..113fc739e 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EmInputFactoryTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/EmInputFactoryTest.groovy @@ -3,10 +3,9 @@ * Institute of Energy Systems, Energy Efficiency and Energy Economics, * Research group Distribution grid planning and operation */ -package edu.ie3.datamodel.io.factory.input.participant +package edu.ie3.datamodel.io.factory.input import edu.ie3.datamodel.exceptions.FactoryException -import edu.ie3.datamodel.io.factory.input.EmAssetInputEntityData import edu.ie3.datamodel.models.input.EmInput import edu.ie3.datamodel.models.input.OperatorInput import edu.ie3.datamodel.utils.Try diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactoryTest.groovy index d94ff5b9e..f43e60e6e 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactoryTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactoryTest.groovy @@ -8,6 +8,7 @@ package edu.ie3.datamodel.io.factory.input.participant import static edu.ie3.util.quantities.PowerSystemUnits.PU import edu.ie3.datamodel.exceptions.FactoryException +import edu.ie3.datamodel.exceptions.ValidationException import edu.ie3.datamodel.models.StandardUnits import edu.ie3.datamodel.models.input.EmInput import edu.ie3.datamodel.models.input.NodeInput @@ -81,7 +82,7 @@ class FixedFeedInInputFactoryTest extends Specification implements FactoryTestHe def actualFields = FixedFeedInInputFactory.newSet("uuid", "id", "s_rated", "cosphi_rated") when: - Try input = inputFactory.validate(actualFields, FixedFeedInInput) + Try input = inputFactory.validate(actualFields, FixedFeedInInput) then: input.failure @@ -91,9 +92,9 @@ class FixedFeedInInputFactoryTest extends Specification implements FactoryTestHe "1: [cosPhiRated, id, operatesFrom, qCharacteristics, sRated, uuid] or [cos_phi_rated, id, operates_from, q_characteristics, s_rated, uuid]\n" + "2: [cosPhiRated, id, operatesUntil, qCharacteristics, sRated, uuid] or [cos_phi_rated, id, operates_until, q_characteristics, s_rated, uuid]\n" + "3: [cosPhiRated, id, operatesFrom, operatesUntil, qCharacteristics, sRated, uuid] or [cos_phi_rated, id, operates_from, operates_until, q_characteristics, s_rated, uuid]\n" + - "4: [cosPhiRated, em, id, qCharacteristics, sRated, uuid] or [cos_phi_rated, em, id, q_characteristics, s_rated, uuid]\n" + - "5: [cosPhiRated, em, id, operatesFrom, qCharacteristics, sRated, uuid] or [cos_phi_rated, em, id, operates_from, q_characteristics, s_rated, uuid]\n" + - "6: [cosPhiRated, em, id, operatesUntil, qCharacteristics, sRated, uuid] or [cos_phi_rated, em, id, operates_until, q_characteristics, s_rated, uuid]\n" + - "7: [cosPhiRated, em, id, operatesFrom, operatesUntil, qCharacteristics, sRated, uuid] or [cos_phi_rated, em, id, operates_from, operates_until, q_characteristics, s_rated, uuid]\n" + "4: [controllingEm, cosPhiRated, id, qCharacteristics, sRated, uuid] or [controlling_em, cos_phi_rated, id, q_characteristics, s_rated, uuid]\n" + + "5: [controllingEm, cosPhiRated, id, operatesFrom, qCharacteristics, sRated, uuid] or [controlling_em, cos_phi_rated, id, operates_from, q_characteristics, s_rated, uuid]\n" + + "6: [controllingEm, cosPhiRated, id, operatesUntil, qCharacteristics, sRated, uuid] or [controlling_em, cos_phi_rated, id, operates_until, q_characteristics, s_rated, uuid]\n" + + "7: [controllingEm, cosPhiRated, id, operatesFrom, operatesUntil, qCharacteristics, sRated, uuid] or [controlling_em, cos_phi_rated, id, operates_from, operates_until, q_characteristics, s_rated, uuid]\n" } } diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/EnergyManagementSourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/EnergyManagementSourceTest.groovy index 288c6be0a..2cdac0018 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/source/EnergyManagementSourceTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/source/EnergyManagementSourceTest.groovy @@ -24,35 +24,35 @@ class EnergyManagementSourceTest extends Specification { new AssetInputEntityData( ["uuid": "0-0-0-0-0", "id": "root", - "parentem" : "", + "controllingem" : "", "controlstrategy" : ""], EmInput ), new AssetInputEntityData( ["uuid": "0-0-0-0-1", "id": "child 1", - "parentem" : "0-0-0-0-0", + "controllingem" : "0-0-0-0-0", "controlstrategy" : ""], EmInput ), new AssetInputEntityData( ["uuid": "0-0-0-0-11", "id": "child 1-1", - "parentem" : "0-0-0-0-1", + "controllingem" : "0-0-0-0-1", "controlstrategy" : ""], EmInput ), new AssetInputEntityData( ["uuid": "0-0-0-0-2", "id": "child 2", - "parentem" : "0-0-0-0-0", + "controllingem" : "0-0-0-0-0", "controlstrategy" : ""], EmInput ), new AssetInputEntityData( ["uuid": "0-0-0-0-21", "id": "child 2-1", - "parentem" : "0-0-0-0-2", + "controllingem" : "0-0-0-0-2", "controlstrategy" : ""], EmInput ), @@ -101,21 +101,21 @@ class EnergyManagementSourceTest extends Specification { new AssetInputEntityData( ["uuid": "0-0-0-0-1", "id": "em 1", - "parentem" : "", + "controllingem" : "", "controlstrategy" : ""], EmInput ), new AssetInputEntityData( ["uuid": "0-0-0-0-2", "id": "em 2", - "parentem" : "", + "controllingem" : "", "controlstrategy" : "strat_b"], EmInput ), new AssetInputEntityData( ["uuid": "0-0-0-0-3", "id": "em 3", - "parentem" : "", + "controllingem" : "", "controlstrategy" : "other"], EmInput ), @@ -152,14 +152,14 @@ class EnergyManagementSourceTest extends Specification { new Try.Success(new AssetInputEntityData( ["uuid": "0-0-0-0-1", "id": "em 1", - "parentem" : "", + "controllingem" : "", "controlstrategy" : ""], EmInput )), new Try.Success(new AssetInputEntityData( ["uuid": "0-0-0-0-2", "id": "em 2", - "parentem" : "", + "controllingem" : "", "controlstrategy" : ""], EmInput )), @@ -180,14 +180,14 @@ class EnergyManagementSourceTest extends Specification { new AssetInputEntityData( ["uuid": "0-0-0-0-1", "id": "em 1", - "parentem" : "", + "controllingem" : "", "controlstrategy" : ""], EmInput ), new AssetInputEntityData( ["uuid": "0-0-0-0-2", "id": "em 2", - "parentem" : "not-a-uuid", + "controllingem" : "not-a-uuid", "controlstrategy" : ""], EmInput ), @@ -198,7 +198,7 @@ class EnergyManagementSourceTest extends Specification { then: def exc = thrown(SourceException) - exc.cause.message.contains("Exception while trying to parse UUID of field \"parentem\" with value \"not-a-uuid\"") + exc.cause.message.contains("Exception while trying to parse UUID of field \"controllingEm\" with value \"not-a-uuid\"") } def "An EnergyManagementSource should fail if the factory fails for one EM"() { @@ -207,13 +207,13 @@ class EnergyManagementSourceTest extends Specification { new AssetInputEntityData( ["uuid": "0-0-0-0-1", "id": "em 1", - "parentem" : "", + "controllingem" : "", "controlstrategy" : ""], EmInput ), new AssetInputEntityData( ["uuid": "0-0-0-0-2", // id is missing - "parentem" : "", + "controllingem" : "", "controlstrategy" : ""], EmInput ), @@ -234,14 +234,14 @@ class EnergyManagementSourceTest extends Specification { new AssetInputEntityData( ["uuid": "0-0-0-0-1", "id": "em 1", - "parentem" : "", + "controllingem" : "", "controlstrategy" : ""], EmInput ), new AssetInputEntityData( ["uuid": "0-0-0-0-2", "id": "em 2", - "parentem" : "1-2-3-4-5", // does not exist + "controllingem" : "1-2-3-4-5", // does not exist "controlstrategy" : ""], EmInput ), @@ -261,14 +261,14 @@ class EnergyManagementSourceTest extends Specification { new AssetInputEntityData( ["uuid": "0-0-0-0-1", "id": "em 1", - "parentem" : "1-2-3-4-5", // does not exist + "controllingem" : "1-2-3-4-5", // does not exist "controlstrategy" : ""], EmInput ), new AssetInputEntityData( ["uuid": "0-0-0-0-2", "id": "em 2", - "parentem" : "1-2-3-4-5", // does not exist + "controllingem" : "1-2-3-4-5", // does not exist "controlstrategy" : ""], EmInput ), diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/SystemParticipantSourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/SystemParticipantSourceTest.groovy index aeb9f8829..845594901 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/source/SystemParticipantSourceTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/source/SystemParticipantSourceTest.groovy @@ -21,7 +21,7 @@ class SystemParticipantSourceTest extends Specification { def "An SystemParticipantSource participantEnricher should work as expected"() { given: - def entityData = new ConnectorInputEntityData(["operators": "", "node": sptd.participantNode.uuid.toString(), "em": sptd.emInput.uuid.toString()], LineInput, GridTestData.nodeA, GridTestData.nodeB) + def entityData = new ConnectorInputEntityData(["operators": "", "node": sptd.participantNode.uuid.toString(), "controllingEm": sptd.emInput.uuid.toString()], LineInput, GridTestData.nodeA, GridTestData.nodeB) def operators = map([OperatorInput.NO_OPERATOR_ASSIGNED]) def nodes = map([sptd.participantNode]) def emUnits = map([sptd.emInput]) @@ -33,7 +33,7 @@ class SystemParticipantSourceTest extends Specification { actual.success actual.data.get().operatorInput == OperatorInput.NO_OPERATOR_ASSIGNED actual.data.get().node == sptd.participantNode - actual.data.get().em == Optional.of(sptd.emInput) + actual.data.get().controllingEm == Optional.of(sptd.emInput) } def "An SystemParticipantSource can enrich SystemParticipantEntityData with SystemParticipantTypeInput correctly"() { diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvDataSourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvDataSourceTest.groovy index 9e4a8a614..83c5108c3 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvDataSourceTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvDataSourceTest.groovy @@ -123,7 +123,7 @@ class CsvDataSourceTest extends Specification implements CsvTestDataMeta { "q_characteristics", "e_cons_annual", "operator", - "em" + "controlling_em" ] as Set } diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/bm_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/bm_input.csv index 9e690815a..86d29a1f5 100644 --- a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/bm_input.csv +++ b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/bm_input.csv @@ -1,2 +1,2 @@ -uuid,cost_controlled,feed_in_tariff,id,market_reaction,node,operates_from,operates_until,operator,q_characteristics,type,em +uuid,cost_controlled,feed_in_tariff,id,market_reaction,node,operates_from,operates_until,operator,q_characteristics,type,controlling_em d06e5bb7-a3c7-4749-bdd1-4581ff2f6f4d,false,10.0,test_bmInput,false,4ca90220-74c2-4369-9afa-a18bf068840d,2020-03-24T15:11:31Z,2020-03-25T15:11:31Z,8f9682df-0744-4b58-a122-f0dc730f6510,"qV:{(0.90,-0.30),(0.95,0.00),(1.05,0.00),(1.10,0.30)}",5ebd8f7e-dedb-4017-bb86-6373c4b68eb8,977157f4-25e5-4c72-bf34-440edc778792 diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/chp_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/chp_input.csv index 9f8be0765..e41e2d5c1 100644 --- a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/chp_input.csv +++ b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/chp_input.csv @@ -1,2 +1,2 @@ -uuid,id,market_reaction,node,operates_from,operates_until,operator,q_characteristics,thermal_bus,thermal_storage,type,em +uuid,id,market_reaction,node,operates_from,operates_until,operator,q_characteristics,thermal_bus,thermal_storage,type,controlling_em 9981b4d7-5a8e-4909-9602-e2e7ef4fca5c,test_chpInput,false,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)}",0d95d7f2-49fb-4d49-8636-383a5220384e,8851813b-3a7d-4fee-874b-4df9d724e4b3,5ebd8f7e-dedb-4017-bb86-6373c4b68eb8,977157f4-25e5-4c72-bf34-440edc778792 diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/cylindrical_storage_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/cylindrical_storage_input.csv index 141286dbb..c3531deb5 100644 --- a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/cylindrical_storage_input.csv +++ b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/cylindrical_storage_input.csv @@ -1,2 +1,2 @@ -uuid,c,id,inlet_temp,operates_from,operates_until,operator,return_temp,storage_volume_lvl,p_thermal_max,thermal_bus,em +uuid,c,id,inlet_temp,operates_from,operates_until,operator,return_temp,storage_volume_lvl,p_thermal_max,thermal_bus,controlling_em 8851813b-3a7d-4fee-874b-4df9d724e4b3,1.0,test_cylindricalThermalStorage,110.0,,,f15105c4-a2de-4ab8-a621-4bc98e372d92,80.0,1.039154027,20.0,0d95d7f2-49fb-4d49-8636-383a5220384e,977157f4-25e5-4c72-bf34-440edc778792 diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/em_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/em_input.csv index 14d20cb3e..f8e8263a2 100644 --- a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/em_input.csv +++ b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/em_input.csv @@ -1,3 +1,3 @@ -uuid,control_strategy,id,operates_from,operates_until,operator,parent_em +uuid,control_strategy,id,operates_from,operates_until,operator,controlling_em 977157f4-25e5-4c72-bf34-440edc778792,self_optimization,test_emInput,2020-03-24T15:11:31Z,2020-03-25T15:11:31Z,8f9682df-0744-4b58-a122-f0dc730f6510,897bfc17-8e54-43d0-8d98-740786fd94dd 897bfc17-8e54-43d0-8d98-740786fd94dd,self_optimization,test_parentEmInput,2020-03-24T15:11:31Z,2020-03-25T15:11:31Z,8f9682df-0744-4b58-a122-f0dc730f6510, \ No newline at end of file diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/ev_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/ev_input.csv index dfb07f22d..634773452 100644 --- a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/ev_input.csv +++ b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/ev_input.csv @@ -1,2 +1,2 @@ -uuid,id,node,operates_from,operates_until,operator,q_characteristics,type,em +uuid,id,node,operates_from,operates_until,operator,q_characteristics,type,controlling_em a17be20f-c7a7-471d-8ffe-015487c9d022,test_evInput,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)}",5ebd8f7e-dedb-4017-bb86-6373c4b68eb8,977157f4-25e5-4c72-bf34-440edc778792 diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/evcs_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/evcs_input.csv index d5579f7cd..0fd01d91f 100644 --- a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/evcs_input.csv +++ b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/evcs_input.csv @@ -1,2 +1,2 @@ -uuid,id,operator,operates_from,operates_until,node,q_characteristics,cos_phi_rated,type,charging_points,location_type,v2g_support,em +uuid,id,operator,operates_from,operates_until,node,q_characteristics,cos_phi_rated,type,charging_points,location_type,v2g_support,controlling_em 798028b5-caff-4da7-bcd9-1750fdd8742c,test_csInput,8f9682df-0744-4b58-a122-f0dc730f6510,2020-03-24T15:11:31Z,2020-03-25T15:11:31Z,4ca90220-74c2-4369-9afa-a18bf068840d,"cosPhiFixed:{(0.00,0.95)}",0.95,hhs,4,HOME,false,977157f4-25e5-4c72-bf34-440edc778792 \ No newline at end of file diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/fixed_feed_in_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/fixed_feed_in_input.csv index 5d25bd18f..a9be543de 100644 --- a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/fixed_feed_in_input.csv +++ b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/fixed_feed_in_input.csv @@ -1,2 +1,2 @@ -uuid,cos_phi_rated,id,node,operates_from,operates_until,operator,q_characteristics,s_rated,em +uuid,cos_phi_rated,id,node,operates_from,operates_until,operator,q_characteristics,s_rated,controlling_em 717af017-cc69-406f-b452-e022d7fb516a,0.95,test_fixedFeedInInput,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,977157f4-25e5-4c72-bf34-440edc778792 diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/hp_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/hp_input.csv index 9ed79f8ea..5ea7947c1 100644 --- a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/hp_input.csv +++ b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/hp_input.csv @@ -1,2 +1,2 @@ -uuid,id,node,operates_from,operates_until,operator,q_characteristics,thermal_bus,type,em +uuid,id,node,operates_from,operates_until,operator,q_characteristics,thermal_bus,type,controlling_em 798028b5-caff-4da7-bcd9-1750fdd8742b,test_hpInput,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)}",0d95d7f2-49fb-4d49-8636-383a5220384e,5ebd8f7e-dedb-4017-bb86-6373c4b68eb8,977157f4-25e5-4c72-bf34-440edc778792 diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/load_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/load_input.csv index 4a2d97e37..1825a5ed6 100644 --- a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/load_input.csv +++ b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/load_input.csv @@ -1,2 +1,2 @@ -uuid,cos_phi_rated,e_cons_annual,id,node,operates_from,operates_until,operator,q_characteristics,s_rated,load_profile,em +uuid,cos_phi_rated,e_cons_annual,id,node,operates_from,operates_until,operator,q_characteristics,s_rated,load_profile,controlling_em eaf77f7e-9001-479f-94ca-7fb657766f5f,0.95,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 diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/pv_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/pv_input.csv index 37e6b8666..3bdf961e3 100644 --- a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/pv_input.csv +++ b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/pv_input.csv @@ -1,2 +1,2 @@ -uuid,albedo,azimuth,cos_phi_rated,eta_conv,elevation_angle,id,k_g,k_t,market_reaction,node,operates_from,operates_until,operator,q_characteristics,s_rated,em +uuid,albedo,azimuth,cos_phi_rated,eta_conv,elevation_angle,id,k_g,k_t,market_reaction,node,operates_from,operates_until,operator,q_characteristics,s_rated,controlling_em d56f15b7-8293-4b98-b5bd-58f6273ce229,0.20000000298023224,-8.926613807678223,0.95,98.0,41.01871871948242,test_pvInput,0.8999999761581421,1.0,false,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,977157f4-25e5-4c72-bf34-440edc778792 diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/storage_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/storage_input.csv index 158e8bbae..d21595f60 100644 --- a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/storage_input.csv +++ b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/storage_input.csv @@ -1,2 +1,2 @@ -uuid,id,node,operates_from,operates_until,operator,q_characteristics,type,em +uuid,id,node,operates_from,operates_until,operator,q_characteristics,type,controlling_em 06b58276-8350-40fb-86c0-2414aa4a0452,test_storageInput,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)}",5ebd8f7e-dedb-4017-bb86-6373c4b68eb8,977157f4-25e5-4c72-bf34-440edc778792 diff --git a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/wec_input.csv b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/wec_input.csv index 3305e2e25..0e717f7a2 100644 --- a/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/wec_input.csv +++ b/src/test/resources/edu/ie3/datamodel/io/source/csv/_participants/wec_input.csv @@ -1,2 +1,2 @@ -uuid,id,market_reaction,node,operates_from,operates_until,operator,q_characteristics,type,em +uuid,id,market_reaction,node,operates_from,operates_until,operator,q_characteristics,type,controlling_em ee7e2e37-a5ad-4def-a832-26a317567ca1,test_wecInput,false,4ca90220-74c2-4369-9afa-a18bf068840d,2020-03-24T15:11:31Z,2020-03-25T15:11:31Z,8f9682df-0744-4b58-a122-f0dc730f6510,"cosPhiP:{(0.00,1.00),(0.90,1.00),(1.20,-0.30)}",5ebd8f7e-dedb-4017-bb86-6373c4b68eb8,977157f4-25e5-4c72-bf34-440edc778792