diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1cf911e21..ed83cb2d1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -28,9 +28,9 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="aa3ee678-6e91-470f-91a9-09e9d8a4756d" name="Changes" comment="Deleted test output files">
+    <list default="true" id="aa3ee678-6e91-470f-91a9-09e9d8a4756d" name="Changes" comment="Improvements in reporting and logging power flows">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/tests/test_raw_cgmes_cross_roundtrip.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/tests/test_raw_cgmes_cross_roundtrip.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GridCalEngine/Simulations/PowerFlow/Formulations/pf_generalized_formulation.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/GridCalEngine/Simulations/PowerFlow/Formulations/pf_generalized_formulation.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -71,7 +71,7 @@
     </favorite-branches>
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="320_generalized_acdc_pf" />
+        <entry key="$PROJECT_DIR$" value="master" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -433,29 +433,6 @@
       <option name="INTERPRETER_OPTIONS" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="ExecuteGridCal" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
-      <module name="GridCal" />
-      <option name="ENV_FILES" value="" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src/GridCal" />
-      <option name="IS_MODULE_SDK" value="true" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/GridCal/ExecuteGridCal.py" />
-      <option name="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
     <configuration default="true" type="PythonConfigurationType" factoryName="Python">
       <module name="GridCalEngine" />
       <option name="ENV_FILES" value="" />
@@ -645,6 +622,24 @@
       <option name="_new_targetType" value="&quot;PATH&quot;" />
       <method v="2" />
     </configuration>
+    <configuration name="pytest for test_CDF.test_CDF_expectation" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+      <module name="GridCal" />
+      <option name="ENV_FILES" value="" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src/tests" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_parameters" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;test_CDF.test_CDF_expectation&quot;" />
+      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
+      <method v="2" />
+    </configuration>
     <configuration name="pytest for test_power_flow.test_power_flow_12bus_acdc" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
       <module name="GridCal" />
       <option name="ENV_FILES" value="" />
@@ -720,7 +715,7 @@
     <list>
       <item itemvalue="Python.test_power_flow" />
       <item itemvalue="Python.test_power_flow_acdc_generalized" />
-      <item itemvalue="Python.ExecuteGridCal" />
+      <item itemvalue="Python tests.pytest for test_CDF.test_CDF_expectation" />
       <item itemvalue="Python tests.pytest for test_power_flow.test_power_flow_12bus_acdc" />
       <item itemvalue="Python tests.pytest in tests" />
       <item itemvalue="Python tests.pytest in test_power_flow.py" />
@@ -728,11 +723,11 @@
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python tests.pytest for test_CDF.test_CDF_expectation" />
+        <item itemvalue="Python tests.pytest in test_power_flow_acdc_generalized.py" />
+        <item itemvalue="Python tests.pytest in test_power_flow.py" />
         <item itemvalue="Python tests.pytest in tests" />
-        <item itemvalue="Python.ExecuteGridCal" />
         <item itemvalue="Python tests.pytest for test_power_flow.test_power_flow_12bus_acdc" />
-        <item itemvalue="Python tests.pytest in test_power_flow.py" />
-        <item itemvalue="Python tests.pytest in test_power_flow_acdc_generalized.py" />
       </list>
     </recent_temporary>
   </component>
@@ -1488,8 +1483,6 @@
       <workItem from="1736122038036" duration="1572000" />
       <workItem from="1736159852001" duration="11722000" />
       <workItem from="1736234867701" duration="5425000" />
-      <workItem from="1736267184259" duration="8603000" />
-      <workItem from="1736325750145" duration="843000" />
     </task>
     <task id="LOCAL-00310" summary="implemented newtonPA time series">
       <created>1656059954202</created>
@@ -1834,7 +1827,7 @@
       <option name="project" value="LOCAL" />
       <updated>1698766404661</updated>
     </task>
-    <option name="localTasksCounter" value="540" />
+    <option name="localTasksCounter" value="538" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1862,13 +1855,6 @@
         <entry key="MAIN">
           <value>
             <State>
-              <option name="COLUMN_ID_WIDTH">
-                <map>
-                  <entry key="Table.Default.Author.ColumnIdWidth" value="85" />
-                  <entry key="Table.Default.Date.ColumnIdWidth" value="140" />
-                  <entry key="Table.GitHub.CommitStatus.ColumnIdWidth" value="15" />
-                </map>
-              </option>
               <option name="FILTERS">
                 <map>
                   <entry key="branch">
@@ -1887,6 +1873,7 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
+    <MESSAGE value="Bug fix for segment subdivision" />
     <MESSAGE value="Stopgap solution for zoom problem with maps" />
     <MESSAGE value="avoid changing tilesets to themselves" />
     <MESSAGE value="Fixed the CN children connection point" />
@@ -1911,8 +1898,7 @@
     <MESSAGE value="More topology docs" />
     <MESSAGE value="making HVDC optional in generalized PF" />
     <MESSAGE value="Improvements in reporting and logging power flows" />
-    <MESSAGE value="Deleted test output files" />
-    <option name="LAST_COMMIT_MESSAGE" value="Deleted test output files" />
+    <option name="LAST_COMMIT_MESSAGE" value="Improvements in reporting and logging power flows" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -2681,7 +2667,7 @@
     <SUITE FILE_PATH="coverage/GridCal_debug$pytest_for_test_nonlinear_contingency_test_non_linear_factors.coverage" NAME="pytest for test_nonlinear_contingency.test_non_linear_factors Coverage Results" MODIFIED="1734953334134" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
     <SUITE FILE_PATH="coverage/GridCal$Nosetests_for_tests_test_continuation_power_flow.coverage" NAME="Nosetests for tests.test_continuation_power_flow Coverage Results" MODIFIED="1712338444431" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
     <SUITE FILE_PATH="coverage/GridCal$Nosetests_for_test_power_flow_test_dc_pf_ieee14.coverage" NAME="Nosetests for test_power_flow.test_dc_pf_ieee14 Coverage Results" MODIFIED="1708459374133" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
-    <SUITE FILE_PATH="coverage/GridCal$pytest_in_tests.coverage" NAME="pytest in tests Coverage Results" MODIFIED="1736325808634" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
+    <SUITE FILE_PATH="coverage/GridCal$pytest_in_tests.coverage" NAME="pytest in tests Coverage Results" MODIFIED="1736326885671" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
     <SUITE FILE_PATH="coverage/GridCal$LineBuilderDialogue.coverage" NAME="LineBuilderDialogue Coverage Results" MODIFIED="1633774223527" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/GridCal/Gui/TowerBuilder" />
     <SUITE FILE_PATH="coverage/GridCal$pytest_in_test_deep_copy_py.coverage" NAME="pytest in test_deep_copy.py Coverage Results" MODIFIED="1724249395795" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
     <SUITE FILE_PATH="coverage/GridCal$pytest_for_test_power_flow_test_power_flow_control_with_pst.coverage" NAME="pytest for test_power_flow.test_power_flow_control_with_pst Coverage Results" MODIFIED="1723561309289" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/tests" />
diff --git a/src/GridCalEngine/Simulations/PowerFlow/Formulations/pf_generalized_formulation.py b/src/GridCalEngine/Simulations/PowerFlow/Formulations/pf_generalized_formulation.py
index 3469c5efa..f83389e11 100644
--- a/src/GridCalEngine/Simulations/PowerFlow/Formulations/pf_generalized_formulation.py
+++ b/src/GridCalEngine/Simulations/PowerFlow/Formulations/pf_generalized_formulation.py
@@ -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
 
diff --git a/src/GridCalEngine/basic_structures.py b/src/GridCalEngine/basic_structures.py
index c94784a1e..12459cc56 100644
--- a/src/GridCalEngine/basic_structures.py
+++ b/src/GridCalEngine/basic_structures.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):
         """
diff --git a/src/tests/test_CDF.py b/src/tests/test_CDF.py
new file mode 100644
index 000000000..54f4e0fe4
--- /dev/null
+++ b/src/tests/test_CDF.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)