diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2016-06-18 16:32:39 -0700 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2016-06-18 16:32:39 -0700 |
| commit | a63839708d6574567bcd518a822a9f10629ed80b (patch) | |
| tree | 02c28e0856b62c08fd4d3622ee68d145d8eee6eb /examples/multivariate.py | |
| parent | d9e2125dcc76693056ab04264add29227f398f4f (diff) | |
| parent | 4691d0e77a024fbc73d1098ee557d65f8f2ddc89 (diff) | |
Merge branch 'import_time_series' into develop
Conflicts:
pyspike/__init__.py
resolved
Diffstat (limited to 'examples/multivariate.py')
| -rw-r--r-- | examples/multivariate.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/multivariate.py b/examples/multivariate.py index 93f8516..e9579a5 100644 --- a/examples/multivariate.py +++ b/examples/multivariate.py @@ -28,7 +28,7 @@ num_of_spikes = sum([len(spike_trains[i]) 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() |