python-fedci 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

fedci/testing.py

@@ -38,7 +38,6 @@ class RegressionTest:
         self.llf: float = -float("inf")
         self.iterations: int = 0
         self.convergence_retry_count = 0
-        self.reinit_beta = False
         self.lm_lambda = 1
 
     def __repr__(self):
@@ -128,14 +127,13 @@ class RegressionTest:
         xwz = sum([_update.xwz for _update in update])
         n = int(np.sum([_update.n for _update in update]).item())
 
-        if abs(llf) < 1e-8 and np.allclose(xwx, np.zeros_like(xwx)) and np.allclose(xwz, np.zeros_like(xwz)):
+        if abs(llf) < 1e-10:
             self.early_stop = True
             return
 
-        if not self.reinit_beta and np.allclose(xwz, np.zeros_like(xwz)):
-            self.reinit_beta = True
-            # readjust beta -> mostly an issue with small datasets and perfectly even distribution of categories
+        if self.iterations == 0 and np.allclose(xwz, np.zeros_like(xwz)):            # readjust beta -> mostly an issue with small datasets and perfectly even distribution of categories
             self.beta = np.random.randn(self.dof, 1)
+            self.iterations += 1
             return
 
         if self.response_type == VariableType.CONTINUOS and n > 0:
@@ -187,9 +185,10 @@ class RegressionTest:
             self.lm_lambda /= 10
         beta = self._get_new_beta(xwx, xwz)
         if (
-            self.iterations == 0
-            and np.linalg.norm(self.beta - beta) < 1e-4
-            or np.linalg.norm(self.beta - beta) < 1e-8
+            #self.iterations == 0
+            #and np.linalg.norm(self.beta - beta) < 1e-4
+            #or np.linalg.norm(self.beta - beta) < 1e-8
+            np.linalg.norm(self.beta - beta) < 1e-8
         ):
             self.early_stop = True
             return