Updated repo

Ciela-Institute · May 31, 2024 · 3e291ff · 3e291ff
2 parents 2d9e0fa + 06a47f4
commit 3e291ff
Show file tree

Hide file tree

Showing 14 changed files with 81 additions and 109 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,5 @@
 **__pycache__
-**_version.py
+**_version.py
+**.gz
+**.ipynb_checkpoints
+**ubyte
diff --git a/data/MNIST/raw/t10k-images-idx3-ubyte b/data/MNIST/raw/t10k-images-idx3-ubyte
diff --git a/data/MNIST/raw/t10k-images-idx3-ubyte.gz b/data/MNIST/raw/t10k-images-idx3-ubyte.gz
diff --git a/data/MNIST/raw/t10k-labels-idx1-ubyte b/data/MNIST/raw/t10k-labels-idx1-ubyte
diff --git a/data/MNIST/raw/t10k-labels-idx1-ubyte.gz b/data/MNIST/raw/t10k-labels-idx1-ubyte.gz
diff --git a/data/MNIST/raw/train-images-idx3-ubyte b/data/MNIST/raw/train-images-idx3-ubyte
diff --git a/data/MNIST/raw/train-images-idx3-ubyte.gz b/data/MNIST/raw/train-images-idx3-ubyte.gz
diff --git a/data/MNIST/raw/train-labels-idx1-ubyte b/data/MNIST/raw/train-labels-idx1-ubyte
diff --git a/data/MNIST/raw/train-labels-idx1-ubyte.gz b/data/MNIST/raw/train-labels-idx1-ubyte.gz
diff --git a/notebooks/mnist.ipynb b/notebooks/mnist.ipynb
diff --git a/notebooks/test.ipynb b/notebooks/test.ipynb
diff --git a/notebooks/time_series.ipynb b/notebooks/time_series.ipynb
diff --git a/src/pqm/pqm.py b/src/pqm/pqm.py
@@ -132,17 +132,13 @@ def pqm_chi2(
             pqm_chi2(x_samples, y_samples, num_refs=num_refs, whiten=whiten)
             for _ in range(bootstrap)
         ]
-    if bootstrap is not None:
-        return [pqm_chi2(x_samples, y_samples, num_refs=num_refs) for _ in range(bootstrap)]
     chi2_stat, _, dof, _ = _pqm_test(x_samples, y_samples, num_refs, whiten)
     if dof != num_refs - 1:
         # Rescale chi2 to new value which has the same cumulative probability
-        cp = chi2.sf(chi2_stat, dof)
-        chi2_stat = chi2.isf(cp, num_refs - 1)
         if chi2_stat / dof < 10:
             cp = chi2.sf(chi2_stat, dof)
             chi2_stat = chi2.isf(cp, num_refs - 1)
         else:
             chi2_stat = chi2_stat * (num_refs - 1) / dof
         dof = num_refs - 1
-    return chi2_stat, dof
+    return chi2_stat, dof
diff --git a/tests/test_gaussian.py b/tests/test_gaussian.py
@@ -43,4 +43,4 @@ def test_fail_chi2():
 
         new.append(pqm_chi2(x_samples, y_samples, num_refs=100))
     new = np.array(new)
-    assert np.mean(new[:, 0]) / 99 > 10
+    assert np.mean(new[:, 0]) / 99 > 2