freealg 0.7.11__tar.gz → 0.7.12__tar.gz

{freealg-0.7.11 → freealg-0.7.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: freealg
-Version: 0.7.11
+Version: 0.7.12
 Summary: Free probability for large matrices
 Home-page: https://github.com/ameli/freealg
 Download-URL: https://github.com/ameli/freealg/archive/main.zip
@@ -37,6 +37,7 @@ Requires-Dist: matplotlib
 Requires-Dist: colorcet
 Requires-Dist: statsmodels
 Requires-Dist: numba
+Requires-Dist: tqdm
 Provides-Extra: test
 Requires-Dist: tox; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"

{freealg-0.7.11 → freealg-0.7.12}/freealg/__init__.py

@@ -8,13 +8,13 @@
 
 from ._free_form import FreeForm, eigvalsh, cond, norm, trace, slogdet, supp, \
     sample, kde
-from ._algebraic_form import AlgebraicForm
+from ._algebraic_form import AlgebraicForm, decompress_newton
 from ._geometric_form import GeometricForm
 from . import visualization
 from . import distributions
 
 __all__ = ['FreeForm', 'distributions', 'visualization', 'eigvalsh', 'cond',
            'norm', 'trace', 'slogdet', 'supp', 'sample', 'kde',
-           'AlgebraicForm', 'GeometricForm']
+           'AlgebraicForm', 'GeometricForm', 'decompress_newton']
 
 from .__version__ import __version__                          # noqa: F401 E402

freealg-0.7.12/freealg/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.7.12"

{freealg-0.7.11 → freealg-0.7.12}/freealg/_algebraic_form/__init__.py

@@ -7,5 +7,6 @@
 # directory of this source tree.
 
 from .algebraic_form import AlgebraicForm
+from ._decompress7 import decompress_newton
 
-__all__ = ['AlgebraicForm']
+__all__ = ['AlgebraicForm', 'decompress_newton']

{freealg-0.7.11 → freealg-0.7.12}/freealg/_algebraic_form/_constraints.py

@@ -1,4 +1,3 @@
-
 # SPDX-FileCopyrightText: Copyright 2025, Siavash Ameli <sameli@berkeley.edu>
 # SPDX-License-Identifier: BSD-3-Clause
 # SPDX-FileType: SOURCE
@@ -54,15 +53,61 @@ def _series_pow(mser, j, q_max):
 # build moment constraints matrix
 # ===============================
 
+# def build_moment_constraint_matrix(pairs, deg_z, s, mu):
+#
+#     mu = numpy.asarray(mu, dtype=float).ravel()
+#     if mu.size == 0:
+#         return numpy.zeros((0, len(pairs)), dtype=float)
+#
+#     # m(z) = -sum_{p>=0} mu_p / z^{p+1}; t = 1/z so m(t) = -sum mu_p t^{p+1}
+#     r = mu.size - 1
+#     q_max = r
+#
+#     mser = numpy.zeros(q_max + 1, dtype=float)
+#     for p in range(mu.size):
+#         q = p + 1
+#         if q <= q_max:
+#             mser[q] = -float(mu[p])
+#
+#     # Precompute (m(t))^j coefficients up to t^{q_max}
+#     mpow = []
+#     for j in range(s + 1):
+#         mpow.append(_series_pow(mser, j, q_max))
+#
+#     # Constraints: coeff of t^q in Q(t) := t^{deg_z} P(1/t, m(t)) must be 0
+#     # Q(t) = sum_{i,j} c_{i,j} * t^{deg_z - i} * (m(t))^j
+#     n_coef = len(pairs)
+#     B = numpy.zeros((q_max + 1, n_coef), dtype=float)
+#
+#     for k, (i, j) in enumerate(pairs):
+#         shift = deg_z - i
+#         if shift < 0:
+#             continue
+#         mj = mpow[j]
+#         for q in range(q_max + 1):
+#             qq = q - shift
+#             if 0 <= qq <= q_max:
+#                 B[q, k] = mj[qq]
+#
+#     # Drop all-zero rows (can happen if index-set can't support higher
+#     # moments)
+#     row_norm = numpy.linalg.norm(B, axis=1)
+#     keep = row_norm > 0.0
+#     B = B[keep, :]
+#
+#     return B
+
 def build_moment_constraint_matrix(pairs, deg_z, s, mu):
 
     mu = numpy.asarray(mu, dtype=float).ravel()
     if mu.size == 0:
         return numpy.zeros((0, len(pairs)), dtype=float)
 
-    # m(z) = -sum_{p>=0} mu_p / z^{p+1}; t = 1/z so m(t) = -sum mu_p t^{p+1}
+    # mu has entries mu_0..mu_r
     r = mu.size - 1
-    q_max = r
+
+    # Need t^{r+1} in m(t) = -sum mu_p t^{p+1}, otherwise mu_0 is dropped.
+    q_max = r + 1
 
     mser = numpy.zeros(q_max + 1, dtype=float)
     for p in range(mu.size):
@@ -70,29 +115,25 @@ def build_moment_constraint_matrix(pairs, deg_z, s, mu):
         if q <= q_max:
             mser[q] = -float(mu[p])
 
-    # Precompute (m(t))^j coefficients up to t^{q_max}
     mpow = []
     for j in range(s + 1):
         mpow.append(_series_pow(mser, j, q_max))
 
-    # Constraints: coeff of t^q in Q(t) := t^{deg_z} P(1/t, m(t)) must be 0
-    # Q(t) = sum_{i,j} c_{i,j} * t^{deg_z - i} * (m(t))^j
     n_coef = len(pairs)
-    B = numpy.zeros((q_max + 1, n_coef), dtype=float)
+
+    # We only want constraints for l=0..r  -> that's q = 0..r in Q(t)
+    B = numpy.zeros((r + 1, n_coef), dtype=float)
 
     for k, (i, j) in enumerate(pairs):
         shift = deg_z - i
         if shift < 0:
             continue
         mj = mpow[j]
-        for q in range(q_max + 1):
+        for q in range(r + 1):
             qq = q - shift
             if 0 <= qq <= q_max:
                 B[q, k] = mj[qq]
 
-    # Drop all-zero rows (can happen if index-set can't support higher moments)
     row_norm = numpy.linalg.norm(B, axis=1)
     keep = row_norm > 0.0
-    B = B[keep, :]
-
-    return B
+    return B[keep, :]