Correction of the tests

RoseauTechnologies · Sep 19, 2023 · e6a2115 · e6a2115
1 parent 9a8d6cc
commit e6a2115
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/roseau/load_flow/models/loads/flexible_parameters.py b/roseau/load_flow/models/loads/flexible_parameters.py
@@ -494,7 +494,7 @@ def constant(cls) -> Self:
         return cls(
             control_p=cls._control_class.constant(),
             control_q=cls._control_class.constant(),
-            projection=cls._projection_class(type=cls._projection_class.DEFAULT_TYPE),
+            projection=cls._projection_class(type=cls._projection_class._DEFAULT_TYPE),
             s_max=1.0,
         )
 

diff --git a/roseau/load_flow/models/tests/test_flexible_parameters.py b/roseau/load_flow/models/tests/test_flexible_parameters.py
@@ -234,10 +234,11 @@ def flexible_parameter(control_p, control_q, projection):
 
 
 @pytest.fixture()
-def monkeypatch_flexible_parameter_compute_powers(rg):
+def monkeypatch_flexible_parameter_compute_powers(monkeypatch, rg):
     @contextmanager
     def inner():
-        with pytest.MonkeyPatch.context() as m:
+        nonlocal monkeypatch
+        with monkeypatch.context() as m:
             m.setattr(target=ElectricalNetwork, name="solve_load_flow", value=lambda *args, **kwargs: 2)
             m.setattr(
                 target=PowerLoad,

diff --git a/roseau/load_flow/network.py b/roseau/load_flow/network.py
@@ -661,7 +661,7 @@ def res_branches(self) -> pd.DataFrame:
                     "potential2": complex,
                 }
             )
-            .groupby(["branch_id", "phase"])  # aggregate x1 and x2 for the same phase
+            .groupby(["branch_id", "phase"], observed=False)  # aggregate x1 and x2 for the same phase
             .mean()  # 2 values; only one is not nan -> keep it
             .dropna(how="all")  # if all values are nan -> drop the row (the phase does not exist)
         )