python-fedci 0.1.2__tar.gz → 0.1.4__tar.gz

{python_fedci-0.1.2 → python_fedci-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fedci
-Version: 0.1.2
+Version: 0.1.4
 Summary: A small package for federated independence tests
 Author-email: Maximilian Hahn <max.hahn@gmx.de>
 License: SPDX-License-Identifier: AGPL-3.0-or-later

{python_fedci-0.1.2 → python_fedci-0.1.4}/fedci/testing.py

@@ -3,7 +3,13 @@ from typing import Dict, List, Optional, Set, Tuple
 import numpy as np
 import scipy
 
-from .env import get_env_debug, get_env_fit_intercept, get_env_line_search, get_env_lm_damping, get_env_ridge
+from .env import (
+    get_env_debug,
+    get_env_fit_intercept,
+    get_env_line_search,
+    get_env_lm_damping,
+    get_env_ridge,
+)
 from .utils import BetaUpdateData, VariableType
 
 
@@ -24,7 +30,7 @@ class RegressionTest:
         self.num_classes, self.num_parameters = params
         self.dof = self.num_classes * self.num_parameters
         self.beta = np.zeros((self.dof, 1))
-        #self.beta = np.random.randn(self.dof, 1)
+        # self.beta = np.random.randn(self.dof, 1)
         self.alpha = 1.0
 
         self.convergence_threshold = convergence_threshold
@@ -131,7 +137,9 @@ class RegressionTest:
             self.early_stop = True
             return
 
-        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
+        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
@@ -169,10 +177,7 @@ class RegressionTest:
 
             self.convergence_retry_count += 1
 
-            self.beta = self._get_new_beta(
-                self.previous_xwx,
-                self.previous_xwz
-            )
+            self.beta = self._get_new_beta(self.previous_xwx, self.previous_xwz)
             return
 
         self.convergence_retry_count = 0
@@ -185,9 +190,9 @@ 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
@@ -227,12 +232,14 @@ class LikelihoodRatioTest:
         self.bad_fit = False
 
         self.p_value: Optional[float] = None
+        self.chi2stat = None
+        self.dof = None
 
     def __repr__(self):
         if self.p_value is None:
             val = "not finished"
         else:
-            val = f"p: {self.p_value:.4f}"
+            val = f"p: {self.p_value:.4f} ({self.chi2stat:.4f}, {self.dof})"
         restricted_test_string = self.restricted_test.__repr__()
         restricted_test_string = "\n\t".join(restricted_test_string.split("\n"))
         unrestricted_test_string = self.unrestricted_test.__repr__()
@@ -328,9 +335,9 @@ class LikelihoodRatioTest:
         t0_dof = self.restricted_test.dof
         t1_dof = self.unrestricted_test.dof
 
-        self.p_value = scipy.stats.chi2.sf(
-            2 * (t1_llf - t0_llf), t1_dof - t0_dof
-        ).item()
+        self.chi2stat = 2 * (t1_llf - t0_llf)
+        self.dof = t1_dof - t0_dof
+        self.p_value = scipy.stats.chi2.sf(self.chi2stat, self.dof).item()
 
         if get_env_debug() >= 2:
             print(

{python_fedci-0.1.2 → python_fedci-0.1.4}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "python-fedci"
 authors = [{ name = "Maximilian Hahn", email = "max.hahn@gmx.de" }]
-version = "0.1.2"
+version = "0.1.4"
 license = { file = "LICENSE" }
 description = "A small package for federated independence tests"
 readme = "README.md"

{python_fedci-0.1.2 → python_fedci-0.1.4}/python_fedci.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fedci
-Version: 0.1.2
+Version: 0.1.4
 Summary: A small package for federated independence tests
 Author-email: Maximilian Hahn <max.hahn@gmx.de>
 License: SPDX-License-Identifier: AGPL-3.0-or-later