Merge pull request #4 from mariomulansky/develop0.2.0

merge develop

5 files changed, 14 insertions, 13 deletions

diff --git a/examples/PySpike_testdata.txt b/examples/PySpike_testdata.txt
index 41b2362..41b2362 100755..100644
--- a/examples/PySpike_testdata.txt
+++ b/examples/PySpike_testdata.txt
diff --git a/examples/merge.py b/examples/merge.py
index 2550cdb..2ea96ea 100644
--- a/examples/merge.py
+++ b/examples/merge.py
@@ -17,12 +17,13 @@ import pyspike as spk
 # first load the data, ending time = 4000
 spike_trains = spk.load_spike_trains_from_txt("PySpike_testdata.txt", 4000)
 
-spikes = spk.merge_spike_trains([spike_trains[0], spike_trains[1]])
+merged_spike_train = spk.merge_spike_trains([spike_trains[0], spike_trains[1]])
 
-print(spikes)
+print(merged_spike_train.spikes)
 
-plt.plot(spike_trains[0], np.ones_like(spike_trains[0]), 'o')
-plt.plot(spike_trains[1], np.ones_like(spike_trains[1]), 'x')
-plt.plot(spikes, 2*np.ones_like(spikes), 'o')
+plt.plot(spike_trains[0].spikes, np.ones_like(spike_trains[0].spikes), 'o')
+plt.plot(spike_trains[1].spikes, np.ones_like(spike_trains[1].spikes), 'x')
+plt.plot(merged_spike_train.spikes,
+         2*np.ones_like(merged_spike_train.spikes), 'o')
 
 plt.show()
diff --git a/examples/multivariate.py b/examples/multivariate.py
index 260b217..53dbf0f 100644
--- a/examples/multivariate.py
+++ b/examples/multivariate.py
@@ -19,11 +19,12 @@ t_start = time.clock()
 # load the data
 time_loading = time.clock()
 spike_trains = spk.load_spike_trains_from_txt("PySpike_testdata.txt",
-                                              time_interval=(0, 4000))
+                                              edges=(0, 4000))
 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))])
+num_of_spikes = sum([len(spike_trains[i].spikes)
+                     for i in xrange(len(spike_trains))])
 print("Number of spikes: %d" % num_of_spikes)
 
 # calculate the multivariate spike distance
diff --git a/examples/plot.py b/examples/plot.py
index d32c464..9670286 100644
--- a/examples/plot.py
+++ b/examples/plot.py
@@ -17,11 +17,11 @@ import matplotlib.pyplot as plt
 import pyspike as spk
 
 spike_trains = spk.load_spike_trains_from_txt("PySpike_testdata.txt",
-                                              time_interval=(0, 4000))
+                                              edges=(0, 4000))
 
 # plot the spike time
-for (i, spikes) in enumerate(spike_trains):
-    plt.plot(spikes, i*np.ones_like(spikes), 'o')
+for (i, spike_train) in enumerate(spike_trains):
+    plt.plot(spike_train.spikes, i*np.ones_like(spike_train.spikes), 'o')
 
 f = spk.isi_profile(spike_trains[0], spike_trains[1])
 x, y = f.get_plottable_data()
diff --git a/examples/spike_sync.py b/examples/spike_sync.py
index 9c5f75c..37dbff4 100644
--- a/examples/spike_sync.py
+++ b/examples/spike_sync.py
@@ -1,12 +1,11 @@
 from __future__ import print_function
 
-import numpy as np
 import matplotlib.pyplot as plt
 
 import pyspike as spk
 
 spike_trains = spk.load_spike_trains_from_txt("../test/SPIKE_Sync_Test.txt",
-                                              time_interval=(0, 4000))
+                                              edges=(0, 4000))
 
 plt.figure()
 
@@ -41,7 +40,7 @@ plt.plot(x1, y1, '-k', lw=2.5, label="averaged SPIKE-Sync profile")
 
 plt.subplot(212)
 
-f_psth = spk.psth(spike_trains, bin_size=5.0)
+f_psth = spk.psth(spike_trains, bin_size=50.0)
 x, y = f_psth.get_plottable_data()
 plt.plot(x, y, '-k', alpha=1.0, label="PSTH")