summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorMario Mulansky <mario.mulansky@gmx.net>2014-10-10 17:09:57 +0200
committerMario Mulansky <mario.mulansky@gmx.net>2014-10-10 17:09:57 +0200
commit7a8f12ab65ceea0211f6f24c26042768ef005302 (patch)
tree337274557c9947aae8adc1754e6857b5a6168e44 /examples
parenta769a03d089ac0c61e2155239a28665c9316e14a (diff)
fixed the examples
Diffstat (limited to 'examples')
-rw-r--r--examples/isi_matrix.py8
-rw-r--r--examples/test_merge.py7
2 files changed, 4 insertions, 11 deletions
diff --git a/examples/isi_matrix.py b/examples/isi_matrix.py
index a149cd6..0d6e185 100644
--- a/examples/isi_matrix.py
+++ b/examples/isi_matrix.py
@@ -5,12 +5,8 @@ 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.add_auxiliary_spikes(
- spk.spike_train_from_string(line), 4000))
+# first load the data, interval ending time = 4000, start=0 (default)
+spike_trains = spk.load_spike_trains_from_txt("SPIKY_testdata.txt", 4000)
print(len(spike_trains))
diff --git a/examples/test_merge.py b/examples/test_merge.py
index 1186062..0c34608 100644
--- a/examples/test_merge.py
+++ b/examples/test_merge.py
@@ -6,11 +6,8 @@ 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))
+# first load the data, ending time = 4000
+spike_trains = spk.load_spike_trains_from_txt("SPIKY_testdata.txt", 4000)
spikes = spk.merge_spike_trains([spike_trains[0], spike_trains[1]])