Skip to content

Commit

Permalink
Merge branch 'master' into enh/add_caching_action
Browse files Browse the repository at this point in the history
  • Loading branch information
Moritz-Alexander-Kern authored Jul 23, 2024
2 parents 9cb7109 + 0984e19 commit f6e6353
Show file tree
Hide file tree
Showing 5 changed files with 358 additions and 106 deletions.
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
intersphinx_mapping = {
'viziphant': ('https://viziphant.readthedocs.io/en/stable/', None),
'numpy': ('https://numpy.org/doc/stable', None),
'neo': ('https://neo.readthedocs.io/en/stable/', None),
'neo': ('https://neo.readthedocs.io/en/latest/', None),
'quantities': ('https://python-quantities.readthedocs.io/en/stable/', None),
'python': ('https://docs.python.org/3/', None),
'scipy': ('https://docs.scipy.org/doc/scipy/', None)
Expand Down
3 changes: 2 additions & 1 deletion elephant/cubic.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,5 +237,6 @@ def _kstat(data):
"""
if len(data) == 0:
raise ValueError('The input data must be a non-empty array')
moments = [scipy.stats.kstat(data, n=n) for n in [1, 2, 3]]
# Due to issues with precision, ensure float64 (default) is the precision of the data array. (scipy == 1.14.0)
moments = [scipy.stats.kstat(data.astype(np.float64), n=n) for n in [1, 2, 3]]
return moments
2 changes: 1 addition & 1 deletion elephant/spade.py
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ def _build_context(binary_matrix, winlen):
(np.ones((len(windows_col)), dtype=bool),
(windows_row, windows_col)),
shape=(num_bins, winlen * num_neurons),
dtype=bool).A
dtype=bool).toarray()
# Array containing all the possible attributes (each spike is indexed by
# a number equal to neu idx*winlen + bin_idx)
attributes = np.array(
Expand Down
Loading

0 comments on commit f6e6353

Please sign in to comment.