From 258ea054a3024c26932255fc2ec3c82b4cf50131 Mon Sep 17 00:00:00 2001 From: Per A Brodtkorb Date: Mon, 6 Nov 2017 12:31:04 +0100 Subject: [PATCH] pep8 --- wafo/objects.py | 5 +++-- wafo/spectrum/core.py | 41 +++++++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/wafo/objects.py b/wafo/objects.py index 76940c7..92643a6 100644 --- a/wafo/objects.py +++ b/wafo/objects.py @@ -48,7 +48,7 @@ _wafocov_estimation = JITImport('wafo.covariance.estimation') _wafospec = JITImport('wafo.spectrum') __all__ = ['TimeSeries', 'LevelCrossings', 'CyclePairs', 'TurningPoints', - 'sensortypeid', 'sensortype'] + 'CycleMatrix'] def _invchi2(q, df): @@ -905,7 +905,8 @@ class CyclePairs(PlotData): # for j in range(i + 1, n): # = i+1:n # if F[i, j] != 0: # hi = h * _lamda[i, j] -# F1 = np.exp(-1 / (2 * hi**2) * ((I - i)**2 + (J - j)**2)) # Gaussian kernel +# # Gaussian kernel +# F1 = np.exp(-1 / (2 * hi**2) * ((I - i)**2 + (J - j)**2)) # F1 = F1 + F1.T # Mirror kernel in diagonal # F1 = np.triu(F1, 1 + NOsubzero) # Set to zero below and on diagonal # F1 = F[i, j] * F1 / np.sum(F1) # Normalize diff --git a/wafo/spectrum/core.py b/wafo/spectrum/core.py index 3f6076b..4867061 100644 --- a/wafo/spectrum/core.py +++ b/wafo/spectrum/core.py @@ -580,16 +580,16 @@ class SpecData1D(PlotData): @freqtype.setter def freqtype(self, freqtype): - if self._freqtype==freqtype: + if self._freqtype == freqtype: return # do nothind - if freqtype=='w' and self._freqtype=='f': - self.args *= 2*np.pi - self.data /= 2*np.pi + if freqtype == 'w' and self._freqtype == 'f': + self.args *= 2 * np.pi + self.data /= 2 * np.pi self._freqtype = 'w' self.setlabels() - elif freqtype=='f' and self._freqtype=='w': - self.args /= 2*np.pi - self.data *= 2*np.pi + elif freqtype == 'f' and self._freqtype == 'w': + self.args /= 2 * np.pi + self.data *= 2 * np.pi self._freqtype = 'f' self.setlabels() @@ -1153,7 +1153,7 @@ class SpecData1D(PlotData): pl = [10, 30, 50, 70, 90, 95, 99, 99.9] mmpdf.cl = qlevels(uvdens, pl, xi=(h, h)) mmpdf.pl = pl - except: + except Exception: pass return mmpdf @@ -1497,7 +1497,7 @@ class SpecData1D(PlotData): mmtmm=1, mmlmm=1, vmm=2, vmmtmm=3, vmmlmm=3, - mmtmd=4, vmmtmd=4, mmlmd=4, vmmlmd=4, + mmtmd=4, vmmtmd=4, mmlmd=4, vmmlmd=4, mmtdm=5, vmmtdm=5, mmldm=5, vmmldm=5) defnr = kind2defnr.get(kind, 0) in_space = (ftype == 'k') # distribution in space or time @@ -1642,7 +1642,7 @@ class SpecData1D(PlotData): ftmp = np.reshape(ftmp, shape) * der0[:, :, None] / A err = np.reshape(err, shape) * der0[:, :, None] / A - f.args[2] = t[:]*A + f.args[2] = t[:] * A _labz = 'wave length [m]' if in_space else 'period [sec]' else: @@ -1653,15 +1653,15 @@ class SpecData1D(PlotData): if (defnr == -1): ftmp0 = np.fliplr(mctp2rfc(np.fliplr(ftmp))) err = np.abs(ftmp0 - - np.fliplr(mctp2rfc(np.fliplr(ftmp+err)))) + np.fliplr(mctp2rfc(np.fliplr(ftmp + err)))) ftmp = ftmp0 elif (defnr == -2): ftmp0 = np.fliplr(mctp2tc(np.fliplr(ftmp), utc, - paramu)) * sqrt(L4*L0)/L2 + paramu)) * sqrt(L4 * L0) / L2 err = np.abs(ftmp0 - - np.fliplr(mctp2tc(np.fliplr(ftmp+err), + np.fliplr(mctp2tc(np.fliplr(ftmp + err), utc, paramu)) * - sqrt(L4*L0)/L2) + sqrt(L4 * L0) / L2) index1 = np.flatnonzero(f.args[0] > 0) index2 = np.flatnonzero(f.args[1] < 0) ftmp = np.flipud(ftmp0[index2, index1]) @@ -1673,9 +1673,9 @@ class SpecData1D(PlotData): f.data = ftmp f.err = err else: # Only time or wave length distributions wanted - f.data = ftmp/A - f.err = err/A - f.args[0] = A*t + f.data = ftmp / A + f.err = err / A + f.args[0] = A * t # if def_[0] == 't': # f.labx{1} = 'period [sec]' # else: @@ -1684,7 +1684,7 @@ class SpecData1D(PlotData): if defnr > 3: f.data = np.reshape(f.data, [Nt, Nt]) f.err = np.reshape(f.err, [Nt, Nt]) - f.args[1] = A*t + f.args[1] = A * t # if def_[0] == 't': # f.labx{2} = 'period [sec]' # else: @@ -1696,7 +1696,7 @@ class SpecData1D(PlotData): try: f.cl, f.pl = qlevels(f.f, [10, 30, 50, 70, 90, 95, 99, 99.9], f.args[0], f.args[1]) - except: + except Exception: warnings.warn('Singularity likely in pdf') # Test of spec2mmtpdf @@ -3723,7 +3723,7 @@ class SpecData1D(PlotData): S0 = r_[2. / (sqrt(m[0]) * m[1]) * (mij[0] - m[0] * mij[1] / m[1]), 1. / sqrt(m[2]) * (mij[0] / m[0] - mij[2] / m[2]), 1. / (2 * m[1]) * sqrt(m[0] / m[2]) * (mij[0] / m[0] - mij[2] / - m[2] - mij[1] / m[1] + m[0] * mij[3] / (m[1] * m[2]))] + m[2] - mij[1] / m[1] + m[0] * mij[3] / (m[1] * m[2]))] R1 = ones((15, 15)) R1[:, :] = nan @@ -4257,6 +4257,7 @@ def test_mm_pdf(): mm.plot() plotbackend.show() + def test_docstrings(): import doctest doctest.testmod()