Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
- python=3.11.0
- cartopy
- numba
- scipy<1.16
- scipy
- pyyaml
- requests
- scikit-learn
Expand All @@ -18,8 +18,8 @@ dependencies:
- tqdm
- wget
- pip
- pytest
- pip:
- pytest
- pyhht
- dill
- '-e .'
2 changes: 1 addition & 1 deletion pyleoclim/core/correns.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ def plot(self, figsize=[4, 4], title=None, ax=None, savefig_settings=None, hist_

# put everything into a dataframe to be able to use seaborn

data = np.empty((len(self.r),3)); data[:] = np.NaN
data = np.empty((len(self.r),3)); data[:] = np.nan
col = [f'p < {self.alpha} (w/ FDR)',f'p < {self.alpha} (w/o FDR)', f'p ≥ {self.alpha}']
data[self.signif_fdr,0] = r_signif_fdr
data[self.signif, 1] = r_signif
Expand Down
10 changes: 5 additions & 5 deletions pyleoclim/utils/spectral.py
Original file line number Diff line number Diff line change
Expand Up @@ -1025,10 +1025,10 @@ def cwt_psd(ys, ts, freq=None, freq_method='log', freq_kwargs=None,scale = None,
def beta_estimation(psd, freq, fmin=None, fmax=None, logf_binning_step='max', verbose=False):
''' Estimate the scaling exponent of a power spectral density.

Models the spectrum as :math: `S(f) \propto 1/f^{\beta}`. For instance:
- :math: `\beta = 0` corresponds to white noise
- :math: `\beta = 1` corresponds to pink noise
- :math: `\beta = 2` corresponds to red noise (Brownian motion)
Models the spectrum as :math: `S(f) \\propto 1/f^{\\beta}`. For instance:
- :math: `\\beta = 0` corresponds to white noise
- :math: `\\beta = 1` corresponds to pink noise
- :math: `\\beta = 2` corresponds to red noise (Brownian motion)


Parameters
Expand Down Expand Up @@ -1170,7 +1170,7 @@ def beta2Hurst(beta):
Parameters
----------
beta : float
the estimated slope of a power spectral density :math: `S(f) \propto 1/f^{\beta}`
the estimated slope of a power spectral density :math: `S(f) \\propto 1/f^{\\beta}`

Returns
-------
Expand Down
2 changes: 1 addition & 1 deletion pyleoclim/utils/tsutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -1316,7 +1316,7 @@ def gaussianize(ys):

# Create a blank copy of the array.
yg = copy.deepcopy(ys)
yg[:] = np.NAN
yg[:] = np.nan

nz = np.logical_not(np.isnan(ys))
index = np.argsort(ys[nz])
Expand Down
6 changes: 2 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,15 @@ dependencies = [
"seaborn>=0.13.0",
"scikit-learn>=0.24.2",
"pathos>=0.2.8",
"tqdm>=4.61.2",
"tftb>=0.1.3",
"tqdm",
"wget>=3.2",
"numba>=0.56",
"nitime>=0.9",
"tabulate>=0.8.9",
"Unidecode>=1.1.1",
"cartopy>=0.22.0",
"pyyaml",
"beautifulsoup4",
"scipy<1.16.0",
"scipy>=1.15.0",
"requests",
"dill",
]
Expand Down
Loading