freealg 0.7.9__tar.gz → 0.7.10__tar.gz

{freealg-0.7.9 → freealg-0.7.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: freealg
-Version: 0.7.9
+Version: 0.7.10
 Summary: Free probability for large matrices
 Home-page: https://github.com/ameli/freealg
 Download-URL: https://github.com/ameli/freealg/archive/main.zip

freealg-0.7.10/freealg/__version__.py

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

{freealg-0.7.9 → freealg-0.7.10}/freealg/_algebraic_form/_decompress.py

@@ -504,6 +504,7 @@ def decompress_newton(z_list, t_grid, a_coeffs, w0_list=None,
     ok : ndarray of bool, same shape as W
         Convergence flags from the accepted solve at each point.
     """
+
     z_list = numpy.asarray(z_list, dtype=complex).ravel()
     t_grid = numpy.asarray(t_grid, dtype=float).ravel()
     nt = t_grid.size

{freealg-0.7.9 → freealg-0.7.10}/freealg/_algebraic_form/_homotopy.py

@@ -6,12 +6,12 @@ import numpy
 from ._moments import AlgebraicStieltjesMoments
 from tqdm import tqdm
 
-__all__ = ['stieltjes_poly']
+__all__ = ['StieltjesPoly']
 
 
-# =====================
+# ===========
 # select root
-# =====================
+# ===========
 
 def select_root(roots, z, target):
     """
@@ -202,7 +202,7 @@ class StieltjesPoly(object):
 
         # Iterate over indices so we can pass Python scalars into evaluate()
         if progress:
-            indices = tqdm(numpy.ndindex(z_arr.shape),total=z_arr.size)
+            indices = tqdm(numpy.ndindex(z_arr.shape), total=z_arr.size)
         else:
             indices = numpy.ndindex(z_arr.shape)
         for idx in indices:
@@ -265,7 +265,7 @@ class StieltjesPoly(object):
 #         coeffs = numpy.asarray(poly_coeffs_m(z_val), dtype=numpy.complex128)
 #         return numpy.roots(coeffs)
 
-#     # If user asked for a real-axis value, interpret as boundary value from C+.
+#     # If user asked a real-axis value, interpret as boundary value from C+.
 #     if z.imag == 0.0:
 #         if eps is None:
 #             eps = 1e-8 * max(1.0, abs(z))

{freealg-0.7.9 → freealg-0.7.10}/freealg/_algebraic_form/_moments.py

@@ -1,9 +1,13 @@
+# =======
+# Imports
+# =======
+
 import numpy
 
 
-# =========
+# =======
 # Moments
-# =========
+# =======
 
 class MomentsESD(object):
     """
@@ -85,9 +89,9 @@ class MomentsESD(object):
         # (a_{n,0},...,a_{n,n-1})
         self._a = {0: numpy.array([1.0])}
 
-    # ----------
-    # moments
-    # ----------
+    # =
+    # m
+    # =
 
     def m(self, n):
         """
@@ -111,9 +115,9 @@ class MomentsESD(object):
             self._m[n] = numpy.mean(self.eig ** n)
         return self._m[n]
 
-    # -------------
-    # coefficients
-    # -------------
+    # ======
+    # coeffs
+    # ======
 
     def coeffs(self, n):
         """
@@ -129,7 +133,8 @@ class MomentsESD(object):
         -------
 
         a_n : numpy.ndarray
-            Array of shape ``(n,)`` containing :math:`(a_{n,0}, \\dots, a_{n,n-1})`.
+            Array of shape ``(n,)`` containing :math:`(a_{n,0},
+            \\dots, a_{n,n-1})`.
         """
 
         if n in self._a:
@@ -143,6 +148,10 @@ class MomentsESD(object):
         self._compute_row(n)
         return self._a[n]
 
+    # ===========
+    # compute row
+    # ===========
+
     def _compute_row(self, n):
         """
         Compute and memoize the coefficient row :math:`a_n`.
@@ -212,9 +221,9 @@ class MomentsESD(object):
 
         self._a[n] = a_n
 
-    # ----------
+    # --------
     # evaluate
-    # ----------
+    # --------
 
     def __call__(self, n, t=0.0):
         """
@@ -254,18 +263,18 @@ class MomentsESD(object):
         k = numpy.arange(n, dtype=float)
         return numpy.dot(a_n, numpy.exp(k * t))
 
+
 # ===========================
 # Algebraic Stieltjes Moments
 # ===========================
 
-
 class AlgebraicStieltjesMoments(object):
     """
     Given coefficients a[i,j] for P(z,m)=sum_{i,j} a[i,j] z^i m^j,
     compute the large-|z| branch
         m(z) = sum_{k>=0} mu_series[k] / z^{k+1}.
 
-    Convention here: choose mu0 (the leading coefficient) by solving the 
+    Convention here: choose mu0 (the leading coefficient) by solving the
     leading-diagonal equation and (by default) picking the root closest
     to -1, i.e. m(z) ~ -1/z.
 
@@ -281,7 +290,7 @@ class AlgebraicStieltjesMoments(object):
         if self.a.ndim != 2:
             raise ValueError("a must be a 2D NumPy array with a[i,j]=a_{ij}.")
 
-        self.I = self.a.shape[0] - 1
+        self.I = self.a.shape[0] - 1                               # noqa: E741
         self.J = self.a.shape[1] - 1
 
         nz = numpy.argwhere(self.a != 0)
@@ -320,7 +329,8 @@ class AlgebraicStieltjesMoments(object):
             if j > 0:
                 self.A0 += j * coeff * self.mu0pow[j - 1]
         if self.A0 == 0:
-            raise ValueError("A0 is zero for this mu0; the sequential recursion is degenerate.")
+            raise ValueError("A0 is zero for this mu0; the sequential " +
+                             "recursion is degenerate.")
 
         # Stored series moments mu_series[0..]
         self._mu = [self.mu0]
@@ -344,14 +354,17 @@ class AlgebraicStieltjesMoments(object):
                 coeffs[j] = self.a[i, j]
 
         if not numpy.any(coeffs != 0):
-            raise ValueError("Leading diagonal polynomial is identically zero; cannot determine mu0.")
+            raise ValueError("Leading diagonal polynomial is identically " +
+                             "zero; cannot determine mu0.")
 
         deg = int(numpy.max(numpy.nonzero(coeffs)[0]))
-        roots = numpy.roots(coeffs[:deg + 1][::-1])  # descending powers for numpy.roots
+
+        # descending powers for numpy.roots
+        roots = numpy.roots(coeffs[:deg + 1][::-1])
 
         # Targetting mu0 = -1 for ~ -1/z asymptotics
         mu0 = roots[numpy.argmin(numpy.abs(roots + 1))]
-        
+
         if abs(mu0.imag) < 1e-12:
             mu0 = mu0.real
         return mu0
@@ -363,7 +376,8 @@ class AlgebraicStieltjesMoments(object):
 
             # Compute f[j] = coefficient of w^k in (S_trunc(w))^j,
             # where S_trunc uses mu_0..mu_{k-1} only (i.e. mu_k treated as 0).
-            # Key fact: in the true c[j,k], mu_k can only appear linearly as j*mu_k*mu0^{j-1}.
+            # Key fact: in the true c[j,k], mu_k can only appear linearly as
+            # j*mu_k*mu0^{j-1}.
             f = [0] * (self.J + 1)
             f[0] = 0
             for j in range(1, self.J + 1):
@@ -371,8 +385,9 @@ class AlgebraicStieltjesMoments(object):
                 # sum_{t=1..k-1} mu_t * c[j-1, k-t]
                 for t in range(1, k):
                     ssum += self._mu[t] * self._c[j - 1][k - t]
-                # recurrence: c[j,k] = mu0*c[j-1,k] + sum_{t=1..k-1} mu_t*c[j-1,k-t] + mu_k*c[j-1,0]
-                # with mu_k=0 for f, and c[j-1,k]=f[j-1]
+                # recurrence: c[j,k] = mu0*c[j-1,k] + sum_{t=1..k-1}
+                # mu_t*c[j-1,k-t] + mu_k*c[j-1,0] with mu_k=0 for f,
+                # and c[j-1,k]=f[j-1]
                 f[j] = self.mu0 * f[j - 1] + ssum
 
             # Build the linear equation for mu_k:
@@ -386,7 +401,8 @@ class AlgebraicStieltjesMoments(object):
                     continue
                 rest += coeff * f[j]
 
-            # lower diagonals s=1..k contribute coeff*c[j,k-s] (already known since k-s < k)
+            # lower diagonals s=1..k contribute coeff*c[j,k-s] (already known
+            # since k-s < k)
             for s in range(1, k + 1):
                 entries = self.diag.get(s)
                 if not entries:
@@ -402,7 +418,8 @@ class AlgebraicStieltjesMoments(object):
             mu_k = -rest / self.A0
             self._mu.append(mu_k)
 
-            # Now append the new column k to c using the full convolution recurrence:
+            # Now append the new column k to c using the full convolution
+            # recurrence:
             # c[j,k] = sum_{t=0..k} mu_t * c[j-1,k-t]
             for j in range(self.J + 1):
                 self._c[j].append(0)
@@ -430,9 +447,10 @@ class AlgebraicStieltjesMoments(object):
         # Estimate the radius of convergence of the Stieltjes
         # series
         if N < 3:
-            raise RuntimeError("Order is too small, choose a larger value of N")
+            raise RuntimeError("N is too small, choose a larger value.")
         self._ensure(N)
-        return max([numpy.abs(self._mu[j] / self._mu[j-1]) for j in range(2,N+1)])
+        return max([numpy.abs(self._mu[j] / self._mu[j-1])
+                    for j in range(2, N+1)])
 
     def stieltjes(self, z, N):
         # Estimate Stieltjes transform (root) using moment

{freealg-0.7.9 → freealg-0.7.10}/freealg/_algebraic_form/algebraic_form.py

@@ -63,7 +63,7 @@ class AlgebraicForm(object):
         * ``'complex128'``: 128-bit complex numbers, equivalent of two double
           precision floating point.
         * ``'complex256'``: 256-bit complex numbers, equivalent of two long
-          double precision floating point. This optino is only available on
+          double precision floating point. This option is only available on
           Linux machines.
 
         When using series acceleration methods (such as setting
@@ -145,7 +145,7 @@ class AlgebraicForm(object):
         self.A = None
         self.eig = None
         self._stieltjes = None
-        self.moments = None
+        self._moments = None
         self.support = support
         self.delta = delta    # Offset above real axis to apply Plemelj formula
 
@@ -180,7 +180,7 @@ class AlgebraicForm(object):
             # Use empirical Stieltjes function
             self._stieltjes = lambda z: \
                 numpy.mean(1.0/(self.eig-z[:, numpy.newaxis]), axis=-1)
-            self.moments = MomentsESD(self.eig)
+            self._moments = MomentsESD(self.eig)  # NOTE (never used)
 
         # Support
         if support is None:
@@ -271,7 +271,7 @@ class AlgebraicForm(object):
                 triangular=triangular, normalize=normalize, mu=mu,
                 mu_reg=mu_reg)
 
-        # Compute global branhc points, zeros of leading a_j, and support
+        # Compute global branch points, zeros of leading a_j, and support
         branch_points, a_s_zero, support = compute_singular_points(a_coeffs)
 
         self.a_coeffs = a_coeffs
@@ -294,7 +294,7 @@ class AlgebraicForm(object):
         status['res_99_9'] = float(res_99_9)
         status['fit_metrics'] = fit_metrics
         self.status = status
-        self._stieltjes = StieltjesPoly(self.a_coeffs)
+        self._stieltjes = StieltjesPoly(self.a_coeffs)  # NOTE overwrite init
 
         if verbose:
             print(f'fit residual max  : {res_max:>0.4e}')
@@ -462,11 +462,11 @@ class AlgebraicForm(object):
 
         # Preallocate density to zero
         hilb = -self._stieltjes(x).real / numpy.pi
-        
+
         if plot:
             plot_hilbert(x, hilb, support=self.support, latex=latex,
                          save=save)
-        
+
         return hilb
 
     # =========
@@ -531,7 +531,7 @@ class AlgebraicForm(object):
         # Create x if not given
         if x is None:
             x = self._generate_grid(2.0, extend=2.0)[::2]
-        
+
         # Create y if not given
         if (plot is False) and (y is None):
             # Do not use a Cartesian grid. Create a 1D array z slightly above
@@ -544,13 +544,13 @@ class AlgebraicForm(object):
                 y = numpy.linspace(-1, 1, 200)
             x_grid, y_grid = numpy.meshgrid(x.real, y.real)
             z = x_grid + 1j * y_grid              # shape (Ny, Nx)
-        
+
         m = self._stieltjes(z, progress=True)
-        
+
         if plot:
             plot_stieltjes(x, y, m, m, self.broad_support, latex=latex,
                            save=save)
-        
+
         return m
 
     # ==============
@@ -611,8 +611,10 @@ class AlgebraicForm(object):
         alpha = numpy.atleast_1d(size) / self.n
 
         # Lower and upper bound on new support
-        hilb_lb = (1.0 / self._stieltjes(self.lam_m + self.delta * 1j).item()).real
-        hilb_ub = (1.0 / self._stieltjes(self.lam_p + self.delta * 1j).item()).real
+        hilb_lb = \
+            (1.0 / self._stieltjes(self.lam_m + self.delta * 1j).item()).real
+        hilb_ub = \
+            (1.0 / self._stieltjes(self.lam_p + self.delta * 1j).item()).real
         lb = self.lam_m - (numpy.max(alpha) - 1) * hilb_lb
         ub = self.lam_p - (numpy.max(alpha) - 1) * hilb_ub
 
@@ -639,7 +641,8 @@ class AlgebraicForm(object):
             t = numpy.log(alpha)
 
             # Ensure it starts from t = 0
-            t = numpy.concatenate([numpy.zeros(1), t])
+            if t[0] > 1.0:
+                t = numpy.concatenate([numpy.zeros(1), t])
 
             # Evolve
             W, ok = decompress_newton(

{freealg-0.7.9 → freealg-0.7.10}/freealg.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: freealg
-Version: 0.7.9
+Version: 0.7.10
 Summary: Free probability for large matrices
 Home-page: https://github.com/ameli/freealg
 Download-URL: https://github.com/ameli/freealg/archive/main.zip

freealg-0.7.9/freealg/__version__.py

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