Modify network used in unit tests.

Signed-off-by: parvy <pierre.arvy@artelys.com>
powsybl · Nov 22, 2023 · be62d53 · be62d53
1 parent 01bd1d3
commit be62d53
Show file tree

Hide file tree

Showing 31 changed files with 58 additions and 3,413 deletions.
diff --git a/open-reac/src/test/java/com/powsybl/openreac/OpenReacRunnerTest.java b/open-reac/src/test/java/com/powsybl/openreac/OpenReacRunnerTest.java
@@ -76,7 +76,7 @@ private Path getAmplExecPath() throws IOException {
 
     @Test
     void testInputFile() throws IOException {
-        Network network = IeeeCdfNetworkFactory.create118();
+        Network network = IeeeCdfNetworkFactory.create57();
         setDefaultVoltageLimits(network); // set default voltage limits to every voltage levels of the network
 
         OpenReacParameters parameters = new OpenReacParameters().setObjective(
@@ -111,6 +111,7 @@ void testInputFile() throws IOException {
 
     @Test
     public void testOutputFileParsing() throws IOException {
+        // TODO : change the following network and adapt rest of the test
         Network network = IeeeCdfNetworkFactory.create118();
         setDefaultVoltageLimits(network); // set default voltage limits to every voltage levels of the network
         // To parse correctly data from output files, there must be an ID in the Ampl mapper
@@ -152,10 +153,11 @@ public void testOutputFileParsing() throws IOException {
 
         LocalCommandExecutor localCommandExecutor = new TestLocalCommandExecutor(
             List.of("mock_outputs/reactiveopf_results_generators.csv",
-                "mock_outputs/reactiveopf_results_indic.txt", "mock_outputs/reactiveopf_results_rtc.csv",
-                "mock_outputs/reactiveopf_results_shunts.csv",
-                "mock_outputs/reactiveopf_results_static_var_compensators.csv",
-                "mock_outputs/reactiveopf_results_vsc_converter_stations.csv"));
+                        "mock_outputs/reactiveopf_results_indic.txt",
+                        "mock_outputs/reactiveopf_results_rtc.csv",
+                        "mock_outputs/reactiveopf_results_shunts.csv",
+                        "mock_outputs/reactiveopf_results_static_var_compensators.csv",
+                        "mock_outputs/reactiveopf_results_vsc_converter_stations.csv"));
         try (ComputationManager computationManager = new LocalComputationManager(new LocalComputationConfig(tmpDir),
             localCommandExecutor, ForkJoinPool.commonPool())) {
             OpenReacResult openReacResult = OpenReacRunner.run(network,
@@ -182,9 +184,9 @@ private void testAllModifAndLoadFlow(Network network, String subFolder, OpenReac
                 subFolder + "/reactiveopf_results_static_var_compensators.csv",
                 subFolder + "/reactiveopf_results_vsc_converter_stations.csv"));
 //         To really run open reac, use the commentede line below. Be sure that open-reac/src/test/resources/com/powsybl/config/test/config.yml contains your ampl path
-         try (ComputationManager computationManager = new LocalComputationManager()) {
-//        try (ComputationManager computationManager = new LocalComputationManager(new LocalComputationConfig(tmpDir),
-//            localCommandExecutor, ForkJoinPool.commonPool())) {
+//         try (ComputationManager computationManager = new LocalComputationManager()) {
+        try (ComputationManager computationManager = new LocalComputationManager(new LocalComputationConfig(tmpDir),
+            localCommandExecutor, ForkJoinPool.commonPool())) {
             OpenReacResult openReacResult = OpenReacRunner.run(network,
                 network.getVariantManager().getWorkingVariantId(), parameters, new OpenReacConfig(true),
                 computationManager);
@@ -246,12 +248,9 @@ public void testTransformer() throws IOException {
 
     @Test
     public void testRealNetwork() throws IOException {
-        // Network {CC0 SC0}: 53 generators have an inconsistent target voltage and have been discarded from voltage control
-        Network network = IeeeCdfNetworkFactory.create118();
+        Network network = IeeeCdfNetworkFactory.create57();
         setDefaultVoltageLimits(network); // set default voltage limits to every voltage levels of the network
         OpenReacParameters parameters = new OpenReacParameters();
-//        LoadFlowResult loadFlowResult = LoadFlow.run(network);
-//        assertTrue(loadFlowResult.isOk());
         testAllModifAndLoadFlow(network, "openreac-output-real-network", parameters);
     }
 

diff --git a/open-reac/src/test/resources/expected_inputs/param_shunts.txt b/open-reac/src/test/resources/expected_inputs/param_shunts.txt
@@ -1,3 +1,3 @@
 #amplId powsyblId
-1 'B5-SH'
+1 'B18-SH'
 
diff --git a/open-reac/src/test/resources/expected_inputs/param_transformers.txt b/open-reac/src/test/resources/expected_inputs/param_transformers.txt
@@ -1,3 +1,3 @@
 #amplId powsyblId
-178 'T8-5-1'
+64 'T4-18-1'
 
diff --git a/open-reac/src/test/resources/openreac-output-real-network/ampl_network_batteries.txt b/open-reac/src/test/resources/openreac-output-real-network/ampl_network_batteries.txt
diff --git a/open-reac/src/test/resources/openreac-output-real-network/ampl_network_branches.txt b/open-reac/src/test/resources/openreac-output-real-network/ampl_network_branches.txt
diff --git a/open-reac/src/test/resources/openreac-output-real-network/ampl_network_buses.txt b/open-reac/src/test/resources/openreac-output-real-network/ampl_network_buses.txt
diff --git a/open-reac/src/test/resources/openreac-output-real-network/ampl_network_generators.txt b/open-reac/src/test/resources/openreac-output-real-network/ampl_network_generators.txt
diff --git a/open-reac/src/test/resources/openreac-output-real-network/ampl_network_hvdc.txt b/open-reac/src/test/resources/openreac-output-real-network/ampl_network_hvdc.txt