fix scale tests

Signed-off-by: Naledi EL CHEIKH <[email protected]>

Author: Naledi EL CHEIKH

cpp/powsybl-cpp/powsybl-cpp.cpp

@@ -1715,9 +1715,10 @@ void splitOrMergeTransformers(pypowsybl::JavaHandle network, const std::vector<s
     pypowsybl::PowsyblCaller::get()->callJava(::splitOrMergeTransformers, network, transformerIdsPtr.get(), transformerIds.size(), merge, (reportNode == nullptr) ? nullptr : *reportNode);
 }
 
-int scaleProportional(pypowsybl::JavaHandle network, int asked, distribution_mode distributionMode, const std::vector<std::string>& injectionsIds, const int limitMin, const int limitMax, scaling_parameters scalingParameters) {
+int scaleProportional(pypowsybl::JavaHandle network, int asked, distribution_mode distributionMode, const std::vector<std::string>& injectionsIds, const int limitMin, const int limitMax, const ScalingParameters& scalingParameters) {
     ToCharPtrPtr injectionsIdsPtr(injectionsIds);
-    return pypowsybl::PowsyblCaller::get()->callJava<int>(::scaleProportional, network, asked, distributionMode, injectionsIdsPtr.get(), injectionsIds.size(), limitMin, limitMax, scalingParameters);
+    auto c_scaling_parameters = scalingParameters.to_c_struct();
+    return pypowsybl::PowsyblCaller::get()->callJava<int>(::scaleProportional, network, asked, distributionMode, injectionsIdsPtr.get(), injectionsIds.size(), limitMin, limitMax, c_scaling_parameters.get());
 }
 
 /*---------------------------------SHORT-CIRCUIT ANALYSIS---------------------------*/

cpp/pypowsybl-cpp/bindings.cpp

@@ -1218,7 +1218,7 @@ PYBIND11_MODULE(_pypowsybl, m) {
     m.def("create_network_modification", ::createNetworkModificationBind, "Create and apply network modification", py::arg("network"), py::arg("dataframe"), py::arg("network_modification_type"), py::arg("raise_exception"), py::arg("report_node"));
 
     m.def("split_or_merge_transformers", &pypowsybl::splitOrMergeTransformers, "Replace 3-windings transformers with 3 2-windings transformers",
-          py::arg("network"), py::arg("transformer_ids"), py::arg("merge"), py::arg(scaling_parameters"report_node"));
+          py::arg("network"), py::arg("transformer_ids"), py::arg("merge"), py::arg("scaling_parameters"));
 
     m.def("scale_proportional", &pypowsybl::scaleProportional, "Scale the given network proportionally.",
          py::arg("network"), py::arg("asked"), py::arg("distribution_mode"), py::arg("injections_ids"), py::arg("limit_min"), py::arg("limit_max"), py::arg(""));

java/pypowsybl/src/main/java/com/powsybl/python/network/NetworkModificationsCFunctions.java

@@ -238,10 +238,10 @@ public static ScalingParameters createScalingParameters() {
 
     public static ScalingParameters convertScalingParameters(PyPowsyblApiHeader.ScalingParametersPointer scalingParametersPtr) {
 
+        List<String> injectionsIdsStringList = toStringList(scalingParametersPtr.getIgnoredInjectionIds(), scalingParametersPtr.getIgnoredInjectionIdsCount());
+
         Set<String> ignoredInjectionIds = new HashSet<>();
-        for (Object injection : ((Collection<?>) scalingParametersPtr.getIgnoredInjectionIds()).toArray()) {
-            ignoredInjectionIds.add((String) injection);
-        }
+        injectionsIdsStringList.forEach(ignoredInjectionIds::add);
 
         return createScalingParameters()
                 .setScalingConvention(Scalable.ScalingConvention.values()[scalingParametersPtr.getScalingConvention()])

tests/test_network_modification.py

@@ -1517,10 +1517,10 @@ def test_scale_generator():
     n = pp.network.create_micro_grid_be_network()
     proportional_to_pmax = pp.network.DistributionMode.PROPORTIONAL_TO_PMAX
     proportional_to_target = pp.network.DistributionMode.PROPORTIONAL_TO_TARGETP
-
+    param = Parameters()
     injections_ids = ['3a3b27be-b18b-4385-b557-6735d733baf0', '550ebe0d-f2b2-48c1-991f-cebea43a21aa']
-    pp.network.scale_proportional(n, 10, proportional_to_pmax, injections_ids, 50, 200)
-    pp.network.scale_proportional(n, 50, proportional_to_target, injections_ids, 50, 200)
+    pp.network.scale_proportional(n, 10, proportional_to_pmax, injections_ids, 50, 200, param)
+    pp.network.scale_proportional(n, 50, proportional_to_target, injections_ids, 50, 200, param)
 
 def test_scaling_parameters_init():
     scaling_type = Parameters().scaling_type