summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorMario Mulansky <mario.mulansky@gmx.net>2014-10-10 17:04:04 +0200
committerMario Mulansky <mario.mulansky@gmx.net>2014-10-10 17:04:04 +0200
commita769a03d089ac0c61e2155239a28665c9316e14a (patch)
tree766347541743aab1baeb07e9d75d008981c553d6 /examples
parent62f792fa52801234d4f9c33800a44b0308e9b8ab (diff)
added load_txt function, some restructuring
Diffstat (limited to 'examples')
-rwxr-xr-xexamples/SPIKY_testdata.txt3
-rw-r--r--examples/test_data.py11
2 files changed, 7 insertions, 7 deletions
diff --git a/examples/SPIKY_testdata.txt b/examples/SPIKY_testdata.txt
index 8fa3fcf..c8bea67 100755
--- a/examples/SPIKY_testdata.txt
+++ b/examples/SPIKY_testdata.txt
@@ -1,7 +1,10 @@
64.886 305.81 696 937.77 1059.7 1322.2 1576.1 1808.1 2121.5 2381.1 2728.6 2966.9 3223.7 3473.7 3644.3 3936.3
65.553 307.49 696.63 948.66 1070.4 1312.2 1712.7 1934.3 2117.6 2356.9 2727.3 2980.6 3226.9 3475.7 3726.4 3944
+# test comment
69.064 319.1 688.32 947.85 1071.8 1300.8 1697.2 1930.6 2139.4 2354.2 2723.7 2963.6 3221.3 3470.1
59.955 313.83 692.23 955.95 1070.4 1319.6 1681.9 1963.5 2151.4 2373.8 2729.4 2971.2 3220.2 3475.5 3632.3 3788.9
+# empty line
+
59.977 306.84 686.09 935.08 1059.9 1325.9 1543.4 1821.9 2150.2 2390.4 2724.5 2969.6 3222.5 3471.5 3576 3913.9
66.415 313.41 688.83 931.43 1051.8 1304.6 1555.6 1820.2 2150.5 2383.1 2723.4 2947.7 3196.6 3443.5 3575 3804.9
66.449 311.02 689.26 947.12 1058.9 1286.6 1708.2 1957.3 2124.8 2375.7 2709.4 2977.6 3191.1 3449.6 3590.4 3831.2
diff --git a/examples/test_data.py b/examples/test_data.py
index ff7b510..dcd0f20 100644
--- a/examples/test_data.py
+++ b/examples/test_data.py
@@ -7,17 +7,14 @@ import matplotlib.pyplot as plt
import pyspike as spk
-# first load the data
-spike_trains = []
-spike_file = open("SPIKY_testdata.txt", 'r')
-for line in spike_file:
- spike_trains.append(spk.spike_train_from_string(line))
+spike_trains = spk.load_spike_trains_from_txt("SPIKY_testdata.txt",
+ time_interval=(0,4000))
# plot the spike time
for (i,spikes) in enumerate(spike_trains):
plt.plot(spikes, i*np.ones_like(spikes), 'o')
-f = spk.isi_distance(spike_trains[0], spike_trains[1], 4000)
+f = spk.isi_distance(spike_trains[0], spike_trains[1])
x, y = f.get_plottable_data()
plt.figure()
@@ -27,7 +24,7 @@ print("Average: %.8f" % f.avrg())
print("Absolute average: %.8f" % f.abs_avrg())
-f = spk.spike_distance(spike_trains[0], spike_trains[1], 4000)
+f = spk.spike_distance(spike_trains[0], spike_trains[1])
x, y = f.get_plottable_data()
print(x)
print(y)