Delete startup cost field (#270)

ghazwarhili · web-flow · commit 75d7f9fec908 · 2023-06-20T16:12:38.000+02:00
delete startUpCost field
Signed-off-by: Ghazwa REHILI &lt;ghazwarhili@gmail.com&gt;
diff --git a/src/main/java/org/gridsuite/modification/server/dto/GeneratorCreationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/GeneratorCreationInfos.java
@@ -64,9 +64,6 @@ public class GeneratorCreationInfos extends InjectionCreationInfos {
     @Schema(description = "Planning active power set point")
     private Double plannedActivePowerSetPoint;
 
-    @Schema(description = "Startup cost")
-    private Double startupCost;
-
     @Schema(description = "Marginal cost")
     private Double marginalCost;
 
diff --git a/src/main/java/org/gridsuite/modification/server/dto/GeneratorModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/GeneratorModificationInfos.java
@@ -61,9 +61,6 @@ public class GeneratorModificationInfos extends InjectionModificationInfos {
     @Schema(description = "Planning active power set point")
     private AttributeModification<Double> plannedActivePowerSetPoint;
 
-    @Schema(description = "Startup cost")
-    private AttributeModification<Double> startupCost;
-
     @Schema(description = "Marginal cost")
     private AttributeModification<Double> marginalCost;
 
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
@@ -55,9 +55,6 @@ public class GeneratorCreationEntity extends InjectionCreationEntity {
     @Column(name = "plannedActivePowerSetPoint")
     private Double plannedActivePowerSetPoint;
 
-    @Column(name = "startupCost")
-    private Double startupCost;
-
     @Column(name = "marginalCost")
     private Double marginalCost;
 
@@ -134,7 +131,6 @@ private void assignAttributes(GeneratorCreationInfos generatorCreationInfos) {
         this.voltageRegulationOn = generatorCreationInfos.isVoltageRegulationOn();
         this.voltageSetpoint = generatorCreationInfos.getVoltageSetpoint();
         this.plannedActivePowerSetPoint = generatorCreationInfos.getPlannedActivePowerSetPoint();
-        this.startupCost = generatorCreationInfos.getStartupCost();
         this.marginalCost = generatorCreationInfos.getMarginalCost();
         this.plannedOutageRate = generatorCreationInfos.getPlannedOutageRate();
         this.forcedOutageRate = generatorCreationInfos.getForcedOutageRate();
@@ -195,7 +191,6 @@ public GeneratorCreationInfos toModificationInfos() {
             .voltageRegulationOn(isVoltageRegulationOn())
             .voltageSetpoint(getVoltageSetpoint())
             .plannedActivePowerSetPoint(getPlannedActivePowerSetPoint())
-            .startupCost(getStartupCost())
             .marginalCost(getMarginalCost())
             .plannedOutageRate(getPlannedOutageRate())
             .forcedOutageRate(getForcedOutageRate())
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
@@ -94,13 +94,6 @@ public class GeneratorModificationEntity extends InjectionModificationEntity {
     })
     DoubleModificationEmbedded plannedActivePowerSetPoint;
 
-    @Embedded
-    @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "startupCost")),
-        @AttributeOverride(name = "opType", column = @Column(name = "startupCostOp"))
-    })
-    DoubleModificationEmbedded startupCost;
-
     @Embedded
     @AttributeOverrides(value = {
         @AttributeOverride(name = "value", column = @Column(name = "marginalCost")),
@@ -231,7 +224,6 @@ private void assignAttributes(GeneratorModificationInfos generatorModificationIn
         this.voltageRegulationOn = new BooleanModificationEmbedded(generatorModificationInfos.getVoltageRegulationOn());
         this.voltageSetpoint = new DoubleModificationEmbedded(generatorModificationInfos.getVoltageSetpoint());
         this.plannedActivePowerSetPoint = new DoubleModificationEmbedded(generatorModificationInfos.getPlannedActivePowerSetPoint());
-        this.startupCost = new DoubleModificationEmbedded(generatorModificationInfos.getStartupCost());
         this.marginalCost = new DoubleModificationEmbedded(generatorModificationInfos.getMarginalCost());
         this.plannedOutageRate = new DoubleModificationEmbedded(generatorModificationInfos.getPlannedOutageRate());
         this.forcedOutageRate = new DoubleModificationEmbedded(generatorModificationInfos.getForcedOutageRate());
@@ -290,7 +282,6 @@ public GeneratorModificationInfos toModificationInfos() {
                 .voltageRegulationOn(toAttributeModification(getVoltageRegulationOn()))
                 .voltageSetpoint(toAttributeModification(getVoltageSetpoint()))
                 .plannedActivePowerSetPoint(toAttributeModification(getPlannedActivePowerSetPoint()))
-                .startupCost(toAttributeModification(getStartupCost()))
                 .marginalCost(toAttributeModification(getMarginalCost()))
                 .plannedOutageRate(toAttributeModification(getPlannedOutageRate()))
                 .forcedOutageRate(toAttributeModification(getForcedOutageRate()))
diff --git a/src/main/java/org/gridsuite/modification/server/modifications/GeneratorCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/GeneratorCreation.java
@@ -443,15 +443,13 @@ private void createGeneratorShortCircuit(GeneratorCreationInfos generatorCreatio
 
     private void createGeneratorStartUp(GeneratorCreationInfos generatorCreationInfos, Generator generator, Reporter subReporter) {
         if (generatorCreationInfos.getPlannedActivePowerSetPoint() != null
-                || generatorCreationInfos.getStartupCost() != null
                 || generatorCreationInfos.getMarginalCost() != null
                 || generatorCreationInfos.getPlannedOutageRate() != null
                 || generatorCreationInfos.getForcedOutageRate() != null) {
             List<Report> startupReports = new ArrayList<>();
             try {
                 generator.newExtension(GeneratorStartupAdderImpl.class)
                         .withPlannedActivePowerSetpoint(nanIfNull(generatorCreationInfos.getPlannedActivePowerSetPoint()))
-                        .withStartupCost(nanIfNull(generatorCreationInfos.getStartupCost()))
                         .withMarginalCost(nanIfNull(generatorCreationInfos.getMarginalCost()))
                         .withPlannedOutageRate(nanIfNull(generatorCreationInfos.getPlannedOutageRate()))
                         .withForcedOutageRate(nanIfNull(generatorCreationInfos.getForcedOutageRate()))
@@ -460,10 +458,6 @@ private void createGeneratorStartUp(GeneratorCreationInfos generatorCreationInfo
                     startupReports.add(ModificationUtils.getInstance().buildCreationReport(
                         generatorCreationInfos.getPlannedActivePowerSetPoint(), "Planning active power set point"));
                 }
-                if (generatorCreationInfos.getStartupCost() != null) {
-                    startupReports.add(ModificationUtils.getInstance().buildCreationReport(
-                        generatorCreationInfos.getStartupCost(), "Startup cost"));
-                }
                 if (generatorCreationInfos.getMarginalCost() != null) {
                     startupReports.add(ModificationUtils.getInstance().buildCreationReport(
                         generatorCreationInfos.getMarginalCost(), "Marginal cost"));
diff --git a/src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java b/src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java
@@ -453,13 +453,11 @@ private void modifyGeneratorStartUpAttributes(GeneratorModificationInfos modific
         GeneratorStartup generatorStartup = generator.getExtension(GeneratorStartup.class);
         GeneratorStartupAdder generatorStartupAdder = generator.newExtension(GeneratorStartupAdder.class);
         boolean plannedActivePowerSetPointUpdated = addPlannedActivePowerSetPoint(modificationInfos, generatorStartupAdder, generatorStartup, reports);
-        boolean startupCostUpdated = addStartupCost(modificationInfos, generatorStartupAdder, generatorStartup, reports);
         boolean marginalCostUpdated = addMarginalCost(modificationInfos, generatorStartupAdder, generatorStartup, reports);
         boolean plannedOutageRateUpdated = addPlannedOutageRate(modificationInfos, generatorStartupAdder, generatorStartup, reports);
         boolean forcedOutageRateUpdated = addForcedOutageRate(modificationInfos, generatorStartupAdder, generatorStartup, reports);
 
         if (plannedActivePowerSetPointUpdated ||
-                startupCostUpdated ||
                 marginalCostUpdated ||
                 plannedOutageRateUpdated ||
                 forcedOutageRateUpdated) {
@@ -516,22 +514,6 @@ private boolean addMarginalCost(GeneratorModificationInfos modificationInfos, Ge
         return false;
     }
 
-    private boolean addStartupCost(GeneratorModificationInfos modificationInfos, GeneratorStartupAdder generatorStartupAdder, GeneratorStartup generatorStartup, List<Report> reports) {
-        Double oldStartupCost = generatorStartup != null ? generatorStartup.getStartupCost() : Double.NaN;
-        if (modificationInfos.getStartupCost() != null) {
-            generatorStartupAdder
-                    .withStartupCost(modificationInfos.getStartupCost().getValue());
-            reports.add(ModificationUtils.getInstance().buildModificationReport(oldStartupCost,
-                    modificationInfos.getStartupCost().getValue(),
-                    "Startup cost"));
-            return true;
-        } else {
-            generatorStartupAdder
-                    .withStartupCost(oldStartupCost);
-        }
-        return false;
-    }
-
     private boolean addPlannedActivePowerSetPoint(GeneratorModificationInfos modificationInfos, GeneratorStartupAdder generatorStartupAdder, GeneratorStartup generatorStartup, List<Report> reports) {
         Double oldPlannedActivePowerSetPoint = generatorStartup != null ? generatorStartup.getPlannedActivePowerSetpoint() : Double.NaN;
         if (modificationInfos.getPlannedActivePowerSetPoint() != null) {
diff --git a/src/main/resources/db/changelog/changesets/changelog_20230620T132951Z.xml b/src/main/resources/db/changelog/changesets/changelog_20230620T132951Z.xml
@@ -0,0 +1,12 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-4.1.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
+    <changeSet author="rehiligha (generated)" id="1687267810063-5">
+        <dropColumn columnName="STARTUP_COST" tableName="GENERATOR_CREATION"/>
+    </changeSet>
+    <changeSet author="rehiligha (generated)" id="1687267810063-6">
+        <dropColumn columnName="STARTUP_COST" tableName="GENERATOR_MODIFICATION"/>
+    </changeSet>
+    <changeSet author="rehiligha (generated)" id="1687267810063-7">
+        <dropColumn columnName="STARTUP_COST_OP" tableName="GENERATOR_MODIFICATION"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -146,4 +146,7 @@ databaseChangeLog:
       relativeToChangelogFile: true
   - include:
       file: changesets/changelog_20230529T102224Z.xml
-      relativeToChangelogFile: true
+      relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20230620T132951Z.xml
+      relativeToChangelogFile: true
diff --git a/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java b/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java
@@ -530,7 +530,6 @@ public void createGeneratorWithStartup() {
         generatorStartup = network.getGenerator("idGenerator21").getExtension(GeneratorStartup.class);
         assertNotNull(generatorStartup);
         assertEquals(Double.NaN, generatorStartup.getPlannedActivePowerSetpoint(), 0);
-        assertEquals(Double.NaN, generatorStartup.getStartupCost(), 0);
         assertEquals(8., generatorStartup.getMarginalCost(), 0);
         assertEquals(Double.NaN, generatorStartup.getPlannedOutageRate(), 0);
         assertEquals(Double.NaN, generatorStartup.getForcedOutageRate(), 0);
@@ -546,7 +545,6 @@ public void createGeneratorWithStartup() {
         generatorStartup = networkStoreService.getNetwork(TEST_NETWORK_BUS_BREAKER_ID).getGenerator("idGenerator3").getExtension(GeneratorStartup.class);
         assertNotNull(generatorStartup);
         assertEquals(Double.NaN, generatorStartup.getPlannedActivePowerSetpoint(), 0);
-        assertEquals(Double.NaN, generatorStartup.getStartupCost(), 0);
         assertEquals(Double.NaN, generatorStartup.getMarginalCost(), 0);
         assertEquals(80., generatorStartup.getPlannedOutageRate(), 0);
         assertEquals(Double.NaN, generatorStartup.getForcedOutageRate(), 0);
diff --git a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInBusBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInBusBreakerTest.java
@@ -56,7 +56,6 @@ protected ModificationInfos buildModification() {
                 .minimumReactivePower(20.0)
                 .maximumReactivePower(25.0)
                 .plannedActivePowerSetPoint(222.)
-                .startupCost(301.)
                 .marginalCost(0.50)
                 .plannedOutageRate(.85)
                 .forcedOutageRate(.96)
@@ -94,7 +93,6 @@ protected ModificationInfos buildModificationUpdate() {
                 .minimumReactivePower(23.0)
                 .maximumReactivePower(26.0)
                 .plannedActivePowerSetPoint(111.)
-                .startupCost(201.)
                 .marginalCost(0.40)
                 .plannedOutageRate(.45)
                 .forcedOutageRate(.66)
diff --git a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorCreationInNodeBreakerTest.java
@@ -60,7 +60,6 @@ protected ModificationInfos buildModification() {
                 .minimumReactivePower(20.0)
                 .maximumReactivePower(25.0)
                 .plannedActivePowerSetPoint(111.)
-                .startupCost(201.)
                 .marginalCost(0.40)
                 .plannedOutageRate(.45)
                 .forcedOutageRate(.66)
@@ -98,7 +97,6 @@ protected ModificationInfos buildModificationUpdate() {
                 .minimumReactivePower(23.0)
                 .maximumReactivePower(26.0)
                 .plannedActivePowerSetPoint(222.)
-                .startupCost(301.)
                 .marginalCost(0.50)
                 .plannedOutageRate(.85)
                 .forcedOutageRate(.96)
diff --git a/src/test/java/org/gridsuite/modification/server/modifications/GeneratorModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/GeneratorModificationTest.java
@@ -54,7 +54,6 @@ protected ModificationInfos buildModification() {
                 .voltageRegulationType(
                         new AttributeModification<>(VoltageRegulationType.DISTANT, OperationType.SET))
                 .plannedActivePowerSetPoint(new AttributeModification<>(10., OperationType.SET))
-                .startupCost(new AttributeModification<>(20., OperationType.SET))
                 .marginalCost(new AttributeModification<>(0.1, OperationType.SET))
                 .plannedOutageRate(new AttributeModification<>(.30, OperationType.SET))
                 .forcedOutageRate(new AttributeModification<>(.40, OperationType.SET))
@@ -93,7 +92,6 @@ protected ModificationInfos buildModificationUpdate() {
                 .voltageRegulationType(
                                 new AttributeModification<>(VoltageRegulationType.LOCAL, OperationType.SET))
                 .plannedActivePowerSetPoint(new AttributeModification<>(111., OperationType.SET))
-                .startupCost(new AttributeModification<>(201., OperationType.SET))
                 .marginalCost(new AttributeModification<>(0.40, OperationType.SET))
                 .plannedOutageRate(new AttributeModification<>(.45, OperationType.SET))
                 .forcedOutageRate(new AttributeModification<>(.66, OperationType.SET))
@@ -119,7 +117,6 @@ protected void assertNetworkAfterCreation() {
         assertEquals(220., modifiedGenerator.getRatedS());
         assertEquals(0.1, modifiedGenerator.getExtension(GeneratorStartup.class).getMarginalCost());
         assertEquals(10., modifiedGenerator.getExtension(GeneratorStartup.class).getPlannedActivePowerSetpoint());
-        assertEquals(20., modifiedGenerator.getExtension(GeneratorStartup.class).getStartupCost());
         assertEquals(0.30, modifiedGenerator.getExtension(GeneratorStartup.class).getPlannedOutageRate());
         assertEquals(0.40, modifiedGenerator.getExtension(GeneratorStartup.class).getForcedOutageRate());
         assertEquals(0.1f, modifiedGenerator.getExtension(ActivePowerControl.class).getDroop());
diff --git a/src/test/java/org/gridsuite/modification/server/service/BuildTest.java b/src/test/java/org/gridsuite/modification/server/service/BuildTest.java
@@ -375,7 +375,7 @@ public void runBuildTest() {
                 .activePowerSetpoint(100).reactivePowerSetpoint(50.)
                 .voltageRegulationOn(true).voltageSetpoint(225.)
                 .plannedActivePowerSetPoint(80.)
-                .startupCost(81.).marginalCost(82.)
+                .marginalCost(82.)
                 .plannedOutageRate(83.).forcedOutageRate(84.)
                 .minimumReactivePower(20.).maximumReactivePower(50.)
                 .participate(true).droop(9F).transientReactance(35.)
@@ -583,7 +583,6 @@ public void runBuildTest() {
         assertEquals(500., network.getGenerator(NEW_GENERATOR_ID).getMaxP(), 0.1);
         assertEquals(100., network.getGenerator(NEW_GENERATOR_ID).getTargetP(), 0.1);
         assertEquals(80., network.getGenerator(NEW_GENERATOR_ID).getExtension(GeneratorStartup.class).getPlannedActivePowerSetpoint(), 0);
-        assertEquals(81., network.getGenerator(NEW_GENERATOR_ID).getExtension(GeneratorStartup.class).getStartupCost(), 0);
         assertEquals(82., network.getGenerator(NEW_GENERATOR_ID).getExtension(GeneratorStartup.class).getMarginalCost(), 0);
         assertEquals(83., network.getGenerator(NEW_GENERATOR_ID).getExtension(GeneratorStartup.class).getPlannedOutageRate(), 0);
         assertEquals(84., network.getGenerator(NEW_GENERATOR_ID).getExtension(GeneratorStartup.class).getForcedOutageRate(), 0);
diff --git a/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java b/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java
@@ -285,7 +285,7 @@ public void testGeneratorCreation() {
                 .activePowerSetpoint(500).reactivePowerSetpoint(50.)
                 .voltageRegulationOn(true).voltageSetpoint(225.)
                 .plannedActivePowerSetPoint(20.)
-                .startupCost(20.).marginalCost(20.)
+                .marginalCost(20.)
                 .plannedOutageRate(20.).forcedOutageRate(20.)
                 .minimumReactivePower(30.).maximumReactivePower(50.)
                 .participate(true).droop(8f).transientReactance(37.)
@@ -302,7 +302,7 @@ public void testGeneratorCreation() {
                 .activePowerSetpoint(150).reactivePowerSetpoint(30.)
                 .voltageRegulationOn(false).voltageSetpoint(380.)
                 .plannedActivePowerSetPoint(30.)
-                .startupCost(30.).marginalCost(30.)
+                .marginalCost(30.)
                 .plannedOutageRate(30.).forcedOutageRate(30.)
                 .participate(false).droop(null).transientReactance(37.)
                 .stepUpTransformerReactance(46.).regulatingTerminalId(null)
diff --git a/src/test/java/org/gridsuite/modification/server/utils/MatcherGeneratorCreationInfos.java b/src/test/java/org/gridsuite/modification/server/utils/MatcherGeneratorCreationInfos.java
@@ -50,7 +50,6 @@ public boolean matchesSafely(GeneratorCreationInfos m) {
             && Objects.equals(m.getMaximumReactivePower(), reference.getMaximumReactivePower())
             && Objects.equals(m.getMinimumReactivePower(), reference.getMinimumReactivePower())
             && Objects.equals(m.getPlannedActivePowerSetPoint(), reference.getPlannedActivePowerSetPoint())
-            && Objects.equals(m.getStartupCost(), reference.getStartupCost())
             && Objects.equals(m.getMarginalCost(), reference.getMarginalCost())
             && Objects.equals(m.getPlannedOutageRate(), reference.getPlannedOutageRate())
             && Objects.equals(m.getForcedOutageRate(), reference.getForcedOutageRate())
diff --git a/src/test/java/org/gridsuite/modification/server/utils/MatcherGeneratorModificationInfos.java b/src/test/java/org/gridsuite/modification/server/utils/MatcherGeneratorModificationInfos.java
@@ -49,7 +49,6 @@ public boolean matchesSafely(GeneratorModificationInfos m) {
                 && Objects.equals(m.getMaximumReactivePower(), reference.getMaximumReactivePower())
                 && Objects.equals(m.getMinimumReactivePower(), reference.getMinimumReactivePower())
                 && Objects.equals(m.getPlannedActivePowerSetPoint(), reference.getPlannedActivePowerSetPoint())
-                && Objects.equals(m.getStartupCost(), reference.getStartupCost())
                 && Objects.equals(m.getMarginalCost(), reference.getMarginalCost())
                 && Objects.equals(m.getPlannedOutageRate(), reference.getPlannedOutageRate())
                 && Objects.equals(m.getForcedOutageRate(), reference.getForcedOutageRate())
