Skip to content

Commit cd91833

Browse files
committed
Integer divisions when possible. No need to cast to float anymore.
1 parent e3d1f29 commit cd91833

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

nitime/algorithms/spectral.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def get_spectra(time_series, method=None):
105105
Fs = method.get('Fs', 2 * np.pi)
106106
detrend = method.get('detrend', mlab.detrend_none)
107107
window = method.get('window', mlab.window_hanning)
108-
n_overlap = method.get('n_overlap', int(np.ceil(NFFT / 2)))
108+
n_overlap = method.get('n_overlap', int(np.ceil(NFFT // 2)))
109109

110110
# The length of the spectrum depends on how many sides are taken, which
111111
# depends on whether or not this is a complex object:
@@ -587,7 +587,7 @@ def multi_taper_psd(
587587
sdf_est /= Fs
588588

589589
if sides == 'onesided':
590-
freqs = np.linspace(0, Fs / 2, NFFT / 2 + 1)
590+
freqs = np.linspace(0, Fs / 2, NFFT // 2 + 1)
591591
else:
592592
freqs = np.linspace(0, Fs, NFFT, endpoint=False)
593593

@@ -726,7 +726,7 @@ def multi_taper_csd(s, Fs=2 * np.pi, NW=None, BW=None, low_bias=True,
726726
csdfs /= Fs
727727

728728
if sides == 'onesided':
729-
freqs = np.linspace(0, Fs / 2, NFFT / 2 + 1)
729+
freqs = np.linspace(0, Fs / 2, NFFT // 2 + 1)
730730
else:
731731
freqs = np.linspace(0, Fs, NFFT, endpoint=False)
732732

nitime/utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ def adaptive_weights(yk, eigvals, sides='onesided', max_iter=150):
493493
""")
494494
# we'll hope this is a correct length for L
495495
N = yk.shape[-1]
496-
L = N / 2 + 1 if sides == 'onesided' else N
496+
L = N // 2 + 1 if sides == 'onesided' else N
497497
return (np.multiply.outer(np.sqrt(eigvals), np.ones(L)), 2 * K)
498498
rt_eig = np.sqrt(eigvals)
499499

@@ -1206,10 +1206,10 @@ def fftconvolve(in1, in2, mode="full", axis=None):
12061206
# 'get' utils
12071207
#-----------------------------------------------------------------------------
12081208
def get_freqs(Fs, n):
1209-
"""Returns the center frequencies of the frequency decomposotion of a time
1209+
"""Returns the center frequencies of the frequency decomposition of a time
12101210
series of length n, sampled at Fs Hz"""
12111211

1212-
return np.linspace(0, float(Fs) / 2, float(n) / 2 + 1)
1212+
return np.linspace(0, Fs / 2, n / 2 + 1)
12131213

12141214

12151215
def circle_to_hz(omega, Fsamp):

0 commit comments

Comments
 (0)