Merge branch 'main' into fix/order_constraint

Author: RoxaneChen02

data/crac/crac-io/crac-io-fb-constraint/src/main/java/com/powsybl/openrao/data/crac/io/fbconstraint/HvdcLineRemedialActionAdder.java

@@ -11,6 +11,8 @@
 import com.powsybl.openrao.data.crac.api.InstantKind;
 import com.powsybl.openrao.data.crac.api.RemedialActionAdder;
 import com.powsybl.openrao.data.crac.api.rangeaction.InjectionRangeActionAdder;
+import com.powsybl.openrao.data.crac.io.commons.api.ElementaryCreationContext;
+import com.powsybl.openrao.data.crac.io.commons.api.StandardElementaryCreationContext;
 import com.powsybl.openrao.data.crac.io.commons.ucte.UcteGeneratorHelper;
 import com.powsybl.openrao.data.crac.io.commons.ucte.UcteNetworkAnalyzer;
 import com.powsybl.openrao.data.crac.io.fbconstraint.xsd.ActionsSetType;
@@ -174,10 +176,26 @@ private void addUsageRules(final RemedialActionAdder<?> remedialActionAdder, fin
 
     private void addComplexVariantCreationContexts(final FbConstraintCreationContext creationContext) {
         if (fromComplexVariantReader != null) {
-            creationContext.addComplexVariantCreationContext(fromComplexVariantReader.getComplexVariantCreationContext());
+            creationContext.addComplexVariantCreationContext(
+                getHvdcCreationContext(fromComplexVariantReader.getComplexVariantCreationContext(), fromNodeName)
+            );
         }
         if (toComplexVariantReader != null) {
-            creationContext.addComplexVariantCreationContext(toComplexVariantReader.getComplexVariantCreationContext());
+            creationContext.addComplexVariantCreationContext(
+                getHvdcCreationContext(toComplexVariantReader.getComplexVariantCreationContext(), toNodeName)
+            );
         }
     }
+
+    private ElementaryCreationContext getHvdcCreationContext(final ElementaryCreationContext complexVariantCreationContext,
+                                                             final String networkElementName) {
+        return new StandardElementaryCreationContext(
+            complexVariantCreationContext.getNativeObjectId(),
+            networkElementName,
+            complexVariantCreationContext.getCreatedObjectId(),
+            complexVariantCreationContext.getImportStatus(),
+            complexVariantCreationContext.getImportStatusDetail(),
+            complexVariantCreationContext.isAltered()
+        );
+    }
 }

data/rao-result/rao-result-io/rao-result-cne/cne-exporter-commons/src/main/java/com/powsybl/openrao/data/raoresult/io/cne/commons/CneConstants.java

@@ -87,8 +87,10 @@ public final class CneConstants {
     /* RegisteredResource */
     // pSRType.psrType
     public static final String PST_RANGE_PSR_TYPE = "A06";
+    public static final String DC_LINK_PSR_TYPE = "B22";
     // resourceCapacity.unitSymbol
     public static final String WITHOUT_UNIT_SYMBOL = "C62";
+    public static final String MEGAWATTS_UNIT_SYMBOL = "MAW";
     // marketObjectStatus.status
     public static final String ABSOLUTE_MARKET_OBJECT_STATUS = "A26";
 

data/rao-result/rao-result-io/rao-result-cne/core-cne-exporter/pom.xml

@@ -143,5 +143,10 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

data/rao-result/rao-result-io/rao-result-cne/core-cne-exporter/src/main/java/com/powsybl/openrao/data/raoresult/io/cne/core/CoreCneClassCreator.java

@@ -184,12 +184,20 @@ public static RemedialActionSeries newRemedialActionSeries(String id, String nam
         return remedialActionSeries;
     }
 
-    public static RemedialActionRegisteredResource newRemedialActionRegisteredResource(String id, String name, String psrType, int setpoint, String unitSymbol, String marketObjectStatus) {
+    public static RemedialActionRegisteredResource newRemedialActionRegisteredResource(final String id, final String name, final String psrType, final int setpoint, final String unitSymbol, final String marketObjectStatus) {
+        return getRemedialActionRegisteredResource(id, name, psrType, BigDecimal.valueOf(setpoint), unitSymbol, marketObjectStatus);
+    }
+
+    public static RemedialActionRegisteredResource newRemedialActionRegisteredResource(final String id, final String name, final String psrType, final double setpoint, final String unitSymbol, final String marketObjectStatus) {
+        return getRemedialActionRegisteredResource(id, name, psrType, BigDecimal.valueOf(setpoint), unitSymbol, marketObjectStatus);
+    }
+
+    private static RemedialActionRegisteredResource getRemedialActionRegisteredResource(final String id, final String name, final String psrType, final BigDecimal setpoint, final String unitSymbol, final String marketObjectStatus) {
         RemedialActionRegisteredResource remedialActionRegisteredResource = new RemedialActionRegisteredResource();
         remedialActionRegisteredResource.setMRID(createResourceIDString(A01_CODING_SCHEME, id));
         remedialActionRegisteredResource.setName(name);
         remedialActionRegisteredResource.setPSRTypePsrType(psrType);
-        remedialActionRegisteredResource.setResourceCapacityDefaultCapacity(BigDecimal.valueOf(setpoint));
+        remedialActionRegisteredResource.setResourceCapacityDefaultCapacity(setpoint);
         remedialActionRegisteredResource.setResourceCapacityUnitSymbol(unitSymbol);
         remedialActionRegisteredResource.setMarketObjectStatusStatus(marketObjectStatus);
         return remedialActionRegisteredResource;