Merge branch 'devel'

Author: SanPen

.idea/workspace.xml

@@ -2513,16 +2513,16 @@ def compute_f(self, x: Vec) -> Vec:
         ]
 
         # Print index blocks of f
-        print('Lengths: ')
-        print(len(self.i_k_p), len(self.i_k_q), len(loss_vsc), len(loss_hvdc), len(inj_hvdc),
-              len(Pf_cbr), len(Pt_cbr), len(Qf_cbr), len(Qt_cbr))
-
-        print('Pf set: ', self.cbr_pf_set)
-        print('f errors: ')
-        # Get indices of troublesome values
-        for i, ff in enumerate(_f):
-            if abs(ff) > 0.5:
-                print(i, ff)
+        # print('Lengths: ')
+        # print(len(self.i_k_p), len(self.i_k_q), len(loss_vsc), len(loss_hvdc), len(inj_hvdc),
+        #       len(Pf_cbr), len(Pt_cbr), len(Qf_cbr), len(Qt_cbr))
+        #
+        # print('Pf set: ', self.cbr_pf_set)
+        # print('f errors: ')
+        # # Get indices of troublesome values
+        # for i, ff in enumerate(_f):
+        #     if abs(ff) > 0.5:
+        #         print(i, ff)
 
         return _f
 

src/GridCalEngine/Simulations/PowerFlow/Formulations/pf_generalized_formulation.py

@@ -141,10 +141,8 @@ def expectation(self) -> float | complex:
         Returns the CDF expected value (AKA the mean)
         :return: expectation
         """
-        if self.iscomplex:
-            return np.sum(self.arr * self.prob)
-        else:
-            return np.sum(self.arr * self.prob)
+        n = len(self.arr)
+        return np.sum(self.arr) * (1 / n)
 
     def plot(self, plt, LINEWIDTH: int, ax=None):
         """

src/GridCalEngine/basic_structures.py

@@ -0,0 +1,13 @@
+import numpy as np
+from numpy import random
+import GridCalEngine as gce
+
+def test_CDF_expectation():
+
+    x = random.normal(4, 1, size=20)
+
+    assert np.allclose(x.mean(), gce.CDF(x).expectation(), atol=1e-5)
+
+    x = random.rand(200)
+
+    assert np.allclose(x.mean(), gce.CDF(x).expectation(), atol=1e-5)