Adjust some labels in modification filters (#86)

Signed-off-by: Igor PIROG <[email protected]>
Co-authored-by: basseche <[email protected]>

Author: ipirog

src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/LoadField.java

@@ -21,24 +21,24 @@
  */
 public enum LoadField {
     LOAD_TYPE,
-    ACTIVE_POWER,
-    REACTIVE_POWER;
+    ACTIVE_POWER_SET_POINT,
+    REACTIVE_POWER_SET_POINT;
 
     public static String getReferenceValue(Load load, String loadField) {
         LoadField field = LoadField.valueOf(loadField);
         return switch (field) {
             case LOAD_TYPE -> load.getLoadType().name();
-            case ACTIVE_POWER -> String.valueOf(load.getP0());
-            case REACTIVE_POWER -> String.valueOf(load.getQ0());
+            case ACTIVE_POWER_SET_POINT -> String.valueOf(load.getP0());
+            case REACTIVE_POWER_SET_POINT -> String.valueOf(load.getQ0());
         };
     }
 
     public static void setNewValue(Load load, String loadField, @NotNull String newValue) {
         LoadField field = LoadField.valueOf(loadField);
         switch (field) {
             case LOAD_TYPE -> load.setLoadType(LoadType.valueOf(newValue));
-            case ACTIVE_POWER -> modifyP0(load, new AttributeModification<>(Double.parseDouble(newValue), OperationType.SET), null);
-            case REACTIVE_POWER -> modifyQ0(load, new AttributeModification<>(Double.parseDouble(newValue), OperationType.SET), null);
+            case ACTIVE_POWER_SET_POINT -> modifyP0(load, new AttributeModification<>(Double.parseDouble(newValue), OperationType.SET), null);
+            case REACTIVE_POWER_SET_POINT -> modifyQ0(load, new AttributeModification<>(Double.parseDouble(newValue), OperationType.SET), null);
         }
     }
 }

src/test/java/org/gridsuite/modification/modifications/byfilter/assignment/LoadModificationByAssignmentTest.java

@@ -60,13 +60,13 @@ protected Map<UUID, FilterEquipments> getTestFilters() {
     @Override
     protected List<AssignmentInfos<?>> getAssignmentInfos() {
         DoubleAssignmentInfos assignmentInfos1 = DoubleAssignmentInfos.builder()
-                .editedField(LoadField.ACTIVE_POWER.name())
+                .editedField(LoadField.ACTIVE_POWER_SET_POINT.name())
                 .value(25.)
                 .filters(List.of(filter1))
                 .build();
 
         DoubleAssignmentInfos assignmentInfos2 = DoubleAssignmentInfos.builder()
-                .editedField(LoadField.REACTIVE_POWER.name())
+                .editedField(LoadField.REACTIVE_POWER_SET_POINT.name())
                 .value(2.5)
                 .filters(List.of(filter2))
                 .build();

src/test/java/org/gridsuite/modification/modifications/byfilter/formula/LoadByFormulaModificationTest.java

@@ -57,17 +57,17 @@ protected Map<UUID, FilterEquipments> getTestFilters() {
 
     @Override
     protected List<FormulaInfos> getFormulaInfos() {
-        FormulaInfos formulaInfos1 = getFormulaInfo(LoadField.ACTIVE_POWER.name(),
+        FormulaInfos formulaInfos1 = getFormulaInfo(LoadField.ACTIVE_POWER_SET_POINT.name(),
                 List.of(filter1),
                 Operator.ADDITION,
-                ReferenceFieldOrValue.builder().equipmentField(LoadField.ACTIVE_POWER.name()).build(),
+                ReferenceFieldOrValue.builder().equipmentField(LoadField.ACTIVE_POWER_SET_POINT.name()).build(),
                 ReferenceFieldOrValue.builder().value(25.).build()
         );
 
-        FormulaInfos formulaInfos2 = getFormulaInfo(LoadField.REACTIVE_POWER.name(),
+        FormulaInfos formulaInfos2 = getFormulaInfo(LoadField.REACTIVE_POWER_SET_POINT.name(),
                 List.of(filter2),
                 Operator.MULTIPLICATION,
-                ReferenceFieldOrValue.builder().equipmentField(LoadField.REACTIVE_POWER.name()).build(),
+                ReferenceFieldOrValue.builder().equipmentField(LoadField.REACTIVE_POWER_SET_POINT.name()).build(),
                 ReferenceFieldOrValue.builder().value(2.5).build()
         );
         return List.of(formulaInfos1, formulaInfos2);