summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Mulansky <mario.mulansky@gmx.net>2018-06-09 13:13:41 -0700
committerMario Mulansky <mario.mulansky@gmx.net>2018-06-09 13:13:41 -0700
commit110d90117f048a28ed6f9efd00176477dd54c3a6 (patch)
tree6d23574d56bb7432bd79f0515f124b99135a96af
parentee54a86cb7092ce62ad7beaae9307df8fa1bb09c (diff)
remove commented code
-rw-r--r--pyspike/spike_directionality.py54
-rw-r--r--test/test_directionality.py4
2 files changed, 2 insertions, 56 deletions
diff --git a/pyspike/spike_directionality.py b/pyspike/spike_directionality.py
index cd2bf04..d1a525e 100644
--- a/pyspike/spike_directionality.py
+++ b/pyspike/spike_directionality.py
@@ -310,57 +310,3 @@ def permutate_matrix(D, p):
for m in range(N):
D_p[n, m] = D[p[n], p[m]]
return D_p
-
-
-# internal helper functions
-
-############################################################
-# _spike_directionality_profile
-############################################################
-# def _spike_directionality_profile(spike_train1, spike_train2,
-# max_tau=None):
-# """ Computes the spike delay asymmetry profile A(t) of the two given
-# spike trains. Returns the profile as a DiscreteFunction object.
-
-# :param spike_train1: First spike train.
-# :type spike_train1: :class:`pyspike.SpikeTrain`
-# :param spike_train2: Second spike train.
-# :type spike_train2: :class:`pyspike.SpikeTrain`
-# :param max_tau: Maximum coincidence window size. If 0 or `None`, the
-# coincidence window has no upper bound.
-# :returns: The spike-distance profile :math:`S_{sync}(t)`.
-# :rtype: :class:`pyspike.function.DiscreteFunction`
-
-# """
-# # check whether the spike trains are defined for the same interval
-# assert spike_train1.t_start == spike_train2.t_start, \
-# "Given spike trains are not defined on the same interval!"
-# assert spike_train1.t_end == spike_train2.t_end, \
-# "Given spike trains are not defined on the same interval!"
-
-# # cython implementation
-# try:
-# from cython.cython_directionality import \
-# spike_train_order_profile_cython as \
-# spike_train_order_profile_impl
-# except ImportError:
-# # raise NotImplementedError()
-# if not(pyspike.disable_backend_warning):
-# print("Warning: spike_distance_cython not found. Make sure that \
-# PySpike is installed by running\n 'python setup.py build_ext --inplace'!\n \
-# Falling back to slow python backend.")
-# # use python backend
-# from cython.directionality_python_backend import \
-# spike_train_order_python as spike_train_order_profile_impl
-
-# if max_tau is None:
-# max_tau = 0.0
-
-# times, coincidences, multiplicity \
-# = spike_train_order_profile_impl(spike_train1.spikes,
-# spike_train2.spikes,
-# spike_train1.t_start,
-# spike_train1.t_end,
-# max_tau)
-
-# return DiscreteFunc(times, coincidences, multiplicity)
diff --git a/test/test_directionality.py b/test/test_directionality.py
index 3e12177..63865cc 100644
--- a/test/test_directionality.py
+++ b/test/test_directionality.py
@@ -1,6 +1,6 @@
-""" test_spike_delay_asymmetry.py
+""" test_directionality.py
-Tests the asymmetry functions
+Tests the directionality functions
Copyright 2015, Mario Mulansky <mario.mulansky@gmx.net>