diff --git a/open-reac/src/test/java/com/powsybl/openreac/optimization/OpenReacBranchWithOneSideOpenedTest.java b/open-reac/src/test/java/com/powsybl/openreac/optimization/OpenReacBranchWithOneSideOpenedTest.java index 843c9dc1..1f5e2ad7 100644 --- a/open-reac/src/test/java/com/powsybl/openreac/optimization/OpenReacBranchWithOneSideOpenedTest.java +++ b/open-reac/src/test/java/com/powsybl/openreac/optimization/OpenReacBranchWithOneSideOpenedTest.java @@ -34,6 +34,7 @@ class OpenReacBranchWithOneSideOpenedTest extends AbstractOpenReacRunnerTest { void testOpenLineSide1OpenReac() throws IOException { Network network = VoltageControlNetworkFactory.createWithSimpleRemoteControl(); network.getLine("l43").setG2(0.1f).setB2(0.1f).getTerminal1().disconnect(); + network.getGenerator("g3").setMaxP(4); testAllModifAndLoadFlow(network, "optimization/opened-branches/line-open-side-1", new OpenReacParameters(), ReportNode.NO_OP); } @@ -41,6 +42,7 @@ void testOpenLineSide1OpenReac() throws IOException { void testZeroImpedanceOpenBranchSide2OpenReac() throws IOException { Network network = VoltageControlNetworkFactory.createWithTwoVoltageControls(); network.getLine("l45").setX(1e-8).setB1(1).setG1(0.1).getTerminal2().disconnect(); + network.getGenerator("g3").setMaxP(4); OpenReacResult result = runOpenReac(network, "optimization/opened-branches/zero-impedance-open-side-2"); // opened branch is considered as non impedant diff --git a/open-reac/src/test/resources/com/powsybl/config/test/config.yml b/open-reac/src/test/resources/com/powsybl/config/test/config.yml index 9d797384..1acd4f0d 100644 --- a/open-reac/src/test/resources/com/powsybl/config/test/config.yml +++ b/open-reac/src/test/resources/com/powsybl/config/test/config.yml @@ -1,2 +1,2 @@ ampl: - homeDir: D:\AMPL-13.1.20220703-Win-64 + homeDir: ??? diff --git a/open-reac/src/test/resources/optimization/opened-branches/line-open-side-1/reactiveopf_results_generators.csv b/open-reac/src/test/resources/optimization/opened-branches/line-open-side-1/reactiveopf_results_generators.csv index 41d62fad..2cc9c054 100644 --- a/open-reac/src/test/resources/optimization/opened-branches/line-open-side-1/reactiveopf_results_generators.csv +++ b/open-reac/src/test/resources/optimization/opened-branches/line-open-side-1/reactiveopf_results_generators.csv @@ -1,4 +1,4 @@ #variant;num;bus;vRegul;V(pu);targetP(MW);targetQ(Mvar);P(MW);Q(MW); -1;1;2;'true';0.500;2.0;0.7;-2.0;-0.7; -1;2;3;'true';0.500;2.0;0.7;-2.0;-0.7; -1;3;4;'true';0.512;2.0;0.7;-2.0;-0.7; +1;1;2;'true';0.500;2.0;0.6;-2.0;-0.6; +1;2;3;'true';0.500;2.0;0.9;-2.0;-0.9; +1;3;4;'true';0.510;2.0;0.6;-2.0;-0.6; diff --git a/open-reac/src/test/resources/optimization/opened-branches/line-open-side-1/reactiveopf_results_indic.txt b/open-reac/src/test/resources/optimization/opened-branches/line-open-side-1/reactiveopf_results_indic.txt index 7a452132..b2a59f57 100644 --- a/open-reac/src/test/resources/optimization/opened-branches/line-open-side-1/reactiveopf_results_indic.txt +++ b/open-reac/src/test/resources/optimization/opened-branches/line-open-side-1/reactiveopf_results_indic.txt @@ -1,19 +1,6 @@ final_status OK dcopf_status OK -ctime_start 'Mon Dec 16 14:48:51 2024' -last_solve_result_num 0 -nb_iter_last 6 -nb_iter_total 6 -_ampl_elapsed_time 0.109000 -_total_solve_time 0.015625 -total_time 0 - -operatingSystem windows -OS 'Windows_NT' -COMPUTERNAME 'ARTELYS-PC253' -directory 'C:\Users\parvy\AppData\Local\Temp\ampl_14517614006499333001' - log_level_ampl INFO log_level_knitro 2 objective_choice 0 @@ -86,7 +73,7 @@ teta_min -3.00 max_delta_teta_dc -0.000003 max_delta_teta_ac -0.000012 min_delta_teta_dc -0.020000 -min_delta_teta_ac -0.078526 +min_delta_teta_ac -0.078480 nb_reactive_slacks 0 nb_slacks_condensator 0 diff --git a/open-reac/src/test/resources/optimization/opened-branches/line-open-side-1/reactiveopf_results_voltages.csv b/open-reac/src/test/resources/optimization/opened-branches/line-open-side-1/reactiveopf_results_voltages.csv index 5e4b9e90..136f5e28 100644 --- a/open-reac/src/test/resources/optimization/opened-branches/line-open-side-1/reactiveopf_results_voltages.csv +++ b/open-reac/src/test/resources/optimization/opened-branches/line-open-side-1/reactiveopf_results_voltages.csv @@ -2,4 +2,4 @@ 1;1;0.500;-0.000;"b1_vl_0"; 1;2;0.500;0.000;"b2_vl_0"; 1;3;0.500;-0.000;"b3_vl_0"; -1;4;0.512;0.079;"b4_vl_0"; +1;4;0.510;0.078;"b4_vl_0"; diff --git a/open-reac/src/test/resources/optimization/opened-branches/rtc-not-optimized/reactiveopf_results_indic.txt b/open-reac/src/test/resources/optimization/opened-branches/rtc-not-optimized/reactiveopf_results_indic.txt index 895d49be..8459e658 100644 --- a/open-reac/src/test/resources/optimization/opened-branches/rtc-not-optimized/reactiveopf_results_indic.txt +++ b/open-reac/src/test/resources/optimization/opened-branches/rtc-not-optimized/reactiveopf_results_indic.txt @@ -1,19 +1,6 @@ final_status OK dcopf_status OK -ctime_start 'Mon Dec 16 14:51:03 2024' -last_solve_result_num 0 -nb_iter_last 6 -nb_iter_total 6 -_ampl_elapsed_time 0.078000 -_total_solve_time 0.046875 -total_time 0 - -operatingSystem windows -OS 'Windows_NT' -COMPUTERNAME 'ARTELYS-PC253' -directory 'C:\Users\parvy\AppData\Local\Temp\ampl_11159029444846276223' - log_level_ampl INFO log_level_knitro 2 objective_choice 0 diff --git a/open-reac/src/test/resources/optimization/opened-branches/rtc-open-side-1/reactiveopf_results_indic.txt b/open-reac/src/test/resources/optimization/opened-branches/rtc-open-side-1/reactiveopf_results_indic.txt index 25daa3ac..cc7f50c2 100644 --- a/open-reac/src/test/resources/optimization/opened-branches/rtc-open-side-1/reactiveopf_results_indic.txt +++ b/open-reac/src/test/resources/optimization/opened-branches/rtc-open-side-1/reactiveopf_results_indic.txt @@ -1,19 +1,6 @@ final_status OK dcopf_status OK -ctime_start 'Mon Dec 16 14:51:02 2024' -last_solve_result_num 0 -nb_iter_last 5 -nb_iter_total 5 -_ampl_elapsed_time 0.078000 -_total_solve_time 0.031250 -total_time 0 - -operatingSystem windows -OS 'Windows_NT' -COMPUTERNAME 'ARTELYS-PC253' -directory 'C:\Users\parvy\AppData\Local\Temp\ampl_13911448580587003038' - log_level_ampl INFO log_level_knitro 2 objective_choice 0 diff --git a/open-reac/src/test/resources/optimization/opened-branches/rtc-open-side-2/reactiveopf_results_indic.txt b/open-reac/src/test/resources/optimization/opened-branches/rtc-open-side-2/reactiveopf_results_indic.txt index 8309362f..92bc52d8 100644 --- a/open-reac/src/test/resources/optimization/opened-branches/rtc-open-side-2/reactiveopf_results_indic.txt +++ b/open-reac/src/test/resources/optimization/opened-branches/rtc-open-side-2/reactiveopf_results_indic.txt @@ -1,19 +1,6 @@ final_status OK dcopf_status OK -ctime_start 'Mon Dec 16 14:51:01 2024' -last_solve_result_num 0 -nb_iter_last 4 -nb_iter_total 4 -_ampl_elapsed_time 0.094000 -_total_solve_time 0.031250 -total_time 0 - -operatingSystem windows -OS 'Windows_NT' -COMPUTERNAME 'ARTELYS-PC253' -directory 'C:\Users\parvy\AppData\Local\Temp\ampl_13276652158585298030' - log_level_ampl INFO log_level_knitro 2 objective_choice 0 diff --git a/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-1/reactiveopf_results_indic.txt b/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-1/reactiveopf_results_indic.txt index 36cc5067..5bc88c61 100644 --- a/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-1/reactiveopf_results_indic.txt +++ b/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-1/reactiveopf_results_indic.txt @@ -1,19 +1,6 @@ final_status OK dcopf_status OK -ctime_start 'Mon Dec 16 14:51:03 2024' -last_solve_result_num 0 -nb_iter_last 25 -nb_iter_total 25 -_ampl_elapsed_time 0.095000 -_total_solve_time 0.031250 -total_time 0 - -operatingSystem windows -OS 'Windows_NT' -COMPUTERNAME 'ARTELYS-PC253' -directory 'C:\Users\parvy\AppData\Local\Temp\ampl_14088349731220672307' - log_level_ampl INFO log_level_knitro 2 objective_choice 0 diff --git a/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-2/reactiveopf_results_generators.csv b/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-2/reactiveopf_results_generators.csv index 3fdc35ae..999b659d 100644 --- a/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-2/reactiveopf_results_generators.csv +++ b/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-2/reactiveopf_results_generators.csv @@ -1,3 +1,3 @@ #variant;num;bus;vRegul;V(pu);targetP(MW);targetQ(Mvar);P(MW);Q(MW); -1;1;2;'true';0.774;2.0;0.5;-2.5;-0.5; -1;2;3;'true';0.774;2.0;0.5;-2.5;-0.5; +1;1;2;'true';0.803;2.0;0.4;-2.0;-0.4; +1;2;3;'true';0.805;2.0;0.6;-3.1;-0.6; diff --git a/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-2/reactiveopf_results_indic.txt b/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-2/reactiveopf_results_indic.txt index 9881c946..efd81ab3 100644 --- a/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-2/reactiveopf_results_indic.txt +++ b/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-2/reactiveopf_results_indic.txt @@ -1,19 +1,6 @@ final_status OK dcopf_status OK -ctime_start 'Mon Dec 16 14:51:02 2024' -last_solve_result_num 0 -nb_iter_last 6 -nb_iter_total 6 -_ampl_elapsed_time 0.078000 -_total_solve_time 0.015625 -total_time 0 - -operatingSystem windows -OS 'Windows_NT' -COMPUTERNAME 'ARTELYS-PC253' -directory 'C:\Users\parvy\AppData\Local\Temp\ampl_910703953351669228' - log_level_ampl INFO log_level_knitro 2 objective_choice 0 @@ -78,15 +65,15 @@ sum_batteries_pmax 0.0 sum_batteries_pmin 0.0 max_teta_dc 0.02 -max_teta_ac 0.04 +max_teta_ac 0.05 teta_max 3.02 min_teta_dc -0.05 -min_teta_ac -0.09 +min_teta_ac -0.08 teta_min -3.05 max_delta_teta_dc 0.050000 -max_delta_teta_ac 0.086887 +max_delta_teta_ac 0.080167 min_delta_teta_dc -0.025000 -min_delta_teta_ac -0.042570 +min_delta_teta_ac -0.047639 nb_reactive_slacks 0 nb_slacks_condensator 0 diff --git a/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-2/reactiveopf_results_voltages.csv b/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-2/reactiveopf_results_voltages.csv index 8e5a2f5b..a37e219a 100644 --- a/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-2/reactiveopf_results_voltages.csv +++ b/open-reac/src/test/resources/optimization/opened-branches/zero-impedance-open-side-2/reactiveopf_results_voltages.csv @@ -1,5 +1,5 @@ #variant;bus;V(pu);theta(rad);id; -1;1;0.768;0.000;"b1_vl_0"; -1;2;0.774;0.043;"b2_vl_0"; -1;3;0.774;0.043;"b3_vl_0"; -1;4;0.759;-0.087;"b4_vl_0"; +1;1;0.799;0.000;"b1_vl_0"; +1;2;0.803;0.031;"b2_vl_0"; +1;3;0.805;0.048;"b3_vl_0"; +1;4;0.791;-0.080;"b4_vl_0";