diff --git a/README.md b/README.md index 11b134b90..33c09eebf 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,3 @@ Server to modify the network based on spring-boot. Please read [liquibase usage](https://github.com/powsybl/powsybl-parent/#liquibase-usage) for instructions to automatically generate changesets. After you generated a changeset do not forget to add it to git and in src/resource/db/changelog/db.changelog-master.yml - -The old way to automatically generate the sql schema file (directly using hibernate) can still be used for debugging. Use the following command: -``` -mvn package -DskipTests && rm -f src/main/resources/network-modification.sql && java -jar target/gridsuite-network-modification-server-1.0.0-SNAPSHOT-exec.jar --spring.jpa.properties.jakarta.persistence.schema-generation.scripts.action=create -``` - diff --git a/src/main/java/org/gridsuite/modification/server/dto/BatteryCreationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/BatteryCreationInfos.java index 331218d5b..86beab1e2 100644 --- a/src/main/java/org/gridsuite/modification/server/dto/BatteryCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/server/dto/BatteryCreationInfos.java @@ -38,25 +38,25 @@ public class BatteryCreationInfos extends InjectionCreationInfos implements ReactiveLimitsHolderInfos { @Schema(description = "Minimum active power") - private double minActivePower; + private double minP; @Schema(description = "Maximum active power") - private double maxActivePower; + private double maxP; @Schema(description = "Minimum reactive power") - private Double minimumReactivePower; + private Double minQ; @Schema(description = "Maximum reactive power") - private Double maximumReactivePower; + private Double maxQ; @Schema(description = "Reactive capability curve points") private List reactiveCapabilityCurvePoints; @Schema(description = "Active power set point") - private double activePowerSetpoint; + private double targetP; @Schema(description = "Reactive power set point") - private Double reactivePowerSetpoint; + private Double targetQ; @Schema(description = "Participate") private Boolean participate; diff --git a/src/main/java/org/gridsuite/modification/server/dto/BatteryModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/BatteryModificationInfos.java index 9e12f0831..526cb92f2 100644 --- a/src/main/java/org/gridsuite/modification/server/dto/BatteryModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/server/dto/BatteryModificationInfos.java @@ -35,16 +35,16 @@ @ModificationErrorTypeName("MODIFY_BATTERY_ERROR") public class BatteryModificationInfos extends InjectionModificationInfos { @Schema(description = "Minimum active power") - private AttributeModification minActivePower; + private AttributeModification minP; @Schema(description = "Maximum active power") - private AttributeModification maxActivePower; + private AttributeModification maxP; @Schema(description = "Active power set point") - private AttributeModification activePowerSetpoint; + private AttributeModification targetP; @Schema(description = "Reactive power set point") - private AttributeModification reactivePowerSetpoint; + private AttributeModification targetQ; @Schema(description = "Participate") private AttributeModification participate; @@ -53,10 +53,10 @@ public class BatteryModificationInfos extends InjectionModificationInfos { private AttributeModification droop; @Schema(description = "Minimum reactive power") - private AttributeModification minimumReactivePower; + private AttributeModification minQ; @Schema(description = "Maximum reactive power") - private AttributeModification maximumReactivePower; + private AttributeModification maxQ; @Schema(description = "Reactive capability curve points") private List reactiveCapabilityCurvePoints; diff --git a/src/main/java/org/gridsuite/modification/server/dto/ConverterStationCreationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/ConverterStationCreationInfos.java index 5276bee90..191402711 100644 --- a/src/main/java/org/gridsuite/modification/server/dto/ConverterStationCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/server/dto/ConverterStationCreationInfos.java @@ -48,10 +48,10 @@ public class ConverterStationCreationInfos extends InjectionCreationInfos implem private Boolean reactiveCapabilityCurve; @Schema(description = "Minimum reactive power") - private Double minimumReactivePower; + private Double minQ; @Schema(description = "Maximum reactive power") - private Double maximumReactivePower; + private Double maxQ; @Schema(description = "Reactive capability curve points") private List reactiveCapabilityCurvePoints; diff --git a/src/main/java/org/gridsuite/modification/server/dto/GeneratorCreationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/GeneratorCreationInfos.java index dc7d3c365..dae4e72bb 100644 --- a/src/main/java/org/gridsuite/modification/server/dto/GeneratorCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/server/dto/GeneratorCreationInfos.java @@ -42,25 +42,25 @@ public class GeneratorCreationInfos extends InjectionCreationInfos implements Re private EnergySource energySource; @Schema(description = "Minimum active power") - private double minActivePower; + private double minP; @Schema(description = "Maximum active power") - private double maxActivePower; + private double maxP; @Schema(description = "Rated nominal power") - private Double ratedNominalPower; + private Double ratedS; @Schema(description = "Active power set point") - private double activePowerSetpoint; + private double targetP; @Schema(description = "Reactive power set point") - private Double reactivePowerSetpoint; + private Double targetQ; @Schema(description = "Voltage regulation on") private boolean voltageRegulationOn; @Schema(description = "Voltage set point") - private Double voltageSetpoint; + private Double targetV; @Schema(description = "Planning active power set point") private Double plannedActivePowerSetPoint; @@ -75,10 +75,10 @@ public class GeneratorCreationInfos extends InjectionCreationInfos implements Re private Double forcedOutageRate; @Schema(description = "Minimum reactive power") - private Double minimumReactivePower; + private Double minQ; @Schema(description = "Maximum reactive power") - private Double maximumReactivePower; + private Double maxQ; @Schema(description = "Reactive capability curve points") private List reactiveCapabilityCurvePoints; @@ -90,10 +90,10 @@ public class GeneratorCreationInfos extends InjectionCreationInfos implements Re private Float droop; @Schema(description = "Transient reactance") - private Double transientReactance; + private Double directTransX; @Schema(description = "Step up transformer reactance") - private Double stepUpTransformerReactance; + private Double stepUpTransformerX; @Schema(description = "Regulating terminal equipment id") private String regulatingTerminalId; diff --git a/src/main/java/org/gridsuite/modification/server/dto/GeneratorModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/GeneratorModificationInfos.java index fda157cf2..4cbe39bf4 100644 --- a/src/main/java/org/gridsuite/modification/server/dto/GeneratorModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/server/dto/GeneratorModificationInfos.java @@ -40,25 +40,25 @@ public class GeneratorModificationInfos extends InjectionModificationInfos { private AttributeModification energySource; @Schema(description = "Minimum active power") - private AttributeModification minActivePower; + private AttributeModification minP; @Schema(description = "Maximum active power") - private AttributeModification maxActivePower; + private AttributeModification maxP; @Schema(description = "Rated nominal power") - private AttributeModification ratedNominalPower; + private AttributeModification ratedS; @Schema(description = "Active power set point") - private AttributeModification activePowerSetpoint; + private AttributeModification targetP; @Schema(description = "Reactive power set point") - private AttributeModification reactivePowerSetpoint; + private AttributeModification targetQ; @Schema(description = "Voltage regulation on") private AttributeModification voltageRegulationOn; @Schema(description = "Voltage set point") - private AttributeModification voltageSetpoint; + private AttributeModification targetV; @Schema(description = "Planning active power set point") private AttributeModification plannedActivePowerSetPoint; @@ -73,10 +73,10 @@ public class GeneratorModificationInfos extends InjectionModificationInfos { private AttributeModification forcedOutageRate; @Schema(description = "Minimum reactive power") - private AttributeModification minimumReactivePower; + private AttributeModification minQ; @Schema(description = "Maximum reactive power") - private AttributeModification maximumReactivePower; + private AttributeModification maxQ; @Schema(description = "Reactive capability curve points") private List reactiveCapabilityCurvePoints; @@ -88,10 +88,10 @@ public class GeneratorModificationInfos extends InjectionModificationInfos { private AttributeModification droop; @Schema(description = "Transient reactance") - private AttributeModification transientReactance; + private AttributeModification directTransX; @Schema(description = "Step up transformer reactance") - private AttributeModification stepUpTransformerReactance; + private AttributeModification stepUpTransformerX; @Schema(description = "Voltage Regulation type") private AttributeModification voltageRegulationType; diff --git a/src/main/java/org/gridsuite/modification/server/dto/ReactiveCapabilityCurveCreationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/ReactiveCapabilityCurveCreationInfos.java index e51e788e4..2200f4c11 100644 --- a/src/main/java/org/gridsuite/modification/server/dto/ReactiveCapabilityCurveCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/server/dto/ReactiveCapabilityCurveCreationInfos.java @@ -26,10 +26,10 @@ @Schema(description = "Generator reactive capability curve point creation") public class ReactiveCapabilityCurveCreationInfos { @Schema(description = "Minimum reactive power ") - private Double qminP; + private Double minQ; @Schema(description = "Maximum reactive power") - private Double qmaxP; + private Double maxQ; @Schema(description = "Active Power") private Double p; diff --git a/src/main/java/org/gridsuite/modification/server/dto/ReactiveCapabilityCurveModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/ReactiveCapabilityCurveModificationInfos.java index 054d3aafc..1e534f9d0 100644 --- a/src/main/java/org/gridsuite/modification/server/dto/ReactiveCapabilityCurveModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/server/dto/ReactiveCapabilityCurveModificationInfos.java @@ -26,16 +26,16 @@ @Schema(description = "Generator reactive capability curve point creation") public class ReactiveCapabilityCurveModificationInfos { @Schema(description = "Minimum reactive power ") - private Double qminP; + private Double minQ; - @Schema(description = "Minimum reactive power ") - private Double oldQminP; + @Schema(description = "Old minimum reactive power ") + private Double oldMinQ; @Schema(description = "Maximum reactive power") - private Double qmaxP; + private Double maxQ; - @Schema(description = "Maximum reactive power") - private Double oldQmaxP; + @Schema(description = "Old maximum reactive power") + private Double oldMaxQ; @Schema(description = "Active Power") private Double p; diff --git a/src/main/java/org/gridsuite/modification/server/dto/ReactiveLimitsHolderInfos.java b/src/main/java/org/gridsuite/modification/server/dto/ReactiveLimitsHolderInfos.java index ad19bace1..38dc94f31 100644 --- a/src/main/java/org/gridsuite/modification/server/dto/ReactiveLimitsHolderInfos.java +++ b/src/main/java/org/gridsuite/modification/server/dto/ReactiveLimitsHolderInfos.java @@ -16,9 +16,9 @@ public interface ReactiveLimitsHolderInfos { Boolean getReactiveCapabilityCurve(); - Double getMinimumReactivePower(); + Double getMinQ(); - Double getMaximumReactivePower(); + Double getMaxQ(); List getReactiveCapabilityCurvePoints(); } diff --git a/src/main/java/org/gridsuite/modification/server/dto/VoltageInitGeneratorModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/VoltageInitGeneratorModificationInfos.java index abf53492d..1c8a189d8 100644 --- a/src/main/java/org/gridsuite/modification/server/dto/VoltageInitGeneratorModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/server/dto/VoltageInitGeneratorModificationInfos.java @@ -27,8 +27,8 @@ public class VoltageInitGeneratorModificationInfos { private String generatorId; @Schema(description = "Voltage set point") - private Double voltageSetpoint; + private Double targetV; @Schema(description = "Reactive power set point") - private Double reactivePowerSetpoint; + private Double targetQ; } diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java index edc177e41..b702d5604 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java @@ -30,30 +30,30 @@ @PrimaryKeyJoinColumn(foreignKey = @ForeignKey(name = "batteryCreation_id_fk_constraint")) public class BatteryCreationEntity extends InjectionCreationEntity { - @Column(name = "minActivePower") - private double minActivePower; + @Column(name = "minP") + private double minP; - @Column(name = "maxActivePower") - private double maxActivePower; + @Column(name = "maxP") + private double maxP; @Column(name = "reactiveCapabilityCurve") private Boolean reactiveCapabilityCurve; - @Column(name = "minimumReactivePower") - private Double minimumReactivePower; + @Column(name = "minQ") + private Double minQ; - @Column(name = "maximumReactivePower") - private Double maximumReactivePower; + @Column(name = "maxQ") + private Double maxQ; @ElementCollection @CollectionTable private List reactiveCapabilityCurvePoints; - @Column(name = "activePowerSetpoint") - private double activePowerSetpoint; + @Column(name = "targetP") + private double targetP; - @Column(name = "reactivePowerSetpoint") - private Double reactivePowerSetpoint; + @Column(name = "targetQ") + private Double targetQ; @Column(name = "participate") private Boolean participate; @@ -73,14 +73,14 @@ public void update(@NonNull ModificationInfos modificationInfos) { } private void assignAttributes(BatteryCreationInfos batteryCreationInfos) { - this.minActivePower = batteryCreationInfos.getMinActivePower(); - this.maxActivePower = batteryCreationInfos.getMaxActivePower(); + this.minP = batteryCreationInfos.getMinP(); + this.maxP = batteryCreationInfos.getMaxP(); this.reactiveCapabilityCurve = batteryCreationInfos.getReactiveCapabilityCurve(); - this.minimumReactivePower = batteryCreationInfos.getMinimumReactivePower(); - this.maximumReactivePower = batteryCreationInfos.getMaximumReactivePower(); + this.minQ = batteryCreationInfos.getMinQ(); + this.maxQ = batteryCreationInfos.getMaxQ(); this.reactiveCapabilityCurvePoints = toEmbeddablePoints(batteryCreationInfos.getReactiveCapabilityCurvePoints()); - this.activePowerSetpoint = batteryCreationInfos.getActivePowerSetpoint(); - this.reactivePowerSetpoint = batteryCreationInfos.getReactivePowerSetpoint(); + this.targetP = batteryCreationInfos.getTargetP(); + this.targetQ = batteryCreationInfos.getTargetQ(); this.participate = batteryCreationInfos.getParticipate(); this.droop = batteryCreationInfos.getDroop(); } @@ -88,8 +88,8 @@ private void assignAttributes(BatteryCreationInfos batteryCreationInfos) { public static List toEmbeddablePoints( List points) { return points == null ? null : points.stream() - .map(point -> new ReactiveCapabilityCurveCreationEmbeddable(point.getQminP(), - point.getQmaxP(), + .map(point -> new ReactiveCapabilityCurveCreationEmbeddable(point.getMinQ(), + point.getMaxQ(), point.getP())) .collect(Collectors.toList()); } @@ -102,8 +102,8 @@ public BatteryCreationInfos toModificationInfos() { private BatteryCreationInfos.BatteryCreationInfosBuilder toBatteryCreationInfosBuilder() { List points = getReactiveCapabilityCurvePoints() != null ? getReactiveCapabilityCurvePoints() .stream() - .map(value -> new ReactiveCapabilityCurveCreationInfos(value.getQminP(), - value.getQmaxP(), + .map(value -> new ReactiveCapabilityCurveCreationInfos(value.getMinQ(), + value.getMaxQ(), value.getP())) .collect(Collectors.toList()) : null; @@ -122,14 +122,14 @@ public BatteryCreationInfos toModificationInfos() { .connectionPosition(getConnectionPosition()) .connected(isConnected()) // battery - .minActivePower(getMinActivePower()) - .maxActivePower(getMaxActivePower()) + .minP(getMinP()) + .maxP(getMaxP()) .reactiveCapabilityCurve(this.getReactiveCapabilityCurve()) - .minimumReactivePower(this.getMinimumReactivePower()) - .maximumReactivePower(this.getMaximumReactivePower()) + .minQ(this.getMinQ()) + .maxQ(this.getMaxQ()) .reactiveCapabilityCurvePoints(points) - .activePowerSetpoint(getActivePowerSetpoint()) - .reactivePowerSetpoint(getReactivePowerSetpoint()) + .targetP(getTargetP()) + .targetQ(getTargetQ()) .participate(getParticipate()) .droop(getDroop()) // properties diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ConverterStationCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ConverterStationCreationEntity.java index 8b7b58a50..7adaa83db 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ConverterStationCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ConverterStationCreationEntity.java @@ -72,8 +72,8 @@ public ConverterStationCreationEntity(ConverterStationCreationInfos converterSta private void assignAttributes(ConverterStationCreationInfos converterStationCreationInfos) { this.lossFactor = converterStationCreationInfos.getLossFactor(); - this.minimumReactivePower = converterStationCreationInfos.getMinimumReactivePower(); - this.maximumReactivePower = converterStationCreationInfos.getMaximumReactivePower(); + this.minimumReactivePower = converterStationCreationInfos.getMinQ(); + this.maximumReactivePower = converterStationCreationInfos.getMaxQ(); this.reactivePower = converterStationCreationInfos.getReactivePower(); this.voltageRegulationOn = converterStationCreationInfos.getVoltageRegulationOn(); this.voltage = converterStationCreationInfos.getVoltage(); @@ -95,8 +95,8 @@ public ConverterStationCreationInfos toConverterStationInfos() { .connected(isConnected()) // ConverterStation .lossFactor(getLossFactor()) - .minimumReactivePower(getMinimumReactivePower()) - .maximumReactivePower(getMaximumReactivePower()) + .minQ(getMinimumReactivePower()) + .maxQ(getMaximumReactivePower()) .reactivePower(getReactivePower()) .voltageRegulationOn(getVoltageRegulationOn()) .voltage(getVoltage()) @@ -108,8 +108,8 @@ public ConverterStationCreationInfos toConverterStationInfos() { private static List toEmbeddablePoints( List points) { return points == null ? null : points.stream() - .map(point -> new ReactiveCapabilityCurveCreationEmbeddable(point.getQminP(), - point.getQmaxP(), + .map(point -> new ReactiveCapabilityCurveCreationEmbeddable(point.getMinQ(), + point.getMaxQ(), point.getP())) .collect(Collectors.toList()); } @@ -122,8 +122,8 @@ private static List toReactiveCapabilityCu return pointsEmbeddable.stream() .map(pointEmbeddable -> ReactiveCapabilityCurveCreationInfos.builder() .p(pointEmbeddable.getP()) - .qmaxP(pointEmbeddable.getQmaxP()) - .qminP(pointEmbeddable.getQminP()) + .maxQ(pointEmbeddable.getMaxQ()) + .minQ(pointEmbeddable.getMinQ()) .build()) .collect(Collectors.toList()); } diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/GeneratorCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/GeneratorCreationEntity.java index 9c4616b7f..4c61b4fae 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/GeneratorCreationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/GeneratorCreationEntity.java @@ -32,26 +32,26 @@ public class GeneratorCreationEntity extends InjectionCreationEntity { @Column(name = "energySource") private EnergySource energySource; - @Column(name = "minActivePower") - private double minActivePower; + @Column(name = "minP") + private double minP; - @Column(name = "maxActivePower") - private double maxActivePower; + @Column(name = "maxP") + private double maxP; - @Column(name = "ratedNominalPower") - private Double ratedNominalPower; + @Column(name = "ratedS") + private Double ratedS; - @Column(name = "activePowerSetpoint") - private double activePowerSetpoint; + @Column(name = "targetP") + private double targetP; - @Column(name = "reactivePowerSetpoint") - private Double reactivePowerSetpoint; + @Column(name = "targetQ") + private Double targetQ; @Column(name = "voltageRegulationOn") private boolean voltageRegulationOn; - @Column(name = "voltageSetpoint") - private Double voltageSetpoint; + @Column(name = "targetV") + private Double targetV; @Column(name = "plannedActivePowerSetPoint") private Double plannedActivePowerSetPoint; @@ -65,11 +65,11 @@ public class GeneratorCreationEntity extends InjectionCreationEntity { @Column(name = "forcedOutageRate") private Double forcedOutageRate; - @Column(name = "minimumReactivePower") - private Double minimumReactivePower; + @Column(name = "minQ") + private Double minQ; - @Column(name = "maximumReactivePower") - private Double maximumReactivePower; + @Column(name = "maxQ") + private Double maxQ; @Column(name = "participate") private Boolean participate; @@ -77,11 +77,11 @@ public class GeneratorCreationEntity extends InjectionCreationEntity { @Column(name = "droop") private Float droop; - @Column(name = "transientReactance") - private Double transientReactance; + @Column(name = "directTransX") + private Double directTransX; - @Column(name = "stepUpTransformerReactance") - private Double stepUpTransformerReactance; + @Column(name = "stepUpTransformerX") + private Double stepUpTransformerX; @Column(name = "regulatingTerminalId") private String regulatingTerminalId; @@ -115,23 +115,23 @@ public void update(@NonNull ModificationInfos modificationInfos) { private void assignAttributes(GeneratorCreationInfos generatorCreationInfos) { this.energySource = generatorCreationInfos.getEnergySource(); - this.minActivePower = generatorCreationInfos.getMinActivePower(); - this.maxActivePower = generatorCreationInfos.getMaxActivePower(); - this.ratedNominalPower = generatorCreationInfos.getRatedNominalPower(); - this.activePowerSetpoint = generatorCreationInfos.getActivePowerSetpoint(); - this.reactivePowerSetpoint = generatorCreationInfos.getReactivePowerSetpoint(); + this.minP = generatorCreationInfos.getMinP(); + this.maxP = generatorCreationInfos.getMaxP(); + this.ratedS = generatorCreationInfos.getRatedS(); + this.targetP = generatorCreationInfos.getTargetP(); + this.targetQ = generatorCreationInfos.getTargetQ(); this.voltageRegulationOn = generatorCreationInfos.isVoltageRegulationOn(); - this.voltageSetpoint = generatorCreationInfos.getVoltageSetpoint(); + this.targetV = generatorCreationInfos.getTargetV(); this.plannedActivePowerSetPoint = generatorCreationInfos.getPlannedActivePowerSetPoint(); this.marginalCost = generatorCreationInfos.getMarginalCost(); this.plannedOutageRate = generatorCreationInfos.getPlannedOutageRate(); this.forcedOutageRate = generatorCreationInfos.getForcedOutageRate(); - this.minimumReactivePower = generatorCreationInfos.getMinimumReactivePower(); - this.maximumReactivePower = generatorCreationInfos.getMaximumReactivePower(); + this.minQ = generatorCreationInfos.getMinQ(); + this.maxQ = generatorCreationInfos.getMaxQ(); this.participate = generatorCreationInfos.getParticipate(); this.droop = generatorCreationInfos.getDroop(); - this.transientReactance = generatorCreationInfos.getTransientReactance(); - this.stepUpTransformerReactance = generatorCreationInfos.getStepUpTransformerReactance(); + this.directTransX = generatorCreationInfos.getDirectTransX(); + this.stepUpTransformerX = generatorCreationInfos.getStepUpTransformerX(); this.reactiveCapabilityCurvePoints = toEmbeddablePoints(generatorCreationInfos.getReactiveCapabilityCurvePoints()); this.regulatingTerminalId = generatorCreationInfos.getRegulatingTerminalId(); this.regulatingTerminalType = generatorCreationInfos.getRegulatingTerminalType(); @@ -143,8 +143,8 @@ private void assignAttributes(GeneratorCreationInfos generatorCreationInfos) { public static List toEmbeddablePoints( List points) { return points == null ? null : points.stream() - .map(point -> new ReactiveCapabilityCurveCreationEmbeddable(point.getQminP(), - point.getQmaxP(), + .map(point -> new ReactiveCapabilityCurveCreationEmbeddable(point.getMinQ(), + point.getMaxQ(), point.getP())) .collect(Collectors.toList()); } @@ -157,8 +157,8 @@ public GeneratorCreationInfos toModificationInfos() { private GeneratorCreationInfos.GeneratorCreationInfosBuilder toGeneratorCreationInfosBuilder() { List points = getReactiveCapabilityCurvePoints() != null ? getReactiveCapabilityCurvePoints() .stream() - .map(value -> new ReactiveCapabilityCurveCreationInfos(value.getQminP(), - value.getQmaxP(), + .map(value -> new ReactiveCapabilityCurveCreationInfos(value.getMinQ(), + value.getMaxQ(), value.getP())) .collect(Collectors.toList()) : null; @@ -178,29 +178,29 @@ public GeneratorCreationInfos toModificationInfos() { .connected(isConnected()) // generator .energySource(getEnergySource()) - .minActivePower(getMinActivePower()) - .maxActivePower(getMaxActivePower()) - .ratedNominalPower(getRatedNominalPower()) - .activePowerSetpoint(getActivePowerSetpoint()) - .reactivePowerSetpoint(getReactivePowerSetpoint()) + .minP(getMinP()) + .maxP(getMaxP()) + .ratedS(getRatedS()) + .targetP(getTargetP()) + .targetQ(getTargetQ()) .voltageRegulationOn(isVoltageRegulationOn()) - .voltageSetpoint(getVoltageSetpoint()) + .targetV(getTargetV()) .plannedActivePowerSetPoint(getPlannedActivePowerSetPoint()) .marginalCost(getMarginalCost()) .plannedOutageRate(getPlannedOutageRate()) .forcedOutageRate(getForcedOutageRate()) - .minimumReactivePower(this.getMinimumReactivePower()) + .minQ(this.getMinQ()) .participate(getParticipate()) .droop(getDroop()) - .maximumReactivePower(this.getMaximumReactivePower()) + .maxQ(this.getMaxQ()) .reactiveCapabilityCurvePoints(points) .regulatingTerminalId(getRegulatingTerminalId()) .regulatingTerminalType(getRegulatingTerminalType()) .regulatingTerminalVlId(getRegulatingTerminalVlId()) .qPercent(getQPercent()) .reactiveCapabilityCurve(getReactiveCapabilityCurve()) - .transientReactance(getTransientReactance()) - .stepUpTransformerReactance(getStepUpTransformerReactance()) + .directTransX(getDirectTransX()) + .stepUpTransformerX(getStepUpTransformerX()) // properties .properties(CollectionUtils.isEmpty(getProperties()) ? null : getProperties().stream() diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ReactiveCapabilityCurveCreationEmbeddable.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ReactiveCapabilityCurveCreationEmbeddable.java index 2d1a20d3d..264ed689f 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ReactiveCapabilityCurveCreationEmbeddable.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/ReactiveCapabilityCurveCreationEmbeddable.java @@ -24,10 +24,10 @@ @Embeddable public class ReactiveCapabilityCurveCreationEmbeddable { @Column - private Double qminP; + private Double minQ; @Column - private Double qmaxP; + private Double maxQ; @Column private Double p; diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BatteryModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BatteryModificationEntity.java index e227c7b02..2d09a7e85 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BatteryModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BatteryModificationEntity.java @@ -32,24 +32,24 @@ @PrimaryKeyJoinColumn(foreignKey = @ForeignKey(name = "batteryModification_id_fk_constraint")) public class BatteryModificationEntity extends InjectionModificationEntity { @Embedded - @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "minActivePower")), @AttributeOverride(name = "opType", column = @Column(name = "minActivePowerOp")) + @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "minP")), @AttributeOverride(name = "opType", column = @Column(name = "minpOp")) }) - private DoubleModificationEmbedded minActivePower; + private DoubleModificationEmbedded minP; @Embedded - @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "maxActivePower")), @AttributeOverride(name = "opType", column = @Column(name = "maxActivePowerOp")) + @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "maxP")), @AttributeOverride(name = "opType", column = @Column(name = "maxpOp")) }) - private DoubleModificationEmbedded maxActivePower; + private DoubleModificationEmbedded maxP; @Embedded - @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "activePowerSetpoint")), @AttributeOverride(name = "opType", column = @Column(name = "activePowerSetpointOp")) + @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "targetP")), @AttributeOverride(name = "opType", column = @Column(name = "targetpOp")) }) - private DoubleModificationEmbedded activePowerSetpoint; + private DoubleModificationEmbedded targetP; @Embedded - @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "reactivePowerSetpoint")), @AttributeOverride(name = "opType", column = @Column(name = "reactivePowerSetpointOp")) + @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "targetQ")), @AttributeOverride(name = "opType", column = @Column(name = "targetqOp")) }) - private DoubleModificationEmbedded reactivePowerSetpoint; + private DoubleModificationEmbedded targetQ; @Embedded @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "participate")), @AttributeOverride(name = "opType", column = @Column(name = "participateOp")) @@ -62,14 +62,14 @@ public class BatteryModificationEntity extends InjectionModificationEntity { private FloatModificationEmbedded droop; @Embedded - @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "minimumReactivePower")), @AttributeOverride(name = "opType", column = @Column(name = "minimumReactivePowerOp")) + @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "minQ")), @AttributeOverride(name = "opType", column = @Column(name = "minqOp")) }) - private DoubleModificationEmbedded minimumReactivePower; + private DoubleModificationEmbedded minQ; @Embedded - @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "maximumReactivePower")), @AttributeOverride(name = "opType", column = @Column(name = "maximumReactivePowerOp")) + @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "maxQ")), @AttributeOverride(name = "opType", column = @Column(name = "maxqOp")) }) - private DoubleModificationEmbedded maximumReactivePower; + private DoubleModificationEmbedded maxQ; @Embedded @AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "reactiveCapabilityCurve")), @AttributeOverride(name = "opType", column = @Column(name = "reactiveCapabilityCurveOp")) @@ -92,12 +92,12 @@ public void update(@NonNull ModificationInfos modificationInfos) { } private void assignAttributes(BatteryModificationInfos batteryModificationInfos) { - this.minActivePower = batteryModificationInfos.getMinActivePower() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getMinActivePower()) : null; - this.maxActivePower = batteryModificationInfos.getMaxActivePower() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getMaxActivePower()) : null; - this.activePowerSetpoint = batteryModificationInfos.getActivePowerSetpoint() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getActivePowerSetpoint()) : null; - this.reactivePowerSetpoint = batteryModificationInfos.getReactivePowerSetpoint() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getReactivePowerSetpoint()) : null; - this.minimumReactivePower = batteryModificationInfos.getMinimumReactivePower() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getMinimumReactivePower()) : null; - this.maximumReactivePower = batteryModificationInfos.getMaximumReactivePower() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getMaximumReactivePower()) : null; + this.minP = batteryModificationInfos.getMinP() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getMinP()) : null; + this.maxP = batteryModificationInfos.getMaxP() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getMaxP()) : null; + this.targetP = batteryModificationInfos.getTargetP() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getTargetP()) : null; + this.targetQ = batteryModificationInfos.getTargetQ() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getTargetQ()) : null; + this.minQ = batteryModificationInfos.getMinQ() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getMinQ()) : null; + this.maxQ = batteryModificationInfos.getMaxQ() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getMaxQ()) : null; this.participate = batteryModificationInfos.getParticipate() != null ? new BooleanModificationEmbedded(batteryModificationInfos.getParticipate()) : null; this.droop = batteryModificationInfos.getDroop() != null ? new FloatModificationEmbedded(batteryModificationInfos.getDroop()) : null; this.reactiveCapabilityCurve = batteryModificationInfos.getReactiveCapabilityCurve() != null ? new BooleanModificationEmbedded(batteryModificationInfos.getReactiveCapabilityCurve()) : null; @@ -108,8 +108,8 @@ public static List toEmbeddablePo List points) { return points == null ? null : points.stream() - .map(point -> new ReactiveCapabilityCurveModificationEmbeddable(point.getQminP(), point.getOldQminP(), - point.getQmaxP(), point.getOldQmaxP(), point.getP(), + .map(point -> new ReactiveCapabilityCurveModificationEmbeddable(point.getMinQ(), point.getOldMinQ(), + point.getMaxQ(), point.getOldMaxQ(), point.getP(), point.getOldP())) .toList(); } @@ -123,8 +123,8 @@ public BatteryModificationInfos toModificationInfos() { List pointsEmbeddable = !CollectionUtils.isEmpty(reactiveCapabilityCurvePoints) ? reactiveCapabilityCurvePoints : null; List points = pointsEmbeddable != null ? getReactiveCapabilityCurvePoints() .stream() - .map(value -> new ReactiveCapabilityCurveModificationInfos(value.getQminP(), value.getOldQminP(), - value.getQmaxP(), value.getOldQmaxP(), + .map(value -> new ReactiveCapabilityCurveModificationInfos(value.getMinQ(), value.getOldMinQ(), + value.getMaxQ(), value.getOldMaxQ(), value.getP(), value.getOldP())) .collect(Collectors.toList()) : null; @@ -138,12 +138,12 @@ public BatteryModificationInfos toModificationInfos() { .voltageLevelId(AttributeModification.toAttributeModification(getVoltageLevelIdValue(), getVoltageLevelIdOp())) .busOrBusbarSectionId(AttributeModification.toAttributeModification(getBusOrBusbarSectionIdValue(), getBusOrBusbarSectionIdOp())) .connected(toAttributeModification(getConnected())) - .activePowerSetpoint(toAttributeModification(getActivePowerSetpoint())) - .maxActivePower(toAttributeModification(getMaxActivePower())) - .minActivePower(toAttributeModification(getMinActivePower())) - .reactivePowerSetpoint(toAttributeModification(getReactivePowerSetpoint())) - .minimumReactivePower(toAttributeModification(getMinimumReactivePower())) - .maximumReactivePower(toAttributeModification(getMaximumReactivePower())) + .targetP(toAttributeModification(getTargetP())) + .maxP(toAttributeModification(getMaxP())) + .minP(toAttributeModification(getMinP())) + .targetQ(toAttributeModification(getTargetQ())) + .minQ(toAttributeModification(getMinQ())) + .maxQ(toAttributeModification(getMaxQ())) .participate(toAttributeModification(getParticipate())) .droop(toAttributeModification(getDroop())) .reactiveCapabilityCurve(toAttributeModification(getReactiveCapabilityCurve())) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorModificationEntity.java index 4078d47f4..a06bfce73 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/GeneratorModificationEntity.java @@ -39,38 +39,38 @@ public class GeneratorModificationEntity extends InjectionModificationEntity { @Embedded @AttributeOverrides(value = { - @AttributeOverride(name = "value", column = @Column(name = "minActivePower")), - @AttributeOverride(name = "opType", column = @Column(name = "minActivePowerOp")) + @AttributeOverride(name = "value", column = @Column(name = "minP")), + @AttributeOverride(name = "opType", column = @Column(name = "minpOp")) }) - private DoubleModificationEmbedded minActivePower; + private DoubleModificationEmbedded minP; @Embedded @AttributeOverrides(value = { - @AttributeOverride(name = "value", column = @Column(name = "maxActivePower")), - @AttributeOverride(name = "opType", column = @Column(name = "maxActivePowerOp")) + @AttributeOverride(name = "value", column = @Column(name = "maxP")), + @AttributeOverride(name = "opType", column = @Column(name = "maxpOp")) }) - private DoubleModificationEmbedded maxActivePower; + private DoubleModificationEmbedded maxP; @Embedded @AttributeOverrides(value = { - @AttributeOverride(name = "value", column = @Column(name = "ratedNominalPower")), - @AttributeOverride(name = "opType", column = @Column(name = "ratedNominalPowerOp")) + @AttributeOverride(name = "value", column = @Column(name = "ratedS")), + @AttributeOverride(name = "opType", column = @Column(name = "ratedsOp")) }) - private DoubleModificationEmbedded ratedNominalPower; + private DoubleModificationEmbedded ratedS; @Embedded @AttributeOverrides(value = { - @AttributeOverride(name = "value", column = @Column(name = "activePowerSetpoint")), - @AttributeOverride(name = "opType", column = @Column(name = "activePowerSetpointOp")) + @AttributeOverride(name = "value", column = @Column(name = "targetP")), + @AttributeOverride(name = "opType", column = @Column(name = "targetpOp")) }) - private DoubleModificationEmbedded activePowerSetpoint; + private DoubleModificationEmbedded targetP; @Embedded @AttributeOverrides(value = { - @AttributeOverride(name = "value", column = @Column(name = "reactivePowerSetpoint")), - @AttributeOverride(name = "opType", column = @Column(name = "reactivePowerSetpointOp")) + @AttributeOverride(name = "value", column = @Column(name = "targetQ")), + @AttributeOverride(name = "opType", column = @Column(name = "targetqOp")) }) - private DoubleModificationEmbedded reactivePowerSetpoint; + private DoubleModificationEmbedded targetQ; @Embedded @AttributeOverrides(value = { @@ -81,10 +81,10 @@ public class GeneratorModificationEntity extends InjectionModificationEntity { @Embedded @AttributeOverrides(value = { - @AttributeOverride(name = "value", column = @Column(name = "voltageSetpoint")), - @AttributeOverride(name = "opType", column = @Column(name = "voltageSetpointOp")) + @AttributeOverride(name = "value", column = @Column(name = "targetV")), + @AttributeOverride(name = "opType", column = @Column(name = "targetvOp")) }) - private DoubleModificationEmbedded voltageSetpoint; + private DoubleModificationEmbedded targetV; @Embedded @AttributeOverrides(value = { @@ -116,17 +116,17 @@ public class GeneratorModificationEntity extends InjectionModificationEntity { @Embedded @AttributeOverrides(value = { - @AttributeOverride(name = "value", column = @Column(name = "minimumReactivePower")), - @AttributeOverride(name = "opType", column = @Column(name = "minimumReactivePowerOp")) + @AttributeOverride(name = "value", column = @Column(name = "minQ")), + @AttributeOverride(name = "opType", column = @Column(name = "minqOp")) }) - private DoubleModificationEmbedded minimumReactivePower; + private DoubleModificationEmbedded minQ; @Embedded @AttributeOverrides(value = { - @AttributeOverride(name = "value", column = @Column(name = "maximumReactivePower")), - @AttributeOverride(name = "opType", column = @Column(name = "maximumReactivePowerOp")) + @AttributeOverride(name = "value", column = @Column(name = "maxQ")), + @AttributeOverride(name = "opType", column = @Column(name = "maxqOp")) }) - private DoubleModificationEmbedded maximumReactivePower; + private DoubleModificationEmbedded maxQ; @Embedded @AttributeOverrides(value = { @@ -144,17 +144,17 @@ public class GeneratorModificationEntity extends InjectionModificationEntity { @Embedded @AttributeOverrides(value = { - @AttributeOverride(name = "value", column = @Column(name = "transientReactance")), - @AttributeOverride(name = "opType", column = @Column(name = "transientReactanceOp")) + @AttributeOverride(name = "value", column = @Column(name = "directTransX")), + @AttributeOverride(name = "opType", column = @Column(name = "directTransxOp")) }) - private DoubleModificationEmbedded transientReactance; + private DoubleModificationEmbedded directTransX; @Embedded @AttributeOverrides(value = { - @AttributeOverride(name = "value", column = @Column(name = "stepUpTransformerReactance")), - @AttributeOverride(name = "opType", column = @Column(name = "stepUpTransformerReactanceOp")) + @AttributeOverride(name = "value", column = @Column(name = "stepUpTransformerX")), + @AttributeOverride(name = "opType", column = @Column(name = "stepUpTransformerxOp")) }) - private DoubleModificationEmbedded stepUpTransformerReactance; + private DoubleModificationEmbedded stepUpTransformerX; @Embedded @AttributeOverrides(value = { @@ -215,23 +215,23 @@ public void update(@NonNull ModificationInfos modificationInfos) { private void assignAttributes(GeneratorModificationInfos generatorModificationInfos) { this.energySource = generatorModificationInfos.getEnergySource() != null ? new EnumModificationEmbedded<>(generatorModificationInfos.getEnergySource()) : null; - this.minActivePower = generatorModificationInfos.getMinActivePower() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getMinActivePower()) : null; - this.maxActivePower = generatorModificationInfos.getMaxActivePower() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getMaxActivePower()) : null; - this.ratedNominalPower = generatorModificationInfos.getRatedNominalPower() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getRatedNominalPower()) : null; - this.activePowerSetpoint = generatorModificationInfos.getActivePowerSetpoint() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getActivePowerSetpoint()) : null; - this.reactivePowerSetpoint = generatorModificationInfos.getReactivePowerSetpoint() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getReactivePowerSetpoint()) : null; + this.minP = generatorModificationInfos.getMinP() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getMinP()) : null; + this.maxP = generatorModificationInfos.getMaxP() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getMaxP()) : null; + this.ratedS = generatorModificationInfos.getRatedS() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getRatedS()) : null; + this.targetP = generatorModificationInfos.getTargetP() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getTargetP()) : null; + this.targetQ = generatorModificationInfos.getTargetQ() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getTargetQ()) : null; this.voltageRegulationOn = generatorModificationInfos.getVoltageRegulationOn() != null ? new BooleanModificationEmbedded(generatorModificationInfos.getVoltageRegulationOn()) : null; - this.voltageSetpoint = generatorModificationInfos.getVoltageSetpoint() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getVoltageSetpoint()) : null; + this.targetV = generatorModificationInfos.getTargetV() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getTargetV()) : null; this.plannedActivePowerSetPoint = generatorModificationInfos.getPlannedActivePowerSetPoint() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getPlannedActivePowerSetPoint()) : null; this.marginalCost = generatorModificationInfos.getMarginalCost() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getMarginalCost()) : null; this.plannedOutageRate = generatorModificationInfos.getPlannedOutageRate() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getPlannedOutageRate()) : null; this.forcedOutageRate = generatorModificationInfos.getForcedOutageRate() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getForcedOutageRate()) : null; - this.minimumReactivePower = generatorModificationInfos.getMinimumReactivePower() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getMinimumReactivePower()) : null; - this.maximumReactivePower = generatorModificationInfos.getMaximumReactivePower() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getMaximumReactivePower()) : null; + this.minQ = generatorModificationInfos.getMinQ() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getMinQ()) : null; + this.maxQ = generatorModificationInfos.getMaxQ() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getMaxQ()) : null; this.participate = generatorModificationInfos.getParticipate() != null ? new BooleanModificationEmbedded(generatorModificationInfos.getParticipate()) : null; this.droop = generatorModificationInfos.getDroop() != null ? new FloatModificationEmbedded(generatorModificationInfos.getDroop()) : null; - this.transientReactance = generatorModificationInfos.getTransientReactance() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getTransientReactance()) : null; - this.stepUpTransformerReactance = generatorModificationInfos.getStepUpTransformerReactance() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getStepUpTransformerReactance()) : null; + this.directTransX = generatorModificationInfos.getDirectTransX() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getDirectTransX()) : null; + this.stepUpTransformerX = generatorModificationInfos.getStepUpTransformerX() != null ? new DoubleModificationEmbedded(generatorModificationInfos.getStepUpTransformerX()) : null; this.voltageRegulationType = generatorModificationInfos.getVoltageRegulationType() != null ? new EnumModificationEmbedded<>(generatorModificationInfos.getVoltageRegulationType()) : null; this.regulatingTerminalId = generatorModificationInfos.getRegulatingTerminalId() != null ? new StringModificationEmbedded(generatorModificationInfos.getRegulatingTerminalId()) : null; this.regulatingTerminalType = generatorModificationInfos.getRegulatingTerminalType() != null ? new StringModificationEmbedded(generatorModificationInfos.getRegulatingTerminalType()) : null; @@ -245,8 +245,8 @@ public static List toEmbeddablePo List points) { return points == null ? null : points.stream() - .map(point -> new ReactiveCapabilityCurveModificationEmbeddable(point.getQminP(), point.getOldQminP(), - point.getQmaxP(), point.getOldQmaxP(), point.getP(), + .map(point -> new ReactiveCapabilityCurveModificationEmbeddable(point.getMinQ(), point.getOldMinQ(), + point.getMaxQ(), point.getOldMaxQ(), point.getP(), point.getOldP())) .collect(Collectors.toList()); } @@ -260,8 +260,8 @@ public GeneratorModificationInfos toModificationInfos() { List pointsEmbeddable = !CollectionUtils.isEmpty(reactiveCapabilityCurvePoints) ? reactiveCapabilityCurvePoints : null; List points = pointsEmbeddable != null ? getReactiveCapabilityCurvePoints() .stream() - .map(value -> new ReactiveCapabilityCurveModificationInfos(value.getQminP(), value.getOldQminP(), - value.getQmaxP(), value.getOldQmaxP(), + .map(value -> new ReactiveCapabilityCurveModificationInfos(value.getMinQ(), value.getOldMinQ(), + value.getMaxQ(), value.getOldMaxQ(), value.getP(), value.getOldP())) .collect(Collectors.toList()) : null; return GeneratorModificationInfos @@ -275,23 +275,23 @@ public GeneratorModificationInfos toModificationInfos() { .busOrBusbarSectionId(AttributeModification.toAttributeModification(getBusOrBusbarSectionIdValue(), getBusOrBusbarSectionIdOp())) .connected(toAttributeModification(getConnected())) .energySource(toAttributeModification(getEnergySource())) - .activePowerSetpoint(toAttributeModification(getActivePowerSetpoint())) - .maxActivePower(toAttributeModification(getMaxActivePower())) - .minActivePower(toAttributeModification(getMinActivePower())) - .ratedNominalPower(toAttributeModification(getRatedNominalPower())) - .reactivePowerSetpoint(toAttributeModification(getReactivePowerSetpoint())) + .targetP(toAttributeModification(getTargetP())) + .maxP(toAttributeModification(getMaxP())) + .minP(toAttributeModification(getMinP())) + .ratedS(toAttributeModification(getRatedS())) + .targetQ(toAttributeModification(getTargetQ())) .voltageRegulationOn(toAttributeModification(getVoltageRegulationOn())) - .voltageSetpoint(toAttributeModification(getVoltageSetpoint())) + .targetV(toAttributeModification(getTargetV())) .plannedActivePowerSetPoint(toAttributeModification(getPlannedActivePowerSetPoint())) .marginalCost(toAttributeModification(getMarginalCost())) .plannedOutageRate(toAttributeModification(getPlannedOutageRate())) .forcedOutageRate(toAttributeModification(getForcedOutageRate())) - .minimumReactivePower(toAttributeModification(getMinimumReactivePower())) - .maximumReactivePower(toAttributeModification(getMaximumReactivePower())) + .minQ(toAttributeModification(getMinQ())) + .maxQ(toAttributeModification(getMaxQ())) .participate(toAttributeModification(getParticipate())) .droop(toAttributeModification(getDroop())) - .transientReactance(toAttributeModification(getTransientReactance())) - .stepUpTransformerReactance(toAttributeModification(getStepUpTransformerReactance())) + .directTransX(toAttributeModification(getDirectTransX())) + .stepUpTransformerX(toAttributeModification(getStepUpTransformerX())) .voltageRegulationType(toAttributeModification(getVoltageRegulationType())) .regulatingTerminalId(toAttributeModification(getRegulatingTerminalId())) .regulatingTerminalType(toAttributeModification(getRegulatingTerminalType())) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/ReactiveCapabilityCurveModificationEmbeddable.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/ReactiveCapabilityCurveModificationEmbeddable.java index 28e2fd474..502c2f49d 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/ReactiveCapabilityCurveModificationEmbeddable.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/ReactiveCapabilityCurveModificationEmbeddable.java @@ -24,16 +24,16 @@ @Embeddable public class ReactiveCapabilityCurveModificationEmbeddable { @Column - private Double qminP; + private Double minQ; @Column - private Double oldQminP; + private Double oldMinQ; @Column - private Double qmaxP; + private Double maxQ; @Column - private Double oldQmaxP; + private Double oldMaxQ; @Column private Double p; diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageInitGeneratorModificationEmbeddable.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageInitGeneratorModificationEmbeddable.java index da8b0201c..3b4e7eb83 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageInitGeneratorModificationEmbeddable.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageInitGeneratorModificationEmbeddable.java @@ -27,8 +27,8 @@ public class VoltageInitGeneratorModificationEmbeddable { private String generatorId; @Column - private Double voltageSetpoint; + private Double targetV; @Column - private Double reactivePowerSetpoint; + private Double targetQ; } diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageInitModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageInitModificationEntity.java index aacdf95f5..eb7ac8ff7 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageInitModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VoltageInitModificationEntity.java @@ -89,14 +89,14 @@ private void assignAttributes(VoltageInitModificationInfos voltageInitModificati public static List toEmbeddableVoltageInitGenerators(List generators) { return generators == null ? null : generators.stream() - .map(generator -> new VoltageInitGeneratorModificationEmbeddable(generator.getGeneratorId(), generator.getVoltageSetpoint(), generator.getReactivePowerSetpoint())) + .map(generator -> new VoltageInitGeneratorModificationEmbeddable(generator.getGeneratorId(), generator.getTargetV(), generator.getTargetQ())) .collect(Collectors.toList()); } private List toGeneratorsModification(List generators) { return generators != null ? generators .stream() - .map(generator -> new VoltageInitGeneratorModificationInfos(generator.getGeneratorId(), generator.getVoltageSetpoint(), generator.getReactivePowerSetpoint())) + .map(generator -> new VoltageInitGeneratorModificationInfos(generator.getGeneratorId(), generator.getTargetV(), generator.getTargetQ())) .collect(Collectors.toList()) : null; } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/BatteryCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/BatteryCreation.java index ae1efc380..a30038b54 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/BatteryCreation.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/BatteryCreation.java @@ -98,10 +98,10 @@ private BatteryAdder createBatteryAdderInNodeBreaker(VoltageLevel voltageLevel, return voltageLevel.newBattery() .setId(batteryCreationInfos.getEquipmentId()) .setName(batteryCreationInfos.getEquipmentName()) - .setMinP(batteryCreationInfos.getMinActivePower()) - .setMaxP(batteryCreationInfos.getMaxActivePower()) - .setTargetP(batteryCreationInfos.getActivePowerSetpoint()) - .setTargetQ(nanIfNull(batteryCreationInfos.getReactivePowerSetpoint())); + .setMinP(batteryCreationInfos.getMinP()) + .setMaxP(batteryCreationInfos.getMaxP()) + .setTargetP(batteryCreationInfos.getTargetP()) + .setTargetQ(nanIfNull(batteryCreationInfos.getTargetQ())); } private void createBatteryInBusBreaker(VoltageLevel voltageLevel, BatteryCreationInfos batteryCreationInfos, Reporter subReporter) { @@ -113,10 +113,10 @@ private void createBatteryInBusBreaker(VoltageLevel voltageLevel, BatteryCreatio .setConnectableBus(bus.getId()) .setId(batteryCreationInfos.getEquipmentId()) .setName(batteryCreationInfos.getEquipmentName()) - .setMinP(batteryCreationInfos.getMinActivePower()) - .setMaxP(batteryCreationInfos.getMaxActivePower()) - .setTargetP(batteryCreationInfos.getActivePowerSetpoint()) - .setTargetQ(nanIfNull(batteryCreationInfos.getReactivePowerSetpoint())) + .setMinP(batteryCreationInfos.getMinP()) + .setMaxP(batteryCreationInfos.getMaxP()) + .setTargetP(batteryCreationInfos.getTargetP()) + .setTargetQ(nanIfNull(batteryCreationInfos.getTargetQ())) .add(); addExtensionsToBattery(batteryCreationInfos, battery, subReporter); @@ -143,10 +143,10 @@ private void addExtensionsToBattery(BatteryCreationInfos batteryCreationInfos, B private Reporter reportBatterySetPoints(BatteryCreationInfos batteryCreationInfos, Reporter subReporter) { List setPointReports = new ArrayList<>(); setPointReports.add(ModificationUtils.getInstance() - .buildCreationReport(batteryCreationInfos.getActivePowerSetpoint(), "Active power")); - if (batteryCreationInfos.getReactivePowerSetpoint() != null) { + .buildCreationReport(batteryCreationInfos.getTargetP(), "Active power")); + if (batteryCreationInfos.getTargetQ() != null) { setPointReports.add(ModificationUtils.getInstance() - .buildCreationReport(batteryCreationInfos.getReactivePowerSetpoint(), "Reactive power")); + .buildCreationReport(batteryCreationInfos.getTargetQ(), "Reactive power")); } return ModificationUtils.getInstance().reportModifications(subReporter, setPointReports, "SetPointCreated", "Setpoints"); } @@ -193,10 +193,10 @@ private Reporter reportBatteryActiveLimits(BatteryCreationInfos batteryCreationI .withSeverity(TypedValue.INFO_SEVERITY) .build()); limitsReports.add(ModificationUtils.getInstance().buildCreationReport( - batteryCreationInfos.getMinActivePower(), "Min active power")); + batteryCreationInfos.getMinP(), "Min active power")); limitsReports.add(ModificationUtils.getInstance().buildCreationReport( - batteryCreationInfos.getMaxActivePower(), "Max active power")); + batteryCreationInfos.getMaxP(), "Max active power")); ModificationUtils.getInstance().reportModifications(subReporterLimits, limitsReports, "ActiveLimitsCreated", ACTIVE_LIMITS); return subReporterLimits; diff --git a/src/main/java/org/gridsuite/modification/server/modifications/BatteryModification.java b/src/main/java/org/gridsuite/modification/server/modifications/BatteryModification.java index a13a0683e..7cd0fd193 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/BatteryModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/BatteryModification.java @@ -50,9 +50,9 @@ public void check(Network network) throws NetworkModificationException { } Battery battery = ModificationUtils.getInstance().getBattery(network, modificationInfos.getEquipmentId()); String errorMessage = "Battery '" + modificationInfos.getEquipmentId() + "' : "; - if (battery.getReactiveLimits().getKind() == ReactiveLimitsKind.MIN_MAX && (modificationInfos.getMinimumReactivePower() != null || modificationInfos.getMaximumReactivePower() != null)) { + if (battery.getReactiveLimits().getKind() == ReactiveLimitsKind.MIN_MAX && (modificationInfos.getMinQ() != null || modificationInfos.getMaxQ() != null)) { MinMaxReactiveLimits minMaxReactiveLimits = battery.getReactiveLimits(MinMaxReactiveLimits.class); - ModificationUtils.getInstance().checkMaxReactivePowerGreaterThanMinReactivePower(minMaxReactiveLimits, modificationInfos.getMinimumReactivePower(), modificationInfos.getMaximumReactivePower(), MODIFY_BATTERY_ERROR, errorMessage); + ModificationUtils.getInstance().checkMaxReactivePowerGreaterThanMinReactivePower(minMaxReactiveLimits, modificationInfos.getMinQ(), modificationInfos.getMaxQ(), MODIFY_BATTERY_ERROR, errorMessage); } List modificationPoints = modificationInfos.getReactiveCapabilityCurvePoints(); if (modificationPoints != null) { @@ -63,9 +63,9 @@ public void check(Network network) throws NetworkModificationException { private void checkActivePowerZeroOrBetweenMinAndMaxActivePowerBattery(BatteryModificationInfos modificationInfos, Battery battery, NetworkModificationException.Type exceptionType, String errorMessage) { ModificationUtils.getInstance().checkActivePowerZeroOrBetweenMinAndMaxActivePower( - modificationInfos.getActivePowerSetpoint(), - modificationInfos.getMinActivePower(), - modificationInfos.getMaxActivePower(), + modificationInfos.getTargetP(), + modificationInfos.getMinP(), + modificationInfos.getMaxP(), battery.getMinP(), battery.getMaxP(), battery.getTargetP(), @@ -101,8 +101,8 @@ private void modifyBattery(Battery battery, BatteryModificationInfos modificatio private void modifyBatterySetpointsAttributes(BatteryModificationInfos modificationInfos, Battery battery, Reporter subReporter) { - Report reportActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(battery::setTargetP, battery::getTargetP, modificationInfos.getActivePowerSetpoint(), "Active power"); - Report reportReactivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(battery::setTargetQ, battery::getTargetQ, modificationInfos.getReactivePowerSetpoint(), "Reactive power"); + Report reportActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(battery::setTargetP, battery::getTargetP, modificationInfos.getTargetP(), "Active power"); + Report reportReactivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(battery::setTargetQ, battery::getTargetQ, modificationInfos.getTargetQ(), "Reactive power"); Reporter subReporterSetpoints = null; if (reportActivePower != null || reportReactivePower != null) { subReporterSetpoints = subReporter.createSubReporter(SETPOINTS, SETPOINTS); @@ -139,8 +139,8 @@ private void modifyBatteryReactiveCapabilityCurvePoints(BatteryModificationInfos private Reporter modifyBatteryActiveLimitsAttributes(BatteryModificationInfos modificationInfos, Battery battery, Reporter subReporter) { Reporter subReporterLimits = null; - Report reportMaxActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(battery::setMaxP, battery::getMaxP, modificationInfos.getMaxActivePower(), "Max active power"); - Report reportMinActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(battery::setMinP, battery::getMinP, modificationInfos.getMinActivePower(), "Min active power"); + Report reportMaxActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(battery::setMaxP, battery::getMaxP, modificationInfos.getMaxP(), "Max active power"); + Report reportMinActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(battery::setMinP, battery::getMinP, modificationInfos.getMinP(), "Min active power"); if (reportMaxActivePower != null || reportMinActivePower != null) { subReporterLimits = subReporter.createSubReporter(LIMITS, LIMITS); subReporterLimits.report(Report.builder() @@ -192,8 +192,8 @@ private void modifyBatteryMinMaxReactiveLimits(BatteryModificationInfos modifica } ModificationUtils.getInstance().modifyMinMaxReactiveLimits(minMaxReactiveLimits, newMinMaxReactiveLimitsAdder, subReporter, subReporterLimits, - modificationInfos.getMinimumReactivePower(), - modificationInfos.getMaximumReactivePower()); + modificationInfos.getMinQ(), + modificationInfos.getMaxQ()); } private Reporter modifyBatteryActivePowerControlAttributes(BatteryModificationInfos modificationInfos, diff --git a/src/main/java/org/gridsuite/modification/server/modifications/GeneratorCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/GeneratorCreation.java index 7b053bd4b..193cf46fe 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/GeneratorCreation.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/GeneratorCreation.java @@ -121,13 +121,13 @@ private GeneratorAdder createGeneratorAdderInNodeBreaker(VoltageLevel voltageLev .setId(generatorCreationInfos.getEquipmentId()) .setName(generatorCreationInfos.getEquipmentName()) .setEnergySource(generatorCreationInfos.getEnergySource()) - .setMinP(generatorCreationInfos.getMinActivePower()) - .setMaxP(generatorCreationInfos.getMaxActivePower()) - .setRatedS(nanIfNull(generatorCreationInfos.getRatedNominalPower())) - .setTargetP(generatorCreationInfos.getActivePowerSetpoint()) - .setTargetQ(nanIfNull(generatorCreationInfos.getReactivePowerSetpoint())) + .setMinP(generatorCreationInfos.getMinP()) + .setMaxP(generatorCreationInfos.getMaxP()) + .setRatedS(nanIfNull(generatorCreationInfos.getRatedS())) + .setTargetP(generatorCreationInfos.getTargetP()) + .setTargetQ(nanIfNull(generatorCreationInfos.getTargetQ())) .setVoltageRegulatorOn(generatorCreationInfos.isVoltageRegulationOn()) - .setTargetV(nanIfNull(generatorCreationInfos.getVoltageSetpoint())); + .setTargetV(nanIfNull(generatorCreationInfos.getTargetV())); if (terminal != null) { generatorAdder.setRegulatingTerminal(terminal); @@ -164,13 +164,13 @@ private void createGeneratorInBusBreaker(VoltageLevel voltageLevel, GeneratorCre .setEnergySource(generatorCreationInfos.getEnergySource()) .setBus(bus.getId()) .setConnectableBus(bus.getId()) - .setMinP(generatorCreationInfos.getMinActivePower()) - .setMaxP(generatorCreationInfos.getMaxActivePower()) - .setRatedS(nanIfNull(generatorCreationInfos.getRatedNominalPower())) - .setTargetP(generatorCreationInfos.getActivePowerSetpoint()) - .setTargetQ(nanIfNull(generatorCreationInfos.getReactivePowerSetpoint())) + .setMinP(generatorCreationInfos.getMinP()) + .setMaxP(generatorCreationInfos.getMaxP()) + .setRatedS(nanIfNull(generatorCreationInfos.getRatedS())) + .setTargetP(generatorCreationInfos.getTargetP()) + .setTargetQ(nanIfNull(generatorCreationInfos.getTargetQ())) .setVoltageRegulatorOn(generatorCreationInfos.isVoltageRegulationOn()) - .setTargetV(nanIfNull(generatorCreationInfos.getVoltageSetpoint())) + .setTargetV(nanIfNull(generatorCreationInfos.getTargetV())) .add(); addExtensionsToGenerator(generatorCreationInfos, generator, voltageLevel, subReporter); @@ -186,10 +186,10 @@ private void createGeneratorInBusBreaker(VoltageLevel voltageLevel, GeneratorCre private Reporter reportGeneratorSetPoints(GeneratorCreationInfos generatorCreationInfos, Reporter subReporter) { List setPointReports = new ArrayList<>(); setPointReports.add(ModificationUtils.getInstance() - .buildCreationReport(generatorCreationInfos.getActivePowerSetpoint(), "Active power")); - if (generatorCreationInfos.getReactivePowerSetpoint() != null) { + .buildCreationReport(generatorCreationInfos.getTargetP(), "Active power")); + if (generatorCreationInfos.getTargetQ() != null) { setPointReports.add(ModificationUtils.getInstance() - .buildCreationReport(generatorCreationInfos.getReactivePowerSetpoint(), "Reactive power")); + .buildCreationReport(generatorCreationInfos.getTargetQ(), "Reactive power")); } return ModificationUtils.getInstance().reportModifications(subReporter, setPointReports, "SetPointCreated", "Setpoints"); } @@ -198,7 +198,7 @@ private void createGeneratorVoltageRegulation(GeneratorCreationInfos generatorCr List voltageReports = new ArrayList<>(); voltageReports.add(ModificationUtils.getInstance() .createEnabledDisabledReport("VoltageRegulationOn", modificationInfos.isVoltageRegulationOn())); - voltageReports.add(ModificationUtils.getInstance().buildCreationReport(generatorCreationInfos.getVoltageSetpoint(), "Voltage")); + voltageReports.add(ModificationUtils.getInstance().buildCreationReport(generatorCreationInfos.getTargetV(), "Voltage")); if (generatorCreationInfos.getRegulatingTerminalVlId() != null && generatorCreationInfos.getRegulatingTerminalId() != null && generatorCreationInfos.getRegulatingTerminalType() != null) { Terminal terminal = ModificationUtils.getInstance().getTerminalFromIdentifiable(voltageLevel.getNetwork(), @@ -285,14 +285,14 @@ private Reporter reportGeneratorActiveLimits(GeneratorCreationInfos generatorCre .withSeverity(TypedValue.INFO_SEVERITY) .build()); limitsReports.add(ModificationUtils.getInstance().buildCreationReport( - generatorCreationInfos.getMinActivePower(), "Min active power")); + generatorCreationInfos.getMinP(), "Min active power")); limitsReports.add(ModificationUtils.getInstance().buildCreationReport( - generatorCreationInfos.getMaxActivePower(), "Max active power")); + generatorCreationInfos.getMaxP(), "Max active power")); - if (generatorCreationInfos.getRatedNominalPower() != null) { + if (generatorCreationInfos.getRatedS() != null) { limitsReports.add(ModificationUtils.getInstance().buildCreationReport( - generatorCreationInfos.getRatedNominalPower(), "Rated nominal power")); + generatorCreationInfos.getRatedS(), "Rated nominal power")); } ModificationUtils.getInstance().reportModifications(subReporterLimits, limitsReports, "ActiveLimitsCreated", ACTIVE_LIMITS); return subReporterLimits; @@ -325,18 +325,18 @@ private void createGeneratorActivePowerControl(GeneratorCreationInfos generatorC } private void createGeneratorShortCircuit(GeneratorCreationInfos generatorCreationInfos, Generator generator, Reporter subReporter) { - if (generatorCreationInfos.getTransientReactance() != null) { + if (generatorCreationInfos.getDirectTransX() != null) { List shortCircuitReports = new ArrayList<>(); try { GeneratorShortCircuitAdder shortCircuitAdder = generator.newExtension(GeneratorShortCircuitAdder.class) - .withDirectTransX(generatorCreationInfos.getTransientReactance()); - if (generatorCreationInfos.getStepUpTransformerReactance() != null) { - shortCircuitAdder.withStepUpTransformerX(generatorCreationInfos.getStepUpTransformerReactance()); + .withDirectTransX(generatorCreationInfos.getDirectTransX()); + if (generatorCreationInfos.getStepUpTransformerX() != null) { + shortCircuitAdder.withStepUpTransformerX(generatorCreationInfos.getStepUpTransformerX()); } shortCircuitAdder.add(); - shortCircuitReports.add(ModificationUtils.getInstance().buildCreationReport(generatorCreationInfos.getTransientReactance(), "Transient reactance")); - if (generatorCreationInfos.getStepUpTransformerReactance() != null) { - shortCircuitReports.add(ModificationUtils.getInstance().buildCreationReport(generatorCreationInfos.getStepUpTransformerReactance(), "Transformer reactance")); + shortCircuitReports.add(ModificationUtils.getInstance().buildCreationReport(generatorCreationInfos.getDirectTransX(), "Transient reactance")); + if (generatorCreationInfos.getStepUpTransformerX() != null) { + shortCircuitReports.add(ModificationUtils.getInstance().buildCreationReport(generatorCreationInfos.getStepUpTransformerX(), "Transformer reactance")); } } catch (PowsyblException e) { shortCircuitReports.add(Report.builder() diff --git a/src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java b/src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java index c1c476d94..5be603a78 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java @@ -63,9 +63,9 @@ public void check(Network network) throws NetworkModificationException { Generator generator = ModificationUtils.getInstance().getGenerator(network, modificationInfos.getEquipmentId()); // check min max reactive limits String errorMessage = "Generator '" + modificationInfos.getEquipmentId() + "' : "; - if (generator.getReactiveLimits().getKind() == ReactiveLimitsKind.MIN_MAX && (modificationInfos.getMinimumReactivePower() != null || modificationInfos.getMaximumReactivePower() != null)) { + if (generator.getReactiveLimits().getKind() == ReactiveLimitsKind.MIN_MAX && (modificationInfos.getMinQ() != null || modificationInfos.getMaxQ() != null)) { MinMaxReactiveLimits minMaxReactiveLimits = generator.getReactiveLimits(MinMaxReactiveLimits.class); - ModificationUtils.getInstance().checkMaxReactivePowerGreaterThanMinReactivePower(minMaxReactiveLimits, modificationInfos.getMinimumReactivePower(), modificationInfos.getMaximumReactivePower(), MODIFY_GENERATOR_ERROR, errorMessage); + ModificationUtils.getInstance().checkMaxReactivePowerGreaterThanMinReactivePower(minMaxReactiveLimits, modificationInfos.getMinQ(), modificationInfos.getMaxQ(), MODIFY_GENERATOR_ERROR, errorMessage); } // check reactive capability curve limits List modificationPoints = modificationInfos.getReactiveCapabilityCurvePoints(); @@ -86,9 +86,9 @@ public void check(Network network) throws NetworkModificationException { private void checkActivePowerZeroOrBetweenMinAndMaxActivePowerGenerator(GeneratorModificationInfos modificationInfos, Generator generator, NetworkModificationException.Type exceptionType, String errorMessage) { ModificationUtils.getInstance().checkActivePowerZeroOrBetweenMinAndMaxActivePower( - modificationInfos.getActivePowerSetpoint(), - modificationInfos.getMinActivePower(), - modificationInfos.getMaxActivePower(), + modificationInfos.getTargetP(), + modificationInfos.getMinP(), + modificationInfos.getMaxP(), generator.getMinP(), generator.getMaxP(), generator.getTargetP(), @@ -134,36 +134,36 @@ private void modifyGeneratorShortCircuitAttributes(GeneratorModificationInfos mo Double oldStepUpTransformerReactance = generatorShortCircuit != null ? generatorShortCircuit.getStepUpTransformerX() : Double.NaN; // Either transient reactance or step-up transformer reactance are modified or // both - if (modificationInfos.getTransientReactance() != null - && modificationInfos.getStepUpTransformerReactance() != null) { + if (modificationInfos.getDirectTransX() != null + && modificationInfos.getStepUpTransformerX() != null) { generator.newExtension(GeneratorShortCircuitAdder.class) - .withDirectTransX(modificationInfos.getTransientReactance().getValue()) - .withStepUpTransformerX(modificationInfos.getStepUpTransformerReactance().getValue()) + .withDirectTransX(modificationInfos.getDirectTransX().getValue()) + .withStepUpTransformerX(modificationInfos.getStepUpTransformerX().getValue()) .add(); reports.add(ModificationUtils.getInstance().buildModificationReport( oldTransientReactance, - modificationInfos.getTransientReactance().getValue(), + modificationInfos.getDirectTransX().getValue(), "Transient reactance")); reports.add(ModificationUtils.getInstance().buildModificationReport( oldStepUpTransformerReactance, - modificationInfos.getStepUpTransformerReactance().getValue(), + modificationInfos.getStepUpTransformerX().getValue(), "Transformer reactance")); - } else if (modificationInfos.getTransientReactance() != null) { + } else if (modificationInfos.getDirectTransX() != null) { generator.newExtension(GeneratorShortCircuitAdder.class) - .withDirectTransX(modificationInfos.getTransientReactance().getValue()) + .withDirectTransX(modificationInfos.getDirectTransX().getValue()) .add(); reports.add(ModificationUtils.getInstance().buildModificationReport( oldTransientReactance, - modificationInfos.getTransientReactance().getValue(), + modificationInfos.getDirectTransX().getValue(), "Transient reactance")); - } else if (modificationInfos.getStepUpTransformerReactance() != null) { + } else if (modificationInfos.getStepUpTransformerX() != null) { generator.newExtension(GeneratorShortCircuitAdder.class) - .withStepUpTransformerX(modificationInfos.getStepUpTransformerReactance().getValue()) + .withStepUpTransformerX(modificationInfos.getStepUpTransformerX().getValue()) .add(); reports.add(ModificationUtils.getInstance().buildModificationReport( oldStepUpTransformerReactance, - modificationInfos.getStepUpTransformerReactance().getValue(), + modificationInfos.getStepUpTransformerX().getValue(), "Transformer reactance")); } ModificationUtils.getInstance().reportModifications(subReporter, reports, "shortCircuitAttributesModified", "Short-circuit"); @@ -182,8 +182,8 @@ private void modifyGeneratorMinMaxReactiveLimits(GeneratorModificationInfos modi } ModificationUtils.getInstance().modifyMinMaxReactiveLimits(minMaxReactiveLimits, newMinMaxReactiveLimitsAdder, subReporter, subReporterLimits, - modificationInfos.getMinimumReactivePower(), - modificationInfos.getMaximumReactivePower()); + modificationInfos.getMinQ(), + modificationInfos.getMaxQ()); } private void modifyGeneratorReactiveCapabilityCurvePoints(GeneratorModificationInfos modificationInfos, @@ -200,15 +200,15 @@ private Reporter modifyGeneratorActiveLimitsAttributes(GeneratorModificationInfo Report reportMaxActivePower; Report reportMinActivePower; - if (modificationInfos.getMaxActivePower() != null && modificationInfos.getMaxActivePower().getValue() > generator.getMinP()) { - reportMaxActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setMaxP, generator::getMaxP, modificationInfos.getMaxActivePower(), "Max active power"); - reportMinActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setMinP, generator::getMinP, modificationInfos.getMinActivePower(), "Min active power"); + if (modificationInfos.getMaxP() != null && modificationInfos.getMaxP().getValue() > generator.getMinP()) { + reportMaxActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setMaxP, generator::getMaxP, modificationInfos.getMaxP(), "Max active power"); + reportMinActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setMinP, generator::getMinP, modificationInfos.getMinP(), "Min active power"); } else { - reportMinActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setMinP, generator::getMinP, modificationInfos.getMinActivePower(), "Min active power"); - reportMaxActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setMaxP, generator::getMaxP, modificationInfos.getMaxActivePower(), "Max active power"); + reportMinActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setMinP, generator::getMinP, modificationInfos.getMinP(), "Min active power"); + reportMaxActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setMaxP, generator::getMaxP, modificationInfos.getMaxP(), "Max active power"); } - Report reportRatedNominalPower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setRatedS, generator::getRatedS, modificationInfos.getRatedNominalPower(), "Rated nominal power"); + Report reportRatedNominalPower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setRatedS, generator::getRatedS, modificationInfos.getRatedS(), "Rated nominal power"); if (reportMaxActivePower != null || reportMinActivePower != null || reportRatedNominalPower != null) { subReporterLimits = subReporter.createSubReporter(LIMITS, LIMITS); subReporterLimits.report(Report.builder() @@ -396,10 +396,10 @@ private Reporter modifyGeneratorVoltageRegulatorAttributes(GeneratorModification List voltageRegulationReports = new ArrayList<>(); Report reportVoltageSetpoint = null; - if (modificationInfos.getVoltageSetpoint() != null) { - if (modificationInfos.getVoltageSetpoint().getOp() == OperationType.SET) { + if (modificationInfos.getTargetV() != null) { + if (modificationInfos.getTargetV().getOp() == OperationType.SET) { reportVoltageSetpoint = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setTargetV, generator::getTargetV, - modificationInfos.getVoltageSetpoint(), "Voltage"); + modificationInfos.getTargetV(), "Voltage"); } else { reportVoltageSetpoint = ModificationUtils.getInstance().buildModificationReport(generator.getTargetV(), Double.NaN, "Voltage"); } @@ -428,11 +428,11 @@ private Reporter modifyGeneratorVoltageRegulatorAttributes(GeneratorModification } //TargetQ and TargetV are unset after voltage regulation have been dealt with otherwise it can cause unwanted validations exceptions - if (modificationInfos.getVoltageSetpoint() != null && modificationInfos.getVoltageSetpoint().getOp() == OperationType.UNSET) { + if (modificationInfos.getTargetV() != null && modificationInfos.getTargetV().getOp() == OperationType.UNSET) { generator.setTargetV(Double.NaN); } - if (modificationInfos.getReactivePowerSetpoint() != null && modificationInfos.getReactivePowerSetpoint().getOp() == OperationType.UNSET) { + if (modificationInfos.getTargetQ() != null && modificationInfos.getTargetQ().getOp() == OperationType.UNSET) { generator.setTargetQ(Double.NaN); } @@ -451,11 +451,11 @@ private Reporter modifyGeneratorVoltageRegulatorAttributes(GeneratorModification private void modifyGeneratorSetpointsAttributes(GeneratorModificationInfos modificationInfos, Generator generator, Reporter subReporter) { - Report reportActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setTargetP, generator::getTargetP, modificationInfos.getActivePowerSetpoint(), "Active power"); + Report reportActivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setTargetP, generator::getTargetP, modificationInfos.getTargetP(), "Active power"); Report reportReactivePower = null; - if (modificationInfos.getReactivePowerSetpoint() != null) { - if (modificationInfos.getReactivePowerSetpoint().getOp() == OperationType.SET) { - reportReactivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setTargetQ, generator::getTargetQ, modificationInfos.getReactivePowerSetpoint(), "Reactive power"); + if (modificationInfos.getTargetQ() != null) { + if (modificationInfos.getTargetQ().getOp() == OperationType.SET) { + reportReactivePower = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(generator::setTargetQ, generator::getTargetQ, modificationInfos.getTargetQ(), "Reactive power"); } else { reportReactivePower = ModificationUtils.getInstance().buildModificationReport(generator.getTargetQ(), Double.NaN, "Reactive power"); } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java b/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java index 7078b9c25..d25a94012 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java @@ -751,8 +751,8 @@ public void createReactiveCapabilityCurvePoint(ReactiveCapabilityCurveAdder adde oldMinQ = oldPoint.getMinQ(); oldP = oldPoint.getP(); } - var maxQ = newPoint.getQmaxP() != null ? newPoint.getQmaxP() : oldMaxQ; - var minQ = newPoint.getQminP() != null ? newPoint.getQminP() : oldMinQ; + var maxQ = newPoint.getMaxQ() != null ? newPoint.getMaxQ() : oldMaxQ; + var minQ = newPoint.getMinQ() != null ? newPoint.getMinQ() : oldMinQ; var p = newPoint.getP() != null ? newPoint.getP() : oldP; adder.beginPoint() @@ -902,16 +902,16 @@ public void checkMaxQGreaterThanMinQ( double maxQ = Double.NaN; double minQ = Double.NaN; - if (point.getQmaxP() != null) { - maxQ = point.getQmaxP(); - } else if (point.getOldQmaxP() != null) { - maxQ = point.getOldQmaxP(); + if (point.getMaxQ() != null) { + maxQ = point.getMaxQ(); + } else if (point.getOldMaxQ() != null) { + maxQ = point.getOldMaxQ(); } - if (point.getQminP() != null) { - minQ = point.getQminP(); - } else if (point.getOldQminP() != null) { - minQ = point.getOldQminP(); + if (point.getMinQ() != null) { + minQ = point.getMinQ(); + } else if (point.getOldMinQ() != null) { + minQ = point.getOldMinQ(); } if (maxQ < minQ) { @@ -956,12 +956,12 @@ public void checkReactiveLimitsCreation(ReactiveLimitsHolderInfos modificationIn String equipmentId, String equipmentName) { // check min max reactive limits - if (modificationInfos.getMinimumReactivePower() != null && modificationInfos.getMaximumReactivePower() != null) { - if (Double.isNaN(modificationInfos.getMinimumReactivePower())) { + if (modificationInfos.getMinQ() != null && modificationInfos.getMaxQ() != null) { + if (Double.isNaN(modificationInfos.getMinQ())) { throw makeEquipmentException(errorType, equipmentId, equipmentName, "minimum reactive power is not set"); - } else if (Double.isNaN(modificationInfos.getMaximumReactivePower())) { + } else if (Double.isNaN(modificationInfos.getMaxQ())) { throw makeEquipmentException(errorType, equipmentId, equipmentName, "maximum reactive power is not set"); - } else if (modificationInfos.getMaximumReactivePower() < modificationInfos.getMinimumReactivePower()) { + } else if (modificationInfos.getMaxQ() < modificationInfos.getMinQ()) { throw makeEquipmentException(errorType, equipmentId, equipmentName, "maximum reactive power is expected to be greater than or equal to minimum reactive power"); } } @@ -977,9 +977,9 @@ public void checkReactiveLimitsCreation(ReactiveLimitsHolderInfos modificationIn ReactiveCapabilityCurveCreationInfos newPoint = points.get(i); if (Double.isNaN(newPoint.getP())) { throw makeEquipmentException(errorType, equipmentId, equipmentName, "P is not set in a reactive capability curve limits point"); - } else if (Double.isNaN(newPoint.getQminP())) { + } else if (Double.isNaN(newPoint.getMinQ())) { throw makeEquipmentException(errorType, equipmentId, equipmentName, "min Q is not set in a reactive capability curve limits point"); - } else if (Double.isNaN(newPoint.getQmaxP())) { + } else if (Double.isNaN(newPoint.getMaxQ())) { throw makeEquipmentException(errorType, equipmentId, equipmentName, "max Q is not set in a reactive capability curve limits point"); } }); @@ -1006,18 +1006,18 @@ public void createMinMaxReactiveLimits(ReactiveLimitsHolderInfos batteryCreation ReactiveLimitsHolder reactiveLimitsHolder, Reporter subReporter) { List minMaxReactiveLimitsReports = new ArrayList<>(); - if (batteryCreationInfos.getMinimumReactivePower() != null && batteryCreationInfos.getMaximumReactivePower() != null) { + if (batteryCreationInfos.getMinQ() != null && batteryCreationInfos.getMaxQ() != null) { reactiveLimitsHolder.newMinMaxReactiveLimits() - .setMinQ(batteryCreationInfos.getMinimumReactivePower()) - .setMaxQ(batteryCreationInfos.getMaximumReactivePower()) + .setMinQ(batteryCreationInfos.getMinQ()) + .setMaxQ(batteryCreationInfos.getMaxQ()) .add(); minMaxReactiveLimitsReports.add(ModificationUtils.getInstance().buildCreationReport( - batteryCreationInfos.getMinimumReactivePower(), + batteryCreationInfos.getMinQ(), MIN_REACTIVE_POWER_FIELDNAME)); minMaxReactiveLimitsReports.add(ModificationUtils.getInstance().buildCreationReport( - batteryCreationInfos.getMaximumReactivePower(), + batteryCreationInfos.getMaxQ(), MAX_REACTIVE_POWER_FIELDNAME)); Reporter subReporterReactiveLimits = subReporter.createSubReporter(REACTIVE_LIMITS, REACTIVE_LIMITS); @@ -1066,13 +1066,13 @@ private void createReactiveCapabilityCurvePoint(ReactiveCapabilityCurveAdder add List reports, String fieldSuffix) { adder.beginPoint() - .setMaxQ(point.getQmaxP()) - .setMinQ(point.getQminP()) + .setMaxQ(point.getMaxQ()) + .setMinQ(point.getMinQ()) .setP(point.getP()) .endPoint(); addToReports(reports, point.getP(), "P" + fieldSuffix); - addToReports(reports, point.getQminP(), "QminP" + fieldSuffix); - addToReports(reports, point.getQmaxP(), "QmaxP" + fieldSuffix); + addToReports(reports, point.getMinQ(), "QminP" + fieldSuffix); + addToReports(reports, point.getMaxQ(), "QmaxP" + fieldSuffix); } public boolean isValidFilter(Reporter subReporter, diff --git a/src/main/java/org/gridsuite/modification/server/modifications/VoltageInitModification.java b/src/main/java/org/gridsuite/modification/server/modifications/VoltageInitModification.java index 38a84d4f7..d099820c7 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/VoltageInitModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/VoltageInitModification.java @@ -78,21 +78,21 @@ private void applyGeneratorModification(Network network, Reporter subReporter) { .withDefaultMessage("Generator with id=${id} not found") .withValue("id", m.getGeneratorId()) .withSeverity(TypedValue.WARN_SEVERITY).build()); - } else if (m.getVoltageSetpoint() != null || m.getReactivePowerSetpoint() != null) { + } else if (m.getTargetV() != null || m.getTargetQ() != null) { modificationsCount++; reports.add(Report.builder().withKey("generatorModification") .withDefaultMessage("Generator with id=${id} modified :") .withValue("id", m.getGeneratorId()) .withSeverity(TypedValue.TRACE_SEVERITY).build()); - if (m.getVoltageSetpoint() != null) { + if (m.getTargetV() != null) { final double oldTargetV = generator.getTargetV(); - generator.setTargetV(m.getVoltageSetpoint()); - reports.add(ModificationUtils.buildModificationReport(oldTargetV, m.getVoltageSetpoint(), VOLTAGE_SET_POINT, 1, TypedValue.TRACE_SEVERITY)); + generator.setTargetV(m.getTargetV()); + reports.add(ModificationUtils.buildModificationReport(oldTargetV, m.getTargetV(), VOLTAGE_SET_POINT, 1, TypedValue.TRACE_SEVERITY)); } - if (m.getReactivePowerSetpoint() != null) { + if (m.getTargetQ() != null) { final double oldTargetQ = generator.getTargetQ(); - generator.setTargetQ(m.getReactivePowerSetpoint()); - reports.add(ModificationUtils.buildModificationReport(oldTargetQ, m.getReactivePowerSetpoint(), REACTIVE_POWER_SET_POINT, 1, TypedValue.TRACE_SEVERITY)); + generator.setTargetQ(m.getTargetQ()); + reports.add(ModificationUtils.buildModificationReport(oldTargetQ, m.getTargetQ(), REACTIVE_POWER_SET_POINT, 1, TypedValue.TRACE_SEVERITY)); } } } diff --git a/src/main/resources/db/changelog/changesets/changelog_20240216T155006Z.xml b/src/main/resources/db/changelog/changesets/changelog_20240216T155006Z.xml new file mode 100644 index 000000000..7676b8260 --- /dev/null +++ b/src/main/resources/db/changelog/changesets/changelog_20240216T155006Z.xml @@ -0,0 +1,387 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml index 0984d33d3..e62354c88 100644 --- a/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/src/main/resources/db/changelog/db.changelog-master.yaml @@ -264,3 +264,6 @@ databaseChangeLog: - include: file: changesets/changelog_20240229T160459Z.xml relativeToChangelogFile: true + - include: + file: changesets/changelog_20240216T155006Z.xml + relativeToChangelogFile: true \ No newline at end of file diff --git a/src/main/resources/network-modification.sql b/src/main/resources/network-modification.sql deleted file mode 100644 index 253df7f66..000000000 --- a/src/main/resources/network-modification.sql +++ /dev/null @@ -1,157 +0,0 @@ - - create table booleanEquipmentAttributeModification ( - equipmentId varchar(255), - attributeName varchar(255), - attributeValue boolean, - id uuid not null, - primary key (id) - ); - - create table doubleEquipmentAttributeModification ( - equipmentId varchar(255), - attributeName varchar(255), - attributeValue float8, - id uuid not null, - primary key (id) - ); - - create table equipmentDeletion ( - equipmentId varchar(255), - equipmentType varchar(255), - id uuid not null, - primary key (id) - ); - - create table floatEquipmentAttributeModification ( - equipmentId varchar(255), - attributeName varchar(255), - attributeValue float4, - id uuid not null, - primary key (id) - ); - - create table generatorCreation ( - equipmentId varchar(255), - equipmentName varchar(255), - busOrBusbarSectionId varchar(255), - voltageLevelId varchar(255), - activePowerSetpoint float8, - energySource int4, - maxActivePower float8, - minActivePower float8, - ratedNominalPower float8, - reactivePowerSetpoint float8, - voltageRegulationOn boolean, - voltageSetpoint float8, - id uuid not null, - primary key (id) - ); - - create table integerEquipmentAttributeModification ( - equipmentId varchar(255), - attributeName varchar(255), - attributeValue int4, - id uuid not null, - primary key (id) - ); - - create table lineCreation ( - equipmentId varchar(255), - equipmentName varchar(255), - busOrBusbarSectionId1 varchar(255), - busOrBusbarSectionId2 varchar(255), - voltageLevelId1 varchar(255), - voltageLevelId2 varchar(255), - seriesReactance float8, - seriesResistance float8, - shuntConductance1 float8, - shuntConductance2 float8, - shuntSusceptance1 float8, - shuntSusceptance2 float8, - id uuid not null, - primary key (id) - ); - - create table loadCreation ( - equipmentId varchar(255), - equipmentName varchar(255), - busOrBusbarSectionId varchar(255), - voltageLevelId varchar(255), - activePower float8, - loadType int4, - reactivePower float8, - id uuid not null, - primary key (id) - ); - - create table modification ( - id uuid not null, - date timestamp, - type varchar(255), - group_id uuid not null, - primary key (id) - ); - - create table modificationGroup ( - id uuid not null, - primary key (id) - ); - - create table stringEquipmentAttributeModification ( - equipmentId varchar(255), - attributeName varchar(255), - attributeValue varchar(255), - id uuid not null, - primary key (id) - ); -create index modificationEntity_group_id_index on modification (group_id); - - alter table if exists booleanEquipmentAttributeModification - add constraint boolean_equipment_attribute_modification_id_fk_constraint - foreign key (id) - references modification; - - alter table if exists doubleEquipmentAttributeModification - add constraint double_equipment_attribute_modification_id_fk_constraint - foreign key (id) - references modification; - - alter table if exists equipmentDeletion - add constraint equipmentDeletion_id_fk_constraint - foreign key (id) - references modification; - - alter table if exists floatEquipmentAttributeModification - add constraint float_equipment_attribute_modification_id_fk_constraint - foreign key (id) - references modification; - - alter table if exists generatorCreation - add constraint generatorCreation_id_fk_constraint - foreign key (id) - references modification; - - alter table if exists integerEquipmentAttributeModification - add constraint integer_equipment_attribute_modification_id_fk_constraint - foreign key (id) - references modification; - - alter table if exists lineCreation - add constraint lineCreation_id_fk_constraint - foreign key (id) - references modification; - - alter table if exists loadCreation - add constraint loadCreation_id_fk_constraint - foreign key (id) - references modification; - - alter table if exists modification - add constraint group_id_fk_constraint - foreign key (group_id) - references modificationGroup; - - alter table if exists stringEquipmentAttributeModification - add constraint string_equipment_attribute_modification_id_fk_constraint - foreign key (id) - references modification; diff --git a/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java b/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java index 344bc5c48..27938098e 100644 --- a/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java +++ b/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java @@ -1260,11 +1260,11 @@ public void testCreateVoltageInitModification() throws Exception { .generators(List.of( VoltageInitGeneratorModificationInfos.builder() .generatorId("G1") - .reactivePowerSetpoint(10.) + .targetQ(10.) .build(), VoltageInitGeneratorModificationInfos.builder() .generatorId("G2") - .voltageSetpoint(226.) + .targetV(226.) .build())) .transformers(List.of( VoltageInitTransformerModificationInfos.builder() diff --git a/src/test/java/org/gridsuite/modification/server/VoltageInitReportTest.java b/src/test/java/org/gridsuite/modification/server/VoltageInitReportTest.java index 6f43a74fd..564c82dcc 100644 --- a/src/test/java/org/gridsuite/modification/server/VoltageInitReportTest.java +++ b/src/test/java/org/gridsuite/modification/server/VoltageInitReportTest.java @@ -101,7 +101,7 @@ private static List voltageInitModifications() { .date(ZonedDateTime.ofInstant(Instant.EPOCH, ZoneOffset.UTC)) .stashed(false) .generators(List.of( - VoltageInitGeneratorModificationInfos.builder().generatorId("GTH2").voltageSetpoint(0.1).build())) //added for test case + VoltageInitGeneratorModificationInfos.builder().generatorId("GTH2").targetV(0.1).build())) //added for test case .transformers(List.of( VoltageInitTransformerModificationInfos.builder().transformerId("TWT2").ratioTapChangerPosition(2).build())) .staticVarCompensators(List.of( @@ -117,8 +117,8 @@ private static List voltageInitModifications() { .date(ZonedDateTime.ofInstant(Instant.EPOCH, ZoneOffset.UTC)) .stashed(false) .generators(List.of( - VoltageInitGeneratorModificationInfos.builder().generatorId("G1").reactivePowerSetpoint(10.).build(), - VoltageInitGeneratorModificationInfos.builder().generatorId("G2").voltageSetpoint(226.).build())) + VoltageInitGeneratorModificationInfos.builder().generatorId("G1").targetQ(10.).build(), + VoltageInitGeneratorModificationInfos.builder().generatorId("G2").targetV(226.).build())) .transformers(List.of( VoltageInitTransformerModificationInfos.builder().transformerId("2WT1").ratioTapChangerPosition(3).build(), VoltageInitTransformerModificationInfos.builder().transformerId("3WT1").ratioTapChangerPosition(1).legSide(ThreeSides.TWO).build())) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInBusBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInBusBreakerTest.java index 1ba8fb1c6..e6c2f2759 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInBusBreakerTest.java @@ -51,12 +51,12 @@ protected ModificationInfos buildModification() { .equipmentName("nameBattery2") .voltageLevelId("v1") .busOrBusbarSectionId("bus1") - .minActivePower(100.0) - .maxActivePower(600.0) - .activePowerSetpoint(400.) - .reactivePowerSetpoint(50.) - .minimumReactivePower(20.0) - .maximumReactivePower(25.0) + .minP(100.0) + .maxP(600.0) + .targetP(400.) + .targetQ(50.) + .minQ(20.0) + .maxQ(25.0) .droop(5f) .participate(true) .reactiveCapabilityCurve(true) @@ -76,12 +76,12 @@ protected ModificationInfos buildModificationUpdate() { .equipmentName("nameBatteryModified") .voltageLevelId("v1") .busOrBusbarSectionId("bus1") - .minActivePower(101.0) - .maxActivePower(601.0) - .activePowerSetpoint(401.) - .reactivePowerSetpoint(51.) - .minimumReactivePower(23.0) - .maximumReactivePower(26.0) + .minP(101.0) + .maxP(601.0) + .targetP(401.) + .targetQ(51.) + .minQ(23.0) + .maxQ(26.0) .droop(6f) .participate(true) .reactiveCapabilityCurve(true) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInNodeBreakerTest.java index 789b617b2..b6e77b11a 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInNodeBreakerTest.java @@ -47,12 +47,12 @@ protected ModificationInfos buildModification() { .equipmentName("idBattery1") .voltageLevelId("v2") .busOrBusbarSectionId("1B") - .minActivePower(100.0) - .maxActivePower(600.0) - .activePowerSetpoint(400.) - .reactivePowerSetpoint(50.) - .minimumReactivePower(20.0) - .maximumReactivePower(25.0) + .minP(100.0) + .maxP(600.0) + .targetP(400.) + .targetQ(50.) + .minQ(20.0) + .maxQ(25.0) .droop(5f) .participate(true) .reactiveCapabilityCurve(true) @@ -72,12 +72,12 @@ protected ModificationInfos buildModificationUpdate() { .equipmentName("nameBatteryModified") .voltageLevelId("v1") .busOrBusbarSectionId("bus1") - .minActivePower(101.0) - .maxActivePower(601.0) - .activePowerSetpoint(401.) - .reactivePowerSetpoint(51.) - .minimumReactivePower(23.0) - .maximumReactivePower(26.0) + .minP(101.0) + .maxP(601.0) + .targetP(401.) + .targetQ(51.) + .minQ(23.0) + .maxQ(26.0) .droop(6f) .participate(true) .reactiveCapabilityCurve(true) @@ -135,7 +135,7 @@ public void testCreateWithErrors() throws Exception { batteryCreationInfos.setVoltageLevelId("v2"); batteryCreationInfos.setBusOrBusbarSectionId("1B"); - batteryCreationInfos.setMinActivePower(Double.NaN); + batteryCreationInfos.setMinP(Double.NaN); batteryCreationInfosJson = mapper.writeValueAsString(batteryCreationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(batteryCreationInfosJson).contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()); @@ -145,7 +145,7 @@ public void testCreateWithErrors() throws Exception { // invalid min max reactive limit batteryCreationInfos = (BatteryCreationInfos) buildModification(); batteryCreationInfos.setReactiveCapabilityCurve(false); - batteryCreationInfos.setMinimumReactivePower(Double.NaN); + batteryCreationInfos.setMinQ(Double.NaN); batteryCreationInfosJson = mapper.writeValueAsString(batteryCreationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(batteryCreationInfosJson).contentType(MediaType.APPLICATION_JSON)) @@ -155,7 +155,7 @@ public void testCreateWithErrors() throws Exception { batteryCreationInfos = (BatteryCreationInfos) buildModification(); batteryCreationInfos.setReactiveCapabilityCurve(false); - batteryCreationInfos.setMaximumReactivePower(Double.NaN); + batteryCreationInfos.setMaxQ(Double.NaN); batteryCreationInfosJson = mapper.writeValueAsString(batteryCreationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(batteryCreationInfosJson).contentType(MediaType.APPLICATION_JSON)) @@ -165,8 +165,8 @@ public void testCreateWithErrors() throws Exception { batteryCreationInfos = (BatteryCreationInfos) buildModification(); batteryCreationInfos.setReactiveCapabilityCurve(false); - batteryCreationInfos.setMinimumReactivePower(200.); - batteryCreationInfos.setMaximumReactivePower(100.); + batteryCreationInfos.setMinQ(200.); + batteryCreationInfos.setMaxQ(100.); batteryCreationInfosJson = mapper.writeValueAsString(batteryCreationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(batteryCreationInfosJson).contentType(MediaType.APPLICATION_JSON)) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/BatteryModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/BatteryModificationTest.java index 6c63b1ea7..aa1c0482c 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/BatteryModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/BatteryModificationTest.java @@ -45,12 +45,12 @@ protected ModificationInfos buildModification() { .stashed(false) .equipmentId("v3Battery") .equipmentName(new AttributeModification<>("newV1Battery", OperationType.SET)) - .activePowerSetpoint(new AttributeModification<>(80.0, OperationType.SET)) - .reactivePowerSetpoint(new AttributeModification<>(40.0, OperationType.SET)) - .minActivePower(new AttributeModification<>(0., OperationType.SET)) - .maxActivePower(new AttributeModification<>(100., OperationType.SET)) - .minimumReactivePower(new AttributeModification<>(-100., OperationType.SET)) - .maximumReactivePower(new AttributeModification<>(100., OperationType.SET)) + .targetP(new AttributeModification<>(80.0, OperationType.SET)) + .targetQ(new AttributeModification<>(40.0, OperationType.SET)) + .minP(new AttributeModification<>(0., OperationType.SET)) + .maxP(new AttributeModification<>(100., OperationType.SET)) + .minQ(new AttributeModification<>(-100., OperationType.SET)) + .maxP(new AttributeModification<>(100., OperationType.SET)) .reactiveCapabilityCurvePoints(List.of( new ReactiveCapabilityCurveModificationInfos(0., 0., 100., 100., 0., 0.1), new ReactiveCapabilityCurveModificationInfos(0., 0., 100., 100., 200., 150.))) @@ -67,10 +67,10 @@ protected ModificationInfos buildModificationUpdate() { .stashed(false) .equipmentId("idBatteryEdited") .equipmentName(new AttributeModification<>("newV1BatteryEdited", OperationType.SET)) - .activePowerSetpoint(new AttributeModification<>(81.0, OperationType.SET)) - .reactivePowerSetpoint(new AttributeModification<>(41.0, OperationType.SET)) - .minActivePower(new AttributeModification<>(1., OperationType.SET)) - .maxActivePower(new AttributeModification<>(102., OperationType.SET)) + .targetP(new AttributeModification<>(81.0, OperationType.SET)) + .targetQ(new AttributeModification<>(41.0, OperationType.SET)) + .minP(new AttributeModification<>(1., OperationType.SET)) + .maxP(new AttributeModification<>(102., OperationType.SET)) .reactiveCapabilityCurve(new AttributeModification<>(false, OperationType.SET)) .build(); } @@ -95,8 +95,8 @@ protected void assertAfterNetworkModificationCreation() { .forEach(i -> { var point = batteryPoints.get(i); var modificationPoint = modificationPoints.get(i); - assertEquals(modificationPoint.getQmaxP(), point.getMaxQ()); - assertEquals(modificationPoint.getQminP(), point.getMinQ()); + assertEquals(modificationPoint.getMaxQ(), point.getMaxQ()); + assertEquals(modificationPoint.getMinQ(), point.getMinQ()); assertEquals(modificationPoint.getP(), point.getP()); }); } @@ -120,8 +120,8 @@ public void testMinMaxReactiveLimitsAttributesModification() throws Exception { //setting ReactiveCapabilityCurve to false with null min and max reactive limits batteryModificationInfos.setReactiveCapabilityCurve(new AttributeModification<>(false, OperationType.SET)); - batteryModificationInfos.setMaximumReactivePower(null); - batteryModificationInfos.setMinimumReactivePower(null); + batteryModificationInfos.setMaxQ(null); + batteryModificationInfos.setMinQ(null); //setting ReactiveCapabilityCurvePoints for the battery we are modifying Battery battery = getNetwork().getBattery("v3Battery"); battery.newReactiveCapabilityCurve() @@ -147,7 +147,7 @@ public void testMinMaxReactiveLimitsAttributesModification() throws Exception { testNetworkModificationsCount(getGroupId(), 1); // Modifying only min reactive limit - batteryModificationInfos.setMinimumReactivePower(new AttributeModification<>(-200., OperationType.SET)); + batteryModificationInfos.setMinQ(new AttributeModification<>(-200., OperationType.SET)); modificationToCreateJson = mapper.writeValueAsString(batteryModificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON)) @@ -159,8 +159,8 @@ public void testMinMaxReactiveLimitsAttributesModification() throws Exception { testNetworkModificationsCount(getGroupId(), 2); // Modifying only max reactive limit - batteryModificationInfos.setMinimumReactivePower(null); - batteryModificationInfos.setMaximumReactivePower(new AttributeModification<>(200., OperationType.SET)); + batteryModificationInfos.setMinQ(null); + batteryModificationInfos.setMaxQ(new AttributeModification<>(200., OperationType.SET)); modificationToCreateJson = mapper.writeValueAsString(batteryModificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON)) @@ -172,7 +172,7 @@ public void testMinMaxReactiveLimitsAttributesModification() throws Exception { testNetworkModificationsCount(getGroupId(), 3); // Modifying both min and max reactive limits - batteryModificationInfos.setMinimumReactivePower(new AttributeModification<>(-1.1, OperationType.SET)); + batteryModificationInfos.setMinQ(new AttributeModification<>(-1.1, OperationType.SET)); modificationToCreateJson = mapper.writeValueAsString(batteryModificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON)) @@ -186,8 +186,8 @@ public void testMinMaxReactiveLimitsAttributesModification() throws Exception { // nothing before reactive limits modification batteryModificationInfos = (BatteryModificationInfos) buildModification(); batteryModificationInfos.setEquipmentName(null); - batteryModificationInfos.setMinActivePower(null); - batteryModificationInfos.setMaxActivePower(null); + batteryModificationInfos.setMinP(null); + batteryModificationInfos.setMaxP(null); modificationToCreateJson = mapper.writeValueAsString(batteryModificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()).andReturn(); @@ -263,11 +263,11 @@ public void testActivePowerZeroOrBetweenMinAndMaxActivePower() throws Exception battery.setTargetP(80.) .setMinP(0.) .setMaxP(100.); - batteryModificationInfos.setActivePowerSetpoint(new AttributeModification<>(155.0, OperationType.SET)); + batteryModificationInfos.setTargetP(new AttributeModification<>(155.0, OperationType.SET)); - Double minActivePower = batteryModificationInfos.getMinActivePower() != null ? batteryModificationInfos.getMinActivePower().getValue() : battery.getMinP(); - Double maxActivePower = batteryModificationInfos.getMaxActivePower() != null ? batteryModificationInfos.getMaxActivePower().getValue() : battery.getMaxP(); - Double activePower = batteryModificationInfos.getActivePowerSetpoint() != null ? batteryModificationInfos.getActivePowerSetpoint().getValue() : battery.getTargetP(); + Double minActivePower = batteryModificationInfos.getMinP() != null ? batteryModificationInfos.getMinP().getValue() : battery.getMinP(); + Double maxActivePower = batteryModificationInfos.getMaxP() != null ? batteryModificationInfos.getMaxP().getValue() : battery.getMaxP(); + Double activePower = batteryModificationInfos.getTargetP() != null ? batteryModificationInfos.getTargetP().getValue() : battery.getTargetP(); String modificationToCreateJson = mapper.writeValueAsString(batteryModificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON)) @@ -309,10 +309,10 @@ public void testMinQGreaterThanMaxQ() throws Exception { oldMaxQ = oldPoint.getMaxQ(); oldMinQ = oldPoint.getMinQ(); } - newPoint.setQminP(300.0); - newPoint.setOldQmaxP(250.0); - maxQ.set(newPoint.getQmaxP() != null ? newPoint.getQmaxP() : oldMaxQ); - minQ.set(newPoint.getQminP() != null ? newPoint.getQminP() : oldMinQ); + newPoint.setMinQ(300.0); + newPoint.setOldMaxQ(250.0); + maxQ.set(newPoint.getMaxQ() != null ? newPoint.getMaxQ() : oldMaxQ); + minQ.set(newPoint.getMinQ() != null ? newPoint.getMinQ() : oldMinQ); }); } String modificationToCreateJson = mapper.writeValueAsString(batteryModificationInfos); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInBusBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInBusBreakerTest.java index f4fab3dc3..9ea44787f 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInBusBreakerTest.java @@ -55,17 +55,17 @@ protected ModificationInfos buildModification() { .voltageLevelId("v1") .busOrBusbarSectionId("bus1") .energySource(EnergySource.HYDRO) - .minActivePower(100.0) - .maxActivePower(600.0) - .ratedNominalPower(10.) - .activePowerSetpoint(400.) - .reactivePowerSetpoint(50.) + .minP(100.0) + .maxP(600.0) + .ratedS(10.) + .targetP(400.) + .targetQ(50.) .voltageRegulationOn(true) - .voltageSetpoint(225.) - .stepUpTransformerReactance(60.0) - .transientReactance(61.0) - .minimumReactivePower(20.0) - .maximumReactivePower(25.0) + .targetV(225.) + .stepUpTransformerX(60.0) + .directTransX(61.0) + .minQ(20.0) + .maxQ(25.0) .plannedActivePowerSetPoint(222.) .marginalCost(0.50) .plannedOutageRate(.85) @@ -94,17 +94,17 @@ protected ModificationInfos buildModificationUpdate() { .voltageLevelId("v1") .busOrBusbarSectionId("bus1") .energySource(EnergySource.SOLAR) - .minActivePower(101.0) - .maxActivePower(601.0) - .ratedNominalPower(11.) - .activePowerSetpoint(401.) - .reactivePowerSetpoint(51.) + .minP(101.0) + .maxP(601.0) + .ratedS(11.) + .targetP(401.) + .targetQ(51.) .voltageRegulationOn(true) - .voltageSetpoint(226.) - .stepUpTransformerReactance(61.0) - .transientReactance(62.0) - .minimumReactivePower(23.0) - .maximumReactivePower(26.0) + .targetV(226.) + .stepUpTransformerX(61.0) + .directTransX(62.0) + .minQ(23.0) + .maxQ(26.0) .plannedActivePowerSetPoint(111.) .marginalCost(0.40) .plannedOutageRate(.45) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInNodeBreakerTest.java index 39435cb2e..dac2e7c5d 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInNodeBreakerTest.java @@ -57,17 +57,17 @@ protected ModificationInfos buildModification() { .voltageLevelId("v2") .busOrBusbarSectionId("1B") .energySource(EnergySource.HYDRO) - .minActivePower(100.0) - .maxActivePower(600.0) - .ratedNominalPower(10.) - .activePowerSetpoint(400.) - .reactivePowerSetpoint(50.) + .minP(100.0) + .maxP(600.0) + .ratedS(10.) + .targetP(400.) + .targetQ(50.) .voltageRegulationOn(true) - .voltageSetpoint(225.) - .stepUpTransformerReactance(60.0) - .transientReactance(61.0) - .minimumReactivePower(20.0) - .maximumReactivePower(25.0) + .targetV(225.) + .stepUpTransformerX(60.0) + .directTransX(61.0) + .minQ(20.0) + .maxQ(25.0) .plannedActivePowerSetPoint(111.) .marginalCost(0.40) .plannedOutageRate(.45) @@ -96,17 +96,17 @@ protected ModificationInfos buildModificationUpdate() { .voltageLevelId("v1") .busOrBusbarSectionId("bus1") .energySource(EnergySource.SOLAR) - .minActivePower(101.0) - .maxActivePower(601.0) - .ratedNominalPower(11.) - .activePowerSetpoint(401.) - .reactivePowerSetpoint(51.) + .minP(101.0) + .maxP(601.0) + .ratedS(11.) + .targetP(401.) + .targetQ(51.) .voltageRegulationOn(true) - .voltageSetpoint(226.) - .stepUpTransformerReactance(61.0) - .transientReactance(62.0) - .minimumReactivePower(23.0) - .maximumReactivePower(26.0) + .targetV(226.) + .stepUpTransformerX(61.0) + .directTransX(62.0) + .minQ(23.0) + .maxQ(26.0) .plannedActivePowerSetPoint(222.) .marginalCost(0.50) .plannedOutageRate(.85) @@ -172,7 +172,7 @@ public void testCreateWithErrors() throws Exception { generatorCreationInfos.setVoltageLevelId("v2"); generatorCreationInfos.setBusOrBusbarSectionId("1B"); - generatorCreationInfos.setMinActivePower(Double.NaN); + generatorCreationInfos.setMinP(Double.NaN); generatorCreationInfosJson = mapper.writeValueAsString(generatorCreationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(generatorCreationInfosJson).contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()); @@ -182,7 +182,7 @@ public void testCreateWithErrors() throws Exception { // invalid min max reactive limit generatorCreationInfos = (GeneratorCreationInfos) buildModification(); generatorCreationInfos.setReactiveCapabilityCurve(false); - generatorCreationInfos.setMinimumReactivePower(Double.NaN); + generatorCreationInfos.setMinQ(Double.NaN); generatorCreationInfosJson = mapper.writeValueAsString(generatorCreationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(generatorCreationInfosJson).contentType(MediaType.APPLICATION_JSON)) @@ -192,7 +192,7 @@ public void testCreateWithErrors() throws Exception { generatorCreationInfos = (GeneratorCreationInfos) buildModification(); generatorCreationInfos.setReactiveCapabilityCurve(false); - generatorCreationInfos.setMaximumReactivePower(Double.NaN); + generatorCreationInfos.setMaxQ(Double.NaN); generatorCreationInfosJson = mapper.writeValueAsString(generatorCreationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(generatorCreationInfosJson).contentType(MediaType.APPLICATION_JSON)) @@ -202,8 +202,8 @@ public void testCreateWithErrors() throws Exception { generatorCreationInfos = (GeneratorCreationInfos) buildModification(); generatorCreationInfos.setReactiveCapabilityCurve(false); - generatorCreationInfos.setMinimumReactivePower(200.); - generatorCreationInfos.setMaximumReactivePower(100.); + generatorCreationInfos.setMinQ(200.); + generatorCreationInfos.setMaxQ(100.); generatorCreationInfosJson = mapper.writeValueAsString(generatorCreationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(generatorCreationInfosJson).contentType(MediaType.APPLICATION_JSON)) @@ -249,7 +249,7 @@ public void testCreateWithErrors() throws Exception { public void testCreateWithShortCircuitErrors() throws Exception { // invalid short circuit transient reactance GeneratorCreationInfos generatorCreationInfos = (GeneratorCreationInfos) buildModification(); - generatorCreationInfos.setTransientReactance(Double.NaN); + generatorCreationInfos.setDirectTransX(Double.NaN); String generatorCreationInfosJson = mapper.writeValueAsString(generatorCreationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(generatorCreationInfosJson).contentType(MediaType.APPLICATION_JSON)) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorModificationTest.java index 4042af07f..7fb7eeeba 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorModificationTest.java @@ -48,28 +48,28 @@ protected ModificationInfos buildModification() { .equipmentId("idGenerator") .energySource(new AttributeModification<>(EnergySource.SOLAR, OperationType.SET)) .equipmentName(new AttributeModification<>("newV1Generator", OperationType.SET)) - .activePowerSetpoint(new AttributeModification<>(80.0, OperationType.SET)) - .reactivePowerSetpoint(new AttributeModification<>(40.0, OperationType.SET)) - .voltageSetpoint(new AttributeModification<>(48.0, OperationType.SET)) + .targetP(new AttributeModification<>(80.0, OperationType.SET)) + .targetQ(new AttributeModification<>(40.0, OperationType.SET)) + .targetV(new AttributeModification<>(48.0, OperationType.SET)) .voltageRegulationOn(new AttributeModification<>(false, OperationType.SET)) - .minActivePower(new AttributeModification<>(0., OperationType.SET)) - .maxActivePower(new AttributeModification<>(100., OperationType.SET)) - .ratedNominalPower(new AttributeModification<>(220., OperationType.SET)) + .minP(new AttributeModification<>(0., OperationType.SET)) + .maxP(new AttributeModification<>(100., OperationType.SET)) + .ratedS(new AttributeModification<>(220., OperationType.SET)) .voltageRegulationType( new AttributeModification<>(VoltageRegulationType.DISTANT, OperationType.SET)) .plannedActivePowerSetPoint(new AttributeModification<>(10., OperationType.SET)) .marginalCost(new AttributeModification<>(0.1, OperationType.SET)) .plannedOutageRate(new AttributeModification<>(.30, OperationType.SET)) .forcedOutageRate(new AttributeModification<>(.40, OperationType.SET)) - .minimumReactivePower(new AttributeModification<>(-100., OperationType.SET)) - .maximumReactivePower(new AttributeModification<>(100., OperationType.SET)) + .minQ(new AttributeModification<>(-100., OperationType.SET)) + .maxQ(new AttributeModification<>(100., OperationType.SET)) .reactiveCapabilityCurvePoints(List.of( new ReactiveCapabilityCurveModificationInfos(0., 0., 100., 100., 0., 0.1), new ReactiveCapabilityCurveModificationInfos(0., 0., 100., 100., 200., 150.))) .droop(new AttributeModification<>(0.1f, OperationType.SET)) .participate(new AttributeModification<>(true, OperationType.SET)) - .transientReactance(new AttributeModification<>(0.1, OperationType.SET)) - .stepUpTransformerReactance(new AttributeModification<>(0.1, OperationType.SET)) + .directTransX(new AttributeModification<>(0.1, OperationType.SET)) + .stepUpTransformerX(new AttributeModification<>(0.1, OperationType.SET)) .regulatingTerminalId(new AttributeModification<>("v2load", OperationType.SET)) .regulatingTerminalType(new AttributeModification<>("LOAD", OperationType.SET)) .regulatingTerminalVlId(new AttributeModification<>("v1", OperationType.SET)) @@ -86,13 +86,13 @@ protected ModificationInfos buildModificationUpdate() { .stashed(false) .energySource(new AttributeModification<>(EnergySource.HYDRO, OperationType.SET)) .equipmentName(new AttributeModification<>("newV1GeneratorEdited", OperationType.SET)) - .activePowerSetpoint(new AttributeModification<>(81.0, OperationType.SET)) - .reactivePowerSetpoint(new AttributeModification<>(41.0, OperationType.SET)) - .voltageSetpoint(new AttributeModification<>(49.0, OperationType.SET)) + .targetP(new AttributeModification<>(81.0, OperationType.SET)) + .targetQ(new AttributeModification<>(41.0, OperationType.SET)) + .targetV(new AttributeModification<>(49.0, OperationType.SET)) .voltageRegulationOn(new AttributeModification<>(true, OperationType.SET)) - .minActivePower(new AttributeModification<>(1., OperationType.SET)) - .maxActivePower(new AttributeModification<>(102., OperationType.SET)) - .ratedNominalPower(new AttributeModification<>(221., OperationType.SET)) + .minP(new AttributeModification<>(1., OperationType.SET)) + .maxP(new AttributeModification<>(102., OperationType.SET)) + .ratedS(new AttributeModification<>(221., OperationType.SET)) .reactiveCapabilityCurve(new AttributeModification<>(false, OperationType.SET)) .voltageRegulationType( new AttributeModification<>(VoltageRegulationType.LOCAL, OperationType.SET)) @@ -149,8 +149,8 @@ public void testMinMaxReactiveLimitsAttributesModification() throws Exception { //setting ReactiveCapabilityCurve to false with null min and max reactive limits generatorModificationInfos.setReactiveCapabilityCurve(new AttributeModification<>(false, OperationType.SET)); - generatorModificationInfos.setMaximumReactivePower(null); - generatorModificationInfos.setMinimumReactivePower(null); + generatorModificationInfos.setMaxQ(null); + generatorModificationInfos.setMinQ(null); //setting ReactiveCapabilityCurvePoints for the generator we are modifying Generator generator = getNetwork().getGenerator("idGenerator"); generator.newReactiveCapabilityCurve() @@ -176,7 +176,7 @@ public void testMinMaxReactiveLimitsAttributesModification() throws Exception { testNetworkModificationsCount(getGroupId(), 1); // Modifying only min reactive limit - generatorModificationInfos.setMinimumReactivePower(new AttributeModification<>(-200., OperationType.SET)); + generatorModificationInfos.setMinQ(new AttributeModification<>(-200., OperationType.SET)); modificationToCreateJson = mapper.writeValueAsString(generatorModificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON)) @@ -188,8 +188,8 @@ public void testMinMaxReactiveLimitsAttributesModification() throws Exception { testNetworkModificationsCount(getGroupId(), 2); // Modifying only max reactive limit - generatorModificationInfos.setMinimumReactivePower(null); - generatorModificationInfos.setMaximumReactivePower(new AttributeModification<>(200., OperationType.SET)); + generatorModificationInfos.setMinQ(null); + generatorModificationInfos.setMaxQ(new AttributeModification<>(200., OperationType.SET)); modificationToCreateJson = mapper.writeValueAsString(generatorModificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON)) @@ -201,7 +201,7 @@ public void testMinMaxReactiveLimitsAttributesModification() throws Exception { testNetworkModificationsCount(getGroupId(), 3); // Modifying both min and max reactive limits - generatorModificationInfos.setMinimumReactivePower(new AttributeModification<>(-1.1, OperationType.SET)); + generatorModificationInfos.setMinQ(new AttributeModification<>(-1.1, OperationType.SET)); modificationToCreateJson = mapper.writeValueAsString(generatorModificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON)) @@ -216,9 +216,9 @@ public void testMinMaxReactiveLimitsAttributesModification() throws Exception { generatorModificationInfos = (GeneratorModificationInfos) buildModification(); generatorModificationInfos.setEnergySource(null); generatorModificationInfos.setEquipmentName(null); - generatorModificationInfos.setMinActivePower(null); - generatorModificationInfos.setMaxActivePower(null); - generatorModificationInfos.setRatedNominalPower(null); + generatorModificationInfos.setMinP(null); + generatorModificationInfos.setMaxP(null); + generatorModificationInfos.setRatedS(null); modificationToCreateJson = mapper.writeValueAsString(generatorModificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()).andReturn(); @@ -232,7 +232,7 @@ public void testGeneratorShortCircuitAttributesModification() throws Exception { GeneratorModificationInfos generatorModificationInfos = (GeneratorModificationInfos) buildModification(); // setting transient reactance to null, modifying only step up transformer reactance - generatorModificationInfos.setTransientReactance(null); + generatorModificationInfos.setDirectTransX(null); String modificationToCreateJson = mapper.writeValueAsString(generatorModificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON)) @@ -244,8 +244,8 @@ public void testGeneratorShortCircuitAttributesModification() throws Exception { testNetworkModificationsCount(getGroupId(), 1); // setting step up transformer reactance to null, modifying only transient reactance - generatorModificationInfos.setTransientReactance(new AttributeModification<>(1.1, OperationType.SET)); - generatorModificationInfos.setStepUpTransformerReactance(null); + generatorModificationInfos.setDirectTransX(new AttributeModification<>(1.1, OperationType.SET)); + generatorModificationInfos.setStepUpTransformerX(null); modificationToCreateJson = mapper.writeValueAsString(generatorModificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON)) @@ -299,8 +299,8 @@ public void testGeneratorVoltageRegulatorAttributesModification() throws Excepti // no modification in setpoints generatorModificationInfos = (GeneratorModificationInfos) buildModification(); - generatorModificationInfos.setActivePowerSetpoint(null); - generatorModificationInfos.setReactivePowerSetpoint(null); + generatorModificationInfos.setTargetP(null); + generatorModificationInfos.setTargetQ(null); generatorModificationInfos.setVoltageRegulationOn(null); generatorModificationInfos.setParticipate(null); @@ -385,10 +385,10 @@ public void testMinQGreaterThanMaxQ() throws Exception { oldMaxQ = oldPoint.getMaxQ(); oldMinQ = oldPoint.getMinQ(); } - newPoint.setQminP(300.0); - newPoint.setOldQmaxP(250.0); - maxQ.set(newPoint.getQmaxP() != null ? newPoint.getQmaxP() : oldMaxQ); - minQ.set(newPoint.getQminP() != null ? newPoint.getQminP() : oldMinQ); + newPoint.setMinQ(300.0); + newPoint.setOldMaxQ(250.0); + maxQ.set(newPoint.getMaxQ() != null ? newPoint.getMaxQ() : oldMaxQ); + minQ.set(newPoint.getMinQ() != null ? newPoint.getMinQ() : oldMinQ); }); } String modificationToCreateJson = mapper.writeValueAsString(generatorModificationInfos); @@ -406,11 +406,11 @@ public void testActivePowerZeroOrBetweenMinAndMaxActivePower() throws Exception .setMinP(10.) .setMaxP(150.); - generatorModificationInfos.setActivePowerSetpoint(new AttributeModification<>(110.0, OperationType.SET)); + generatorModificationInfos.setTargetP(new AttributeModification<>(110.0, OperationType.SET)); - Double minActivePower = generatorModificationInfos.getMinActivePower() != null ? generatorModificationInfos.getMinActivePower().getValue() : generator.getMinP(); - Double maxActivePower = generatorModificationInfos.getMaxActivePower() != null ? generatorModificationInfos.getMaxActivePower().getValue() : generator.getMaxP(); - Double activePower = generatorModificationInfos.getActivePowerSetpoint() != null ? generatorModificationInfos.getActivePowerSetpoint().getValue() : generator.getTargetP(); + Double minActivePower = generatorModificationInfos.getMinP() != null ? generatorModificationInfos.getMinP().getValue() : generator.getMinP(); + Double maxActivePower = generatorModificationInfos.getMaxP() != null ? generatorModificationInfos.getMaxP().getValue() : generator.getMaxP(); + Double activePower = generatorModificationInfos.getTargetP() != null ? generatorModificationInfos.getTargetP().getValue() : generator.getTargetP(); String modificationToCreateJson = mapper.writeValueAsString(generatorModificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON)) @@ -425,7 +425,7 @@ public void testUnsetAttributes() throws Exception { GeneratorModificationInfos generatorModificationInfos = (GeneratorModificationInfos) buildModification(); // Unset TargetV - generatorModificationInfos.setVoltageSetpoint(new AttributeModification<>(null, OperationType.UNSET)); + generatorModificationInfos.setTargetV(new AttributeModification<>(null, OperationType.UNSET)); String generatorModificationInfosJson = mapper.writeValueAsString(generatorModificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(generatorModificationInfosJson).contentType(MediaType.APPLICATION_JSON)) @@ -434,8 +434,8 @@ public void testUnsetAttributes() throws Exception { //Unset TargetQ (voltage regulation needs to be turned on and voltage setpoint to have a value) generatorModificationInfos.setVoltageRegulationOn(new AttributeModification<>(true, OperationType.SET)); - generatorModificationInfos.setVoltageSetpoint(new AttributeModification<>(44.0, OperationType.SET)); - generatorModificationInfos.setReactivePowerSetpoint(new AttributeModification<>(null, OperationType.UNSET)); + generatorModificationInfos.setTargetV(new AttributeModification<>(44.0, OperationType.SET)); + generatorModificationInfos.setTargetQ(new AttributeModification<>(null, OperationType.UNSET)); generatorModificationInfosJson = mapper.writeValueAsString(generatorModificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(generatorModificationInfosJson).contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/ModificationUtilsTest.java b/src/test/java/org/gridsuite/modification/server/modifications/ModificationUtilsTest.java index fc6060118..1aacc1b81 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/ModificationUtilsTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/ModificationUtilsTest.java @@ -25,13 +25,13 @@ class ModificationUtilsTest { @Test void testCheckMaxQGreaterThanMinQ() { - var point1 = ReactiveCapabilityCurveModificationInfos.builder().oldQminP(2.0).oldQmaxP(1.0).qminP(10.0).qmaxP(20.0).build(); + var point1 = ReactiveCapabilityCurveModificationInfos.builder().oldMinQ(2.0).oldMaxQ(1.0).minQ(10.0).maxQ(20.0).build(); ModificationUtils.getInstance().checkMaxQGreaterThanMinQ( Collections.singletonList(point1), MODIFY_GENERATOR_ERROR, "old KO, new OK: No exception should be thrown"); - var point2 = ReactiveCapabilityCurveModificationInfos.builder().oldQminP(1.0).oldQmaxP(2.0).qminP(20.0).qmaxP(10.0).build(); + var point2 = ReactiveCapabilityCurveModificationInfos.builder().oldMinQ(1.0).oldMaxQ(2.0).minQ(20.0).maxQ(10.0).build(); var exception = (NetworkModificationException) catchRuntimeException(() -> ModificationUtils.getInstance().checkMaxQGreaterThanMinQ( Collections.singletonList(point2), MODIFY_GENERATOR_ERROR, @@ -41,7 +41,7 @@ void testCheckMaxQGreaterThanMinQ() { assertThat(exception) .hasMessageEndingWith("old OK, new KO: maximum reactive power 10.0 is expected to be greater than or equal to minimum reactive power 20.0"); - var point3 = ReactiveCapabilityCurveModificationInfos.builder().qminP(20.0).qmaxP(10.0).build(); + var point3 = ReactiveCapabilityCurveModificationInfos.builder().minQ(20.0).maxQ(10.0).build(); exception = (NetworkModificationException) catchRuntimeException(() -> ModificationUtils.getInstance().checkMaxQGreaterThanMinQ( Collections.singletonList(point3), MODIFY_GENERATOR_ERROR, @@ -51,19 +51,19 @@ void testCheckMaxQGreaterThanMinQ() { assertThat(exception) .hasMessageEndingWith("old null, new KO: maximum reactive power 10.0 is expected to be greater than or equal to minimum reactive power 20.0"); - var point4 = ReactiveCapabilityCurveModificationInfos.builder().qminP(10.0).qmaxP(20.0).build(); + var point4 = ReactiveCapabilityCurveModificationInfos.builder().minQ(10.0).maxQ(20.0).build(); ModificationUtils.getInstance().checkMaxQGreaterThanMinQ( Collections.singletonList(point4), MODIFY_GENERATOR_ERROR, "old null, new OK: No exception should be thrown"); - var point5 = ReactiveCapabilityCurveModificationInfos.builder().oldQminP(10.0).oldQmaxP(20.0).build(); + var point5 = ReactiveCapabilityCurveModificationInfos.builder().oldMinQ(10.0).oldMaxQ(20.0).build(); ModificationUtils.getInstance().checkMaxQGreaterThanMinQ( Collections.singletonList(point5), MODIFY_GENERATOR_ERROR, "old OK, new null: No exception should be thrown"); - var point6 = ReactiveCapabilityCurveModificationInfos.builder().oldQminP(20.0).oldQmaxP(10.0).build(); + var point6 = ReactiveCapabilityCurveModificationInfos.builder().oldMinQ(20.0).oldMaxQ(10.0).build(); exception = (NetworkModificationException) catchRuntimeException(() -> ModificationUtils.getInstance().checkMaxQGreaterThanMinQ( Collections.singletonList(point6), MODIFY_GENERATOR_ERROR, diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VoltageInitModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VoltageInitModificationTest.java index 4d4389b3e..a87d45748 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/VoltageInitModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/VoltageInitModificationTest.java @@ -88,11 +88,11 @@ protected ModificationInfos buildModification() { .generators(List.of( VoltageInitGeneratorModificationInfos.builder() .generatorId("idGenerator") - .reactivePowerSetpoint(10.) + .targetQ(10.) .build(), VoltageInitGeneratorModificationInfos.builder() .generatorId("newGen") - .voltageSetpoint(226.) + .targetV(226.) .build())) .transformers(List.of( VoltageInitTransformerModificationInfos.builder() @@ -183,11 +183,11 @@ protected ModificationInfos buildModificationUpdate() { .generators(List.of( VoltageInitGeneratorModificationInfos.builder() .generatorId("idGenerator") - .voltageSetpoint(370.) + .targetV(370.) .build(), VoltageInitGeneratorModificationInfos.builder() .generatorId("v5generator") - .reactivePowerSetpoint(15.) + .targetQ(15.) .build())) .transformers(List.of( VoltageInitTransformerModificationInfos.builder() diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VscCreationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VscCreationTest.java index 185931d78..8c28ba0f6 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/VscCreationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/VscCreationTest.java @@ -81,9 +81,9 @@ private ConverterStationCreationInfos buildConverterStationWithMinMaxReactiveLim .voltageRegulationOn(false) .reactivePower(23.) .reactiveCapabilityCurve(false) - .maximumReactivePower(66.) + .maxQ(66.) .lossFactor(4F) - .minimumReactivePower(55.) + .minQ(55.) .voltage(34.) .voltageLevelId("v2") .busOrBusbarSectionId("1.1") @@ -97,13 +97,13 @@ private ConverterStationCreationInfos buildConverterStationWithMinMaxReactiveLim private ConverterStationCreationInfos buildConverterStationWithReactiveCapabilityCurve() { var point1 = ReactiveCapabilityCurveCreationInfos.builder() .p(0.4) - .qmaxP(3.) - .qminP(0.) + .maxQ(3.) + .minQ(0.) .build(); var point2 = ReactiveCapabilityCurveCreationInfos.builder() .p(0.6) - .qmaxP(2.) - .qminP(1.1) + .maxQ(2.) + .minQ(1.1) .build(); return ConverterStationCreationInfos.builder() @@ -246,7 +246,7 @@ public void testCreateWithErrors() throws Exception { converterStationCreationInfos = buildConverterStationWithMinMaxReactiveLimits(); converterStationCreationInfos.setConnectionPosition(35); converterStationCreationInfos.setReactiveCapabilityCurve(false); - converterStationCreationInfos.setMinimumReactivePower(Double.NaN); + converterStationCreationInfos.setMinQ(Double.NaN); vscCreationInfos.setConverterStation1(converterStationCreationInfos); vscCreationInfosJson = mapper.writeValueAsString(vscCreationInfos); @@ -259,7 +259,7 @@ public void testCreateWithErrors() throws Exception { converterStationCreationInfos = buildConverterStationWithMinMaxReactiveLimits(); converterStationCreationInfos.setConnectionPosition(66); converterStationCreationInfos.setReactiveCapabilityCurve(false); - converterStationCreationInfos.setMaximumReactivePower(Double.NaN); + converterStationCreationInfos.setMaxQ(Double.NaN); vscCreationInfos.setConverterStation1(converterStationCreationInfos); vscCreationInfosJson = mapper.writeValueAsString(vscCreationInfos); @@ -272,8 +272,8 @@ public void testCreateWithErrors() throws Exception { converterStationCreationInfos = buildConverterStationWithMinMaxReactiveLimits(); converterStationCreationInfos.setConnectionPosition(15); converterStationCreationInfos.setReactiveCapabilityCurve(false); - converterStationCreationInfos.setMinimumReactivePower(200.); - converterStationCreationInfos.setMaximumReactivePower(100.); + converterStationCreationInfos.setMinQ(200.); + converterStationCreationInfos.setMaxQ(100.); vscCreationInfos.setConverterStation1(converterStationCreationInfos); vscCreationInfosJson = mapper.writeValueAsString(vscCreationInfos); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/tabularcreations/TabularGeneratorCreationsTest.java b/src/test/java/org/gridsuite/modification/server/modifications/tabularcreations/TabularGeneratorCreationsTest.java index 732caa626..e7be9f3cd 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/tabularcreations/TabularGeneratorCreationsTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/tabularcreations/TabularGeneratorCreationsTest.java @@ -58,54 +58,54 @@ protected ModificationInfos buildModification() { GeneratorCreationInfos.builder() .equipmentId("id1").equipmentName("name1").voltageLevelId("v1").busOrBusbarSectionId("1.1") .connectionName("feederId1").connectionDirection(ConnectablePosition.Direction.TOP).connectionPosition(100).connected(true) - .energySource(EnergySource.HYDRO).minActivePower(0).maxActivePower(100).ratedNominalPower(10D) - .activePowerSetpoint(50).reactivePowerSetpoint(20D).voltageRegulationOn(true).voltageSetpoint(370D) + .energySource(EnergySource.HYDRO).minP(0).maxP(100).ratedS(10D) + .targetP(50).targetQ(20D).voltageRegulationOn(true).targetV(370D) .plannedActivePowerSetPoint(70D).marginalCost(5D).plannedOutageRate(8D).forcedOutageRate(3D) - .minimumReactivePower(7D).maximumReactivePower(13D).participate(true).droop(0.5F) - .transientReactance(5D).stepUpTransformerReactance(45D) + .minQ(7D).maxQ(13D).participate(true).droop(0.5F) + .directTransX(5D).stepUpTransformerX(45D) .regulatingTerminalId("v2load").regulatingTerminalType("LOAD").regulatingTerminalVlId("v2").qPercent(35D) .reactiveCapabilityCurve(false).reactiveCapabilityCurvePoints(List.of()) .build(), GeneratorCreationInfos.builder() .equipmentId("id2").equipmentName("name2").voltageLevelId("v2").busOrBusbarSectionId("1A") .connectionName("feederId2").connectionDirection(ConnectablePosition.Direction.BOTTOM).connectionPosition(100).connected(false) - .energySource(EnergySource.NUCLEAR).minActivePower(0).maxActivePower(500) - .activePowerSetpoint(300).reactivePowerSetpoint(400D).voltageRegulationOn(false) + .energySource(EnergySource.NUCLEAR).minP(0).maxP(500) + .targetP(300).targetQ(400D).voltageRegulationOn(false) .plannedActivePowerSetPoint(200D).forcedOutageRate(3D) - .minimumReactivePower(7D).participate(false) - .stepUpTransformerReactance(45D) + .minQ(7D).participate(false) + .stepUpTransformerX(45D) .reactiveCapabilityCurve(false).reactiveCapabilityCurvePoints(List.of()) .build(), GeneratorCreationInfos.builder() .equipmentId("id3").voltageLevelId("v3").busOrBusbarSectionId("3A") .connectionName("feederId3").connectionDirection(ConnectablePosition.Direction.BOTTOM).connectionPosition(100).connected(false).connected(true) - .energySource(EnergySource.WIND).minActivePower(0).maxActivePower(200) - .activePowerSetpoint(150).voltageRegulationOn(true).voltageSetpoint(375D) + .energySource(EnergySource.WIND).minP(0).maxP(200) + .targetP(150).voltageRegulationOn(true).targetV(375D) .reactiveCapabilityCurve(false).reactiveCapabilityCurvePoints(List.of()) .build(), GeneratorCreationInfos.builder() .equipmentId("id4").equipmentName("name4").voltageLevelId("v4").busOrBusbarSectionId("1.A") .connectionName("feederId4").connectionDirection(ConnectablePosition.Direction.BOTTOM).connectionPosition(100).connected(false) - .energySource(EnergySource.OTHER).minActivePower(0).maxActivePower(800) - .activePowerSetpoint(700).reactivePowerSetpoint(20D).voltageRegulationOn(true).voltageSetpoint(373D) + .energySource(EnergySource.OTHER).minP(0).maxP(800) + .targetP(700).targetQ(20D).voltageRegulationOn(true).targetV(373D) .marginalCost(5D).plannedOutageRate(8D) .participate(false) - .transientReactance(5D) + .directTransX(5D) .regulatingTerminalId("v5load").regulatingTerminalType("LOAD").regulatingTerminalVlId("v5").qPercent(75D) .reactiveCapabilityCurve(false).reactiveCapabilityCurvePoints(List.of()) .build(), GeneratorCreationInfos.builder() .equipmentId("id5").voltageLevelId("v5").busOrBusbarSectionId("1A1") .connectionName("name5").connectionDirection(ConnectablePosition.Direction.BOTTOM).connectionPosition(100).connected(false).connected(true) - .energySource(EnergySource.WIND).minActivePower(0).maxActivePower(200) - .activePowerSetpoint(150).voltageRegulationOn(true).voltageSetpoint(375D) + .energySource(EnergySource.WIND).minP(0).maxP(200) + .targetP(150).voltageRegulationOn(true).targetV(375D) .reactiveCapabilityCurve(false).reactiveCapabilityCurvePoints(List.of()) .build(), GeneratorCreationInfos.builder() .equipmentId("v5generator").voltageLevelId("v5").busOrBusbarSectionId("1A1") .connectionName("v5generator").connectionDirection(ConnectablePosition.Direction.BOTTOM).connectionPosition(100).connected(false).connected(true) - .energySource(EnergySource.WIND).minActivePower(0).maxActivePower(200) - .activePowerSetpoint(150).voltageRegulationOn(true).voltageSetpoint(375D) + .energySource(EnergySource.WIND).minP(0).maxP(200) + .targetP(150).voltageRegulationOn(true).targetV(375D) .reactiveCapabilityCurve(false).reactiveCapabilityCurvePoints(List.of()) .build() ); @@ -122,22 +122,22 @@ protected ModificationInfos buildModificationUpdate() { GeneratorCreationInfos.builder() .equipmentId("id1").equipmentName("name11").voltageLevelId("v1").busOrBusbarSectionId("1.1") .connectionName("feederId11").connectionDirection(ConnectablePosition.Direction.BOTTOM).connectionPosition(200).connected(false) - .energySource(EnergySource.SOLAR).minActivePower(0).maxActivePower(300).ratedNominalPower(20D) - .activePowerSetpoint(50).reactivePowerSetpoint(20D).voltageRegulationOn(true).voltageSetpoint(370D) + .energySource(EnergySource.SOLAR).minP(0).maxP(300).ratedS(20D) + .targetP(50).targetQ(20D).voltageRegulationOn(true).targetV(370D) .plannedActivePowerSetPoint(80D).marginalCost(3D).plannedOutageRate(12D).forcedOutageRate(1D) - .minimumReactivePower(13D).maximumReactivePower(11D).participate(false) - .transientReactance(8D).stepUpTransformerReactance(44D) + .minQ(13D).maxQ(11D).participate(false) + .directTransX(8D).stepUpTransformerX(44D) .regulatingTerminalId("v5load").regulatingTerminalType("LOAD").regulatingTerminalVlId("v5").qPercent(37D) .reactiveCapabilityCurve(false).reactiveCapabilityCurvePoints(List.of()) .build(), GeneratorCreationInfos.builder() .equipmentId("id4").equipmentName("name44").voltageLevelId("v4").busOrBusbarSectionId("1.A") .connectionName("feederId44").connectionDirection(ConnectablePosition.Direction.TOP).connectionPosition(300).connected(false) - .energySource(EnergySource.THERMAL).minActivePower(0).maxActivePower(800) - .activePowerSetpoint(350).reactivePowerSetpoint(10D).voltageRegulationOn(false) + .energySource(EnergySource.THERMAL).minP(0).maxP(800) + .targetP(350).targetQ(10D).voltageRegulationOn(false) .marginalCost(25D).plannedOutageRate(18D) .participate(true).droop(5F) - .transientReactance(3D) + .directTransX(3D) .regulatingTerminalId("v2load").regulatingTerminalType("LOAD").regulatingTerminalVlId("v2").qPercent(75D) .reactiveCapabilityCurve(false).reactiveCapabilityCurvePoints(List.of()) .build() @@ -189,11 +189,11 @@ public void testCheckSqlRequestsCount() throws Exception { GeneratorCreationInfos.builder() .equipmentId("id5").equipmentName("name5").voltageLevelId("v5").busOrBusbarSectionId("1A1") .connectionName("feederId5").connectionDirection(ConnectablePosition.Direction.TOP).connectionPosition(100).connected(true) - .energySource(EnergySource.HYDRO).minActivePower(0).maxActivePower(100).ratedNominalPower(10D) - .activePowerSetpoint(50).reactivePowerSetpoint(20D).voltageRegulationOn(true).voltageSetpoint(370D) + .energySource(EnergySource.HYDRO).minP(0).maxP(100).ratedS(10D) + .targetP(50).targetQ(20D).voltageRegulationOn(true).targetV(370D) .plannedActivePowerSetPoint(70D).marginalCost(5D).plannedOutageRate(8D).forcedOutageRate(3D) - .minimumReactivePower(7D).maximumReactivePower(13D).participate(true).droop(0.5F) - .transientReactance(5D).stepUpTransformerReactance(45D) + .minQ(7D).maxQ(13D).participate(true).droop(0.5F) + .directTransX(5D).stepUpTransformerX(45D) .regulatingTerminalId("v2load").regulatingTerminalType("LOAD").regulatingTerminalVlId("v2").qPercent(35D) .reactiveCapabilityCurve(false) .build() @@ -225,22 +225,22 @@ public void testAllModificationsHaveSucceeded() throws Exception { GeneratorCreationInfos.builder() .equipmentId("id1").equipmentName("name1").voltageLevelId("v1").busOrBusbarSectionId("1.1") .connectionName("feederId1").connectionDirection(ConnectablePosition.Direction.TOP).connectionPosition(100).connected(true) - .energySource(EnergySource.HYDRO).minActivePower(0).maxActivePower(100).ratedNominalPower(10D) - .activePowerSetpoint(50).reactivePowerSetpoint(20D).voltageRegulationOn(true).voltageSetpoint(370D) + .energySource(EnergySource.HYDRO).minP(0).maxP(100).ratedS(10D) + .targetP(50).targetQ(20D).voltageRegulationOn(true).targetV(370D) .plannedActivePowerSetPoint(70D).marginalCost(5D).plannedOutageRate(8D).forcedOutageRate(3D) - .minimumReactivePower(7D).maximumReactivePower(13D).participate(true).droop(0.5F) - .transientReactance(5D).stepUpTransformerReactance(45D) + .minQ(7D).maxQ(13D).participate(true).droop(0.5F) + .directTransX(5D).stepUpTransformerX(45D) .regulatingTerminalId("v2load").regulatingTerminalType("LOAD").regulatingTerminalVlId("v2").qPercent(35D) .reactiveCapabilityCurve(false).reactiveCapabilityCurvePoints(List.of()) .build(), GeneratorCreationInfos.builder() .equipmentId("id2").equipmentName("name2").voltageLevelId("v2").busOrBusbarSectionId("1A") .connectionName("feederId2").connectionDirection(ConnectablePosition.Direction.BOTTOM).connectionPosition(100).connected(false) - .energySource(EnergySource.NUCLEAR).minActivePower(0).maxActivePower(500) - .activePowerSetpoint(300).reactivePowerSetpoint(400D).voltageRegulationOn(false) + .energySource(EnergySource.NUCLEAR).minP(0).maxP(500) + .targetP(300).targetQ(400D).voltageRegulationOn(false) .plannedActivePowerSetPoint(200D).forcedOutageRate(3D) - .minimumReactivePower(7D).participate(false) - .stepUpTransformerReactance(45D) + .minQ(7D).participate(false) + .stepUpTransformerX(45D) .reactiveCapabilityCurve(false).reactiveCapabilityCurvePoints(List.of()) .build() ); @@ -263,33 +263,33 @@ public void testAllModificationsHaveFailed() throws Exception { GeneratorCreationInfos.builder() .equipmentId("id1").equipmentName("name1").voltageLevelId("unknown_vl").busOrBusbarSectionId("1.1") .connectionName("feederId1").connectionDirection(ConnectablePosition.Direction.TOP).connectionPosition(100).connected(true) - .energySource(EnergySource.HYDRO).minActivePower(0).maxActivePower(100).ratedNominalPower(10D) - .activePowerSetpoint(50).reactivePowerSetpoint(20D).voltageRegulationOn(true).voltageSetpoint(370D) + .energySource(EnergySource.HYDRO).minP(0).maxP(100).ratedS(10D) + .targetP(50).targetQ(20D).voltageRegulationOn(true).targetV(370D) .plannedActivePowerSetPoint(70D).marginalCost(5D).plannedOutageRate(8D).forcedOutageRate(3D) - .minimumReactivePower(7D).maximumReactivePower(13D).participate(true).droop(0.5F) - .transientReactance(5D).stepUpTransformerReactance(45D) + .minQ(7D).maxQ(13D).participate(true).droop(0.5F) + .directTransX(5D).stepUpTransformerX(45D) .regulatingTerminalId("v2load").regulatingTerminalType("LOAD").regulatingTerminalVlId("v2").qPercent(35D) .reactiveCapabilityCurve(false) .build(), GeneratorCreationInfos.builder() .equipmentId("id2").equipmentName("name2").voltageLevelId("v1").busOrBusbarSectionId("unknown_bbs") .connectionName("feederId1").connectionDirection(ConnectablePosition.Direction.TOP).connectionPosition(100).connected(true) - .energySource(EnergySource.HYDRO).minActivePower(0).maxActivePower(100).ratedNominalPower(10D) - .activePowerSetpoint(50).reactivePowerSetpoint(20D).voltageRegulationOn(true).voltageSetpoint(370D) + .energySource(EnergySource.HYDRO).minP(0).maxP(100).ratedS(10D) + .targetP(50).targetQ(20D).voltageRegulationOn(true).targetV(370D) .plannedActivePowerSetPoint(70D).marginalCost(5D).plannedOutageRate(8D).forcedOutageRate(3D) - .minimumReactivePower(7D).maximumReactivePower(13D).participate(true).droop(0.5F) - .transientReactance(5D).stepUpTransformerReactance(45D) + .minQ(7D).maxQ(13D).participate(true).droop(0.5F) + .directTransX(5D).stepUpTransformerX(45D) .regulatingTerminalId("v2load").regulatingTerminalType("LOAD").regulatingTerminalVlId("v2").qPercent(35D) .reactiveCapabilityCurve(false) .build(), GeneratorCreationInfos.builder() .equipmentId("id3").equipmentName("name3").voltageLevelId("v1").busOrBusbarSectionId("1.1") .connectionName("feederId3").connectionDirection(ConnectablePosition.Direction.TOP).connectionPosition(100).connected(true) - .energySource(EnergySource.HYDRO).minActivePower(0).maxActivePower(-100).ratedNominalPower(10D) - .activePowerSetpoint(50).reactivePowerSetpoint(20D).voltageRegulationOn(true).voltageSetpoint(370D) + .energySource(EnergySource.HYDRO).minP(0).maxP(-100).ratedS(10D) + .targetP(50).targetQ(20D).voltageRegulationOn(true).targetV(370D) .plannedActivePowerSetPoint(70D).marginalCost(5D).plannedOutageRate(8D).forcedOutageRate(3D) - .minimumReactivePower(7D).maximumReactivePower(13D).participate(true).droop(0.5F) - .transientReactance(5D).stepUpTransformerReactance(45D) + .minQ(7D).maxQ(13D).participate(true).droop(0.5F) + .directTransX(5D).stepUpTransformerX(45D) .regulatingTerminalId("v2load").regulatingTerminalType("LOAD").regulatingTerminalVlId("v2").qPercent(35D) .reactiveCapabilityCurve(false) .build() diff --git a/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularBatteryModificationsTest.java b/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularBatteryModificationsTest.java index f34debafd..3b4842761 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularBatteryModificationsTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularBatteryModificationsTest.java @@ -41,10 +41,10 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { List modifications = List.of( - BatteryModificationInfos.builder().equipmentId("v1Battery").maxActivePower(new AttributeModification<>(50., OperationType.SET)).build(), - BatteryModificationInfos.builder().equipmentId("v2Battery").minActivePower(new AttributeModification<>(5., OperationType.SET)).build(), - BatteryModificationInfos.builder().equipmentId("v3Battery").activePowerSetpoint(new AttributeModification<>(5., OperationType.SET)).build(), - BatteryModificationInfos.builder().equipmentId("unknownBattery").reactivePowerSetpoint(new AttributeModification<>(500., OperationType.SET)).build() + BatteryModificationInfos.builder().equipmentId("v1Battery").maxP(new AttributeModification<>(50., OperationType.SET)).build(), + BatteryModificationInfos.builder().equipmentId("v2Battery").minP(new AttributeModification<>(5., OperationType.SET)).build(), + BatteryModificationInfos.builder().equipmentId("v3Battery").targetP(new AttributeModification<>(5., OperationType.SET)).build(), + BatteryModificationInfos.builder().equipmentId("unknownBattery").targetQ(new AttributeModification<>(500., OperationType.SET)).build() ); return TabularModificationInfos.builder() .modificationType(ModificationType.BATTERY_MODIFICATION) @@ -56,9 +56,9 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { List modifications = List.of( - BatteryModificationInfos.builder().equipmentId("v1Battery").minActivePower(new AttributeModification<>(3., OperationType.SET)).build(), - BatteryModificationInfos.builder().equipmentId("v2Battery").maxActivePower(new AttributeModification<>(30., OperationType.SET)).build(), - BatteryModificationInfos.builder().equipmentId("v3Battery").activePowerSetpoint(new AttributeModification<>(6., OperationType.SET)).build() + BatteryModificationInfos.builder().equipmentId("v1Battery").minP(new AttributeModification<>(3., OperationType.SET)).build(), + BatteryModificationInfos.builder().equipmentId("v2Battery").maxP(new AttributeModification<>(30., OperationType.SET)).build(), + BatteryModificationInfos.builder().equipmentId("v3Battery").targetP(new AttributeModification<>(6., OperationType.SET)).build() ); return TabularModificationInfos.builder() .modificationType(ModificationType.BATTERY_MODIFICATION) diff --git a/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularGeneratorModificationsTest.java b/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularGeneratorModificationsTest.java index 7e9c42d17..928575889 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularGeneratorModificationsTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularGeneratorModificationsTest.java @@ -52,10 +52,10 @@ protected Network createNetwork(UUID networkUuid) { @Override protected ModificationInfos buildModification() { List modifications = List.of( - GeneratorModificationInfos.builder().equipmentId("idGenerator").maxActivePower(new AttributeModification<>(500., OperationType.SET)).build(), - GeneratorModificationInfos.builder().equipmentId("v5generator").maxActivePower(new AttributeModification<>(500., OperationType.SET)).build(), - GeneratorModificationInfos.builder().equipmentId("v6generator").maxActivePower(new AttributeModification<>(500., OperationType.SET)).build(), - GeneratorModificationInfos.builder().equipmentId("unknownGenerator").maxActivePower(new AttributeModification<>(500., OperationType.SET)).build() + GeneratorModificationInfos.builder().equipmentId("idGenerator").maxP(new AttributeModification<>(500., OperationType.SET)).build(), + GeneratorModificationInfos.builder().equipmentId("v5generator").maxP(new AttributeModification<>(500., OperationType.SET)).build(), + GeneratorModificationInfos.builder().equipmentId("v6generator").maxP(new AttributeModification<>(500., OperationType.SET)).build(), + GeneratorModificationInfos.builder().equipmentId("unknownGenerator").maxP(new AttributeModification<>(500., OperationType.SET)).build() ); return TabularModificationInfos.builder() .modificationType(ModificationType.GENERATOR_MODIFICATION) @@ -67,9 +67,9 @@ protected ModificationInfos buildModification() { @Override protected ModificationInfos buildModificationUpdate() { List modifications = List.of( - GeneratorModificationInfos.builder().equipmentId("idGenerator").maxActivePower(new AttributeModification<>(300., OperationType.SET)).build(), - GeneratorModificationInfos.builder().equipmentId("v5generator").maxActivePower(new AttributeModification<>(300., OperationType.SET)).build(), - GeneratorModificationInfos.builder().equipmentId("v6generator").maxActivePower(new AttributeModification<>(300., OperationType.SET)).build() + GeneratorModificationInfos.builder().equipmentId("idGenerator").maxP(new AttributeModification<>(300., OperationType.SET)).build(), + GeneratorModificationInfos.builder().equipmentId("v5generator").maxP(new AttributeModification<>(300., OperationType.SET)).build(), + GeneratorModificationInfos.builder().equipmentId("v6generator").maxP(new AttributeModification<>(300., OperationType.SET)).build() ); return TabularModificationInfos.builder() .modificationType(ModificationType.GENERATOR_MODIFICATION) @@ -558,9 +558,9 @@ public void testSqlRequestsCountOnDeleteNetworkModificationsByIds2() throws Exce @Test public void testAllModificationsHaveFailed() throws Exception { List modifications = List.of( - GeneratorModificationInfos.builder().equipmentId("idGenerator").maxActivePower(new AttributeModification<>(-300., OperationType.SET)).build(), - GeneratorModificationInfos.builder().equipmentId("v5generator").maxActivePower(new AttributeModification<>(-300., OperationType.SET)).build(), - GeneratorModificationInfos.builder().equipmentId("v6generator").maxActivePower(new AttributeModification<>(-300., OperationType.SET)).build() + GeneratorModificationInfos.builder().equipmentId("idGenerator").maxP(new AttributeModification<>(-300., OperationType.SET)).build(), + GeneratorModificationInfos.builder().equipmentId("v5generator").maxP(new AttributeModification<>(-300., OperationType.SET)).build(), + GeneratorModificationInfos.builder().equipmentId("v6generator").maxP(new AttributeModification<>(-300., OperationType.SET)).build() ); ModificationInfos modificationInfos = TabularModificationInfos.builder() .modificationType(ModificationType.GENERATOR_MODIFICATION) @@ -621,14 +621,14 @@ private List createGeneratorModificationList(int qty) { .mapToObj(i -> (ModificationInfos) GeneratorModificationInfos.builder() .equipmentId(UUID.randomUUID().toString()) - .maxActivePower(new AttributeModification<>(300., OperationType.SET)) + .maxP(new AttributeModification<>(300., OperationType.SET)) .properties(List.of( ModificationCreation.getFreeProperty(), ModificationCreation.getFreeProperty("test", "value"))) .reactiveCapabilityCurvePoints(List.of( ReactiveCapabilityCurveModificationInfos.builder().p(10.).oldP(15.).build(), - ReactiveCapabilityCurveModificationInfos.builder().qmaxP(12.).oldQmaxP(17.).build(), - ReactiveCapabilityCurveModificationInfos.builder().qminP(5.).qmaxP(5.).p(5.).build())) + ReactiveCapabilityCurveModificationInfos.builder().maxQ(12.).oldMaxQ(17.).build(), + ReactiveCapabilityCurveModificationInfos.builder().minQ(5.).maxQ(5.).p(5.).build())) .build()) .toList(); } diff --git a/src/test/java/org/gridsuite/modification/server/service/BuildTest.java b/src/test/java/org/gridsuite/modification/server/service/BuildTest.java index f9f504d28..9913d2bfd 100644 --- a/src/test/java/org/gridsuite/modification/server/service/BuildTest.java +++ b/src/test/java/org/gridsuite/modification/server/service/BuildTest.java @@ -529,16 +529,16 @@ public void runBuildTest() throws Exception { entities2.add(GeneratorCreationInfos.builder() .equipmentId(NEW_GENERATOR_ID).equipmentName(NEW_GENERATOR_ID) .energySource(EnergySource.HYDRO).voltageLevelId("v2") - .busOrBusbarSectionId("1A").minActivePower(0) - .maxActivePower(500).ratedNominalPower(1.) - .activePowerSetpoint(100).reactivePowerSetpoint(50.) - .voltageRegulationOn(true).voltageSetpoint(225.) + .busOrBusbarSectionId("1A").minP(0) + .maxP(500).ratedS(1.) + .targetP(100).targetQ(50.) + .voltageRegulationOn(true).targetV(225.) .plannedActivePowerSetPoint(80.) .marginalCost(82.) .plannedOutageRate(83.).forcedOutageRate(84.) - .minimumReactivePower(20.).maximumReactivePower(50.) - .participate(true).droop(9F).transientReactance(35.) - .stepUpTransformerReactance(25.).regulatingTerminalId("v2load") + .minQ(20.).maxQ(50.) + .participate(true).droop(9F).directTransX(35.) + .stepUpTransformerX(25.).regulatingTerminalId("v2load") .regulatingTerminalType("LOAD").regulatingTerminalVlId("v2") .qPercent(25.).reactiveCapabilityCurve(false).reactiveCapabilityCurvePoints(List.of()) .connectionName("Top").connectionDirection(ConnectablePosition.Direction.TOP) diff --git a/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java b/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java index 7f763fc3d..812a28313 100644 --- a/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java +++ b/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java @@ -278,16 +278,16 @@ public void testGeneratorCreation() { var createGeneratorEntity1 = GeneratorCreationInfos.builder() .equipmentId("idGenerator1").equipmentName("nameGenerator1") .energySource(EnergySource.HYDRO).voltageLevelId("vlId1") - .busOrBusbarSectionId("busId1").minActivePower(100.0) - .maxActivePower(800.0).ratedNominalPower(10.) - .activePowerSetpoint(500).reactivePowerSetpoint(50.) - .voltageRegulationOn(true).voltageSetpoint(225.) + .busOrBusbarSectionId("busId1").minP(100.0) + .maxP(800.0).ratedS(10.) + .targetP(500).targetQ(50.) + .voltageRegulationOn(true).targetV(225.) .plannedActivePowerSetPoint(20.) .marginalCost(20.) .plannedOutageRate(20.).forcedOutageRate(20.) - .minimumReactivePower(30.).maximumReactivePower(50.) - .participate(true).droop(8f).transientReactance(37.) - .stepUpTransformerReactance(46.).regulatingTerminalId("testTerminalId1") + .minQ(30.).maxQ(50.) + .participate(true).droop(8f).directTransX(37.) + .stepUpTransformerX(46.).regulatingTerminalId("testTerminalId1") .regulatingTerminalType("LINE").regulatingTerminalVlId("idVlTest1") .qPercent(25.).reactiveCapabilityCurve(false).reactiveCapabilityCurvePoints(List.of()) .connectionName("Top").connectionDirection(ConnectablePosition.Direction.TOP) @@ -295,15 +295,15 @@ public void testGeneratorCreation() { var createGeneratorEntity2 = GeneratorCreationInfos.builder() .equipmentId("idGenerator2").equipmentName("nameGenerator2") .energySource(EnergySource.SOLAR).voltageLevelId("vlId2") - .busOrBusbarSectionId("busId2").minActivePower(0.0) - .maxActivePower(300.0).ratedNominalPower(5.) - .activePowerSetpoint(150).reactivePowerSetpoint(30.) - .voltageRegulationOn(false).voltageSetpoint(380.) + .busOrBusbarSectionId("busId2").minP(0.0) + .maxP(300.0).ratedS(5.) + .targetP(150).targetQ(30.) + .voltageRegulationOn(false).targetV(380.) .plannedActivePowerSetPoint(30.) .marginalCost(30.) .plannedOutageRate(30.).forcedOutageRate(30.) - .participate(false).droop(null).transientReactance(37.) - .stepUpTransformerReactance(46.).regulatingTerminalId(null) + .participate(false).droop(null).directTransX(37.) + .stepUpTransformerX(46.).regulatingTerminalId(null) .regulatingTerminalType(null).regulatingTerminalVlId("idVlTest2") .qPercent(25.).reactiveCapabilityCurve(false).reactiveCapabilityCurvePoints(List.of()) .connectionName("Bot").connectionDirection(ConnectablePosition.Direction.BOTTOM) @@ -312,11 +312,11 @@ public void testGeneratorCreation() { var createGeneratorEntity3 = GeneratorCreationInfos.builder() .equipmentId("idGenerator3").equipmentName("nameGenerator3") .energySource(EnergySource.OTHER).voltageLevelId("vlId3") - .busOrBusbarSectionId("busId3").minActivePower(10.0) - .maxActivePower(900.0).ratedNominalPower(20.) - .voltageRegulationOn(true).voltageSetpoint(150.).marginalCost(null) - .participate(false).droop(null).transientReactance(null) - .stepUpTransformerReactance(null).regulatingTerminalId("testTerminalId2") + .busOrBusbarSectionId("busId3").minP(10.0) + .maxP(900.0).ratedS(20.) + .voltageRegulationOn(true).targetV(150.).marginalCost(null) + .participate(false).droop(null).directTransX(null) + .stepUpTransformerX(null).regulatingTerminalId("testTerminalId2") .regulatingTerminalType("BATTERY").regulatingTerminalVlId("idVlTest2") .qPercent(25.).reactiveCapabilityCurve(true).reactiveCapabilityCurvePoints(List.of(new ReactiveCapabilityCurveCreationInfos(33., 44., 55.))) .connectionName("Top").connectionDirection(ConnectablePosition.Direction.TOP) @@ -1104,11 +1104,11 @@ public void testVoltageInitModification() { .generators(List.of( VoltageInitGeneratorModificationInfos.builder() .generatorId("G1") - .reactivePowerSetpoint(10.) + .targetQ(10.) .build(), VoltageInitGeneratorModificationInfos.builder() .generatorId("G2") - .voltageSetpoint(226.) + .targetV(226.) .build())) .transformers(List.of( VoltageInitTransformerModificationInfos.builder() diff --git a/src/test/java/org/gridsuite/modification/server/utils/ModificationCreation.java b/src/test/java/org/gridsuite/modification/server/utils/ModificationCreation.java index 71440f1bc..c1f981d38 100644 --- a/src/test/java/org/gridsuite/modification/server/utils/ModificationCreation.java +++ b/src/test/java/org/gridsuite/modification/server/utils/ModificationCreation.java @@ -48,12 +48,12 @@ public static BatteryCreationInfos getCreationBattery(String vlId, String batter .equipmentName(batteryName) .voltageLevelId(vlId) .busOrBusbarSectionId(busOrBusbarSectionId) - .minActivePower(100.0) - .maxActivePower(600.0) - .activePowerSetpoint(400.) - .reactivePowerSetpoint(50.) - .minimumReactivePower(20.0) - .maximumReactivePower(25.0) + .minP(100.0) + .maxP(600.0) + .targetP(400.) + .targetQ(50.) + .minQ(20.0) + .maxQ(25.0) .droop(5f) .participate(true) .reactiveCapabilityCurve(true) @@ -73,17 +73,17 @@ public static GeneratorCreationInfos getCreationGenerator(String vlId, String ge .voltageLevelId(vlId) .busOrBusbarSectionId(busOrBusbarSectionId) .energySource(EnergySource.HYDRO) - .minActivePower(100.0) - .maxActivePower(600.0) - .ratedNominalPower(10.) - .activePowerSetpoint(400.) - .reactivePowerSetpoint(50.) + .minP(100.0) + .maxP(600.0) + .ratedS(10.) + .targetP(400.) + .targetQ(50.) .voltageRegulationOn(true) - .voltageSetpoint(225.) - .stepUpTransformerReactance(60.0) - .transientReactance(61.0) - .minimumReactivePower(20.0) - .maximumReactivePower(25.0) + .targetV(225.) + .stepUpTransformerX(60.0) + .directTransX(61.0) + .minQ(20.0) + .maxQ(25.0) .droop(5f) .participate(true) .regulatingTerminalId(regulatingTerminalId)