diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:35:51 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:35:51 +0200 |
| commit | ad29154d8c152996d16c012dcc5798c5f1957aed (patch) | |
| tree | f01575082a649061362178d4a9870cb5fe2c33f6 /examples/multivariate.py | |
| parent | 1fa8493ce15af8cd4c057eece155f1557fc241ea (diff) | |
| parent | c17cc8602414cec883c412008a4300b2c7ac7f80 (diff) | |
Merge branch 'master' into new_directionality
Conflicts:
pyspike/__init__.py
pyspike/cython/cython_directionality.pyx
pyspike/cython/directionality_python_backend.py
pyspike/spike_directionality.py
setup.py
Diffstat (limited to 'examples/multivariate.py')
| -rw-r--r-- | examples/multivariate.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/multivariate.py b/examples/multivariate.py index 9a44758..e9579a5 100644 --- a/examples/multivariate.py +++ b/examples/multivariate.py @@ -24,11 +24,11 @@ t_loading = time.clock() print("Number of spike trains: %d" % len(spike_trains)) num_of_spikes = sum([len(spike_trains[i]) - for i in xrange(len(spike_trains))]) + for i in range(len(spike_trains))]) print("Number of spikes: %d" % num_of_spikes) # calculate the multivariate spike distance -f = spk.spike_profile_multi(spike_trains) +f = spk.spike_profile(spike_trains) t_spike = time.clock() @@ -39,7 +39,7 @@ print("Spike distance from average: %.8f" % avrg) t_avrg = time.clock() # compute average distance directly, should give the same result as above -spike_dist = spk.spike_distance_multi(spike_trains) +spike_dist = spk.spike_distance(spike_trains) print("Spike distance directly: %.8f" % spike_dist) t_dist = time.clock() |