Merge branch 'main' into other_ptdf_sum_fix

Author: phiedw

data/crac/crac-impl/src/main/java/com/powsybl/openrao/data/crac/impl/NetworkActionImpl.java

@@ -99,4 +99,17 @@ public int hashCode() {
         return super.hashCode();
     }
 
+    public static NetworkAction copyWithNewId(NetworkAction networkAction, String newId) {
+        return new NetworkActionImpl(
+            newId,
+            networkAction.getName(),
+            networkAction.getOperator(),
+            networkAction.getUsageRules(),
+            networkAction.getElementaryActions(),
+            networkAction.getSpeed().orElse(null),
+            networkAction.getActivationCost().orElse(null),
+            networkAction.getNetworkElements()
+        );
+    }
+
 }

data/crac/crac-impl/src/test/java/com/powsybl/openrao/data/crac/impl/NetworkActionImplTest.java

@@ -120,4 +120,16 @@ void compatibility() {
         assertFalse(crac.getNetworkAction("aligned-psts").isCompatibleWith(crac.getNetworkAction("switch-pair-and-pst")));
         assertTrue(crac.getNetworkAction("switch-pair-and-pst").isCompatibleWith(crac.getNetworkAction("switch-pair-and-pst")));
     }
+
+    @Test
+    void testCopyWithNewId() {
+        NetworkAction duplicate = NetworkActionImpl.copyWithNewId(networkAction1, "copy");
+        assertEquals("copy", duplicate.getId());
+        assertEquals("name", duplicate.getName());
+        assertEquals("operator", duplicate.getOperator());
+        assertEquals(Optional.of(10), duplicate.getSpeed());
+        assertEquals(1, duplicate.getUsageRules().size());
+        assertEquals(1, duplicate.getElementaryActions().size());
+        assertEquals(generator.getId(), duplicate.getNetworkElements().iterator().next().getId());
+    }
 }

data/rao-result/rao-result-io/rao-result-json/src/main/java/com/powsybl/openrao/data/raoresult/io/json/deserializers/ComputationStatusMapDeserializer.java

@@ -18,7 +18,7 @@
 
 /**
  * @author Philippe Edwards {@literal <philippe.edwards at rte-france.com>}
- * @author Godelaine De-Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
+ * @author Godelaine de Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
  */
 final class ComputationStatusMapDeserializer {
 

data/rao-result/rao-result-io/rao-result-json/src/main/java/com/powsybl/openrao/data/raoresult/io/json/serializers/ComputationStatusMapSerializer.java

@@ -21,7 +21,7 @@
 
 /**
  * @author Philippe Edwards {@literal <philippe.edwards at rte-france.com>}
- * @author Godelaine De-Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
+ * @author Godelaine de Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
  */
 final class ComputationStatusMapSerializer {
 

ra-optimisation/search-tree-rao/pom.xml

@@ -31,6 +31,11 @@
             <artifactId>open-rao-rao-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>open-rao-crac-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.google.ortools</groupId>
             <artifactId>ortools-java</artifactId>
@@ -51,12 +56,6 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>open-rao-crac-impl</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>open-rao-crac-util</artifactId>

ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/castor/algorithm/AutomatonSimulator.java

@@ -65,7 +65,7 @@
  * Simulates the behavior of topological and range automatons
  *
  * @author Peter Mitri {@literal <peter.mitri at rte-france.com>}
- * @author Godelaine De-Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
+ * @author Godelaine de Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
  */
 public final class AutomatonSimulator {
     private static final double DOUBLE_NON_NULL = 1e-12;

ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/castor/algorithm/Castor.java

@@ -23,7 +23,7 @@
  * @author Joris Mancini {@literal <joris.mancini at rte-france.com>}
  * @author Philippe Edwards {@literal <philippe.edwards at rte-france.com>}
  * @author Peter Mitri {@literal <peter.mitri at rte-france.com>}
- * @author Godelaine De-Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
+ * @author Godelaine de Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
  * @author Baptiste Seguinot {@literal <baptiste.seguinot at rte-france.com>}
  */
 @AutoService(RaoProvider.class)

ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorContingencyScenarios.java

@@ -43,7 +43,7 @@
  * @author Joris Mancini {@literal <joris.mancini at rte-france.com>}
  * @author Philippe Edwards {@literal <philippe.edwards at rte-france.com>}
  * @author Peter Mitri {@literal <peter.mitri at rte-france.com>}
- * @author Godelaine De-Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
+ * @author Godelaine de Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
  * @author Baptiste Seguinot {@literal <baptiste.seguinot at rte-france.com>}
  */
 public class CastorContingencyScenarios {

ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorFullOptimization.java

@@ -44,7 +44,7 @@
  * @author Joris Mancini {@literal <joris.mancini at rte-france.com>}
  * @author Philippe Edwards {@literal <philippe.edwards at rte-france.com>}
  * @author Peter Mitri {@literal <peter.mitri at rte-france.com>}
- * @author Godelaine De-Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
+ * @author Godelaine de Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
  * @author Baptiste Seguinot {@literal <baptiste.seguinot at rte-france.com>}
  */
 public class CastorFullOptimization {

ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorOneStateOnly.java

@@ -44,7 +44,7 @@
  * @author Joris Mancini {@literal <joris.mancini at rte-france.com>}
  * @author Philippe Edwards {@literal <philippe.edwards at rte-france.com>}
  * @author Peter Mitri {@literal <peter.mitri at rte-france.com>}
- * @author Godelaine De-Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
+ * @author Godelaine de Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
  * @author Baptiste Seguinot {@literal <baptiste.seguinot at rte-france.com>}
  */
 public class CastorOneStateOnly {