Skip to content

Commit 94c45be

Browse files
committed
Fix CI lint and type-check failures
1 parent 8493c40 commit 94c45be

8 files changed

Lines changed: 26 additions & 13 deletions

File tree

src/quantumhall_matrixelements/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
from ._select import DEFAULT_CANONICAL_SELECT_MAX_ENTRIES
2727
from .diagnostic import get_exchange_kernels_opposite_field, get_form_factors_opposite_field
2828
from .exchange_hankel import get_exchange_kernels_hankel
29-
from .exchange_ogata import get_exchange_kernels_Ogata
30-
from .fock import build_fockmatrix_apply, get_fockmatrix_constructor, get_fockmatrix_constructor_hf
3129
from .exchange_laguerre import (
3230
ExchangeFockPrecompute,
3331
QuadratureParams,
3432
build_exchange_fock_precompute,
3533
get_exchange_kernels_laguerre,
3634
)
35+
from .exchange_ogata import get_exchange_kernels_Ogata
36+
from .fock import build_fockmatrix_apply, get_fockmatrix_constructor, get_fockmatrix_constructor_hf
3737
from .planewave import get_form_factors
3838

3939
ComplexArray = NDArray[np.complex128]

src/quantumhall_matrixelements/exchange_hankel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ def _get_L(
459459
if sign_magneticfield == 1:
460460
phase1 = 1 - 2 * ((sel_n1 - sel_m1) & 1)
461461
phase2 = 1 - 2 * ((sel_n2 - sel_m2) & 1)
462-
Xs = cast(ComplexArray, Xs.conj() * (phase1 * phase2)[None, :])
462+
Xs = Xs.conj() * (phase1 * phase2)[None, :]
463463

464464
return Xs, select_list
465465

src/quantumhall_matrixelements/exchange_legendre.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
ComplexArray = NDArray[np.complex128]
1717
RealArray = NDArray[np.float64]
18+
BoolArray = NDArray[np.bool_]
1819
IntArray = NDArray[np.int64]
1920
Int8Array = NDArray[np.int8]
2021

@@ -84,7 +85,7 @@ class LegendrePrecompute:
8485
# Only used for G values where the Bessel oscillations are resolvable.
8586
lag_J0w: RealArray | None # (nG_lag, nlag) = J_0(arg) * wg
8687
lag_L_nm: RealArray | None # (nmax, nlag) = L_p^0(xg) for p=0..nmax-1
87-
lag_mask: RealArray | None # (nG,) bool — True where Gauss-Laguerre is used
88+
lag_mask: BoolArray | None # (nG,) bool — True where Gauss-Laguerre is used
8889

8990

9091
# ---------------------------------------------------------------------------
@@ -189,7 +190,7 @@ def _build_legendre_precompute(
189190
# the Gauss-Laguerre nodes. For large |G|, fall back to mapped GL.
190191
lag_J0w: RealArray | None = None
191192
lag_L_nm: RealArray | None = None
192-
lag_mask: RealArray | None = None
193+
lag_mask: BoolArray | None = None
193194
if is_coulomb:
194195
nlag_eff = min(max(int(nlag), 2 * nmax), 350)
195196
xg, wg = sps.roots_genlaguerre(nlag_eff, -0.5)

src/quantumhall_matrixelements/exchange_ogata.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -717,8 +717,8 @@ def _per_g_max_abs(arr: ComplexArray) -> RealArray:
717717
# Group by ds to reuse WB_ds[ds]
718718
for ds_val in np.unique(ds_b):
719719
ds_val = int(ds_val)
720-
WB = WB_ds[ds_val]
721-
if WB is None:
720+
WB_opt = WB_ds[ds_val]
721+
if WB_opt is None:
722722
# This ds wasn't precomputed for this absN (shouldn't happen; be safe).
723723
power = (ds_val - 1) if is_coulomb else ds_val
724724
base_real = np.exp(common_og + float(power) * logu_minus_og)
@@ -728,6 +728,8 @@ def _per_g_max_abs(arr: ComplexArray) -> RealArray:
728728
else (base_real * Veff_og) * W_og
729729
)
730730
WB_ds[ds_val] = WB
731+
else:
732+
WB = WB_opt
731733

732734
mask = (ds_b == ds_val)
733735
if not np.any(mask):
@@ -787,7 +789,7 @@ def _per_g_max_abs(arr: ComplexArray) -> RealArray:
787789
if sign_magneticfield == 1:
788790
phase1 = 1 - 2 * ((sel_n1 - sel_m1) & 1)
789791
phase2 = 1 - 2 * ((sel_n2 - sel_m2) & 1)
790-
Xs = cast(ComplexArray, Xs.conj() * (phase1 * phase2)[None, :])
792+
Xs = Xs.conj() * (phase1 * phase2)[None, :]
791793

792794
return Xs, select_list
793795

src/quantumhall_matrixelements/fock.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
from numpy.typing import NDArray
99

1010
from .exchange_hankel import get_exchange_kernels_hankel
11-
from .exchange_ogata import get_exchange_kernels_Ogata
1211
from .exchange_laguerre import get_exchange_kernels_laguerre
12+
from .exchange_ogata import get_exchange_kernels_Ogata
1313

1414
ComplexArray = NDArray[np.complex128]
1515
RealArray = NDArray[np.float64]

tests/test_coulomb_analytic_general.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
import mpmath as mp
44
import numpy as np
55

6-
from quantumhall_matrixelements.exchange_laguerre import QuadratureParams, build_exchange_fock_precompute
6+
from quantumhall_matrixelements.exchange_laguerre import (
7+
QuadratureParams,
8+
build_exchange_fock_precompute,
9+
)
710

811

912
def _numeric_X_element(pre, g: int, n1: int, m1: int, n2: int, m2: int) -> complex:

tests/test_exchange_laguerre.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
import numpy as np
22
import pytest
33

4-
from quantumhall_matrixelements import build_fockmatrix_apply, get_exchange_kernels_compressed, get_fockmatrix_constructor
5-
from quantumhall_matrixelements.exchange_laguerre import QuadratureParams, build_exchange_fock_precompute
4+
from quantumhall_matrixelements import (
5+
build_fockmatrix_apply,
6+
get_exchange_kernels_compressed,
7+
get_fockmatrix_constructor,
8+
)
9+
from quantumhall_matrixelements.exchange_laguerre import (
10+
QuadratureParams,
11+
build_exchange_fock_precompute,
12+
)
613

714

815
def _random_hermitian_rho(nG: int, nmax: int, seed: int = 0) -> np.ndarray:

tests/test_exchange_legendre.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
"""Internal regression tests for the Gauss-Legendre backend module."""
22
import numpy as np
33

4-
from quantumhall_matrixelements.exchange_legendre import get_exchange_kernels_GaussLegendre
54
from quantumhall_matrixelements._materialize import materialize_full_tensor
5+
from quantumhall_matrixelements.exchange_legendre import get_exchange_kernels_GaussLegendre
66

77

88
def test_legendre_basic_shape():

0 commit comments

Comments
 (0)