diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-24 16:27:51 +0100 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-24 16:27:51 +0100 |
commit | adab2aa6d573702ca685e8242fd7edccb841ff8c (patch) | |
tree | 20b1a854aea07a26e92771a091c3e83b2ac85e0a | |
parent | f057e34ca084d78a655926f30d5df43e673714fb (diff) |
add empty spike trains when loading from txt
treatment of empty lines was incorrect. now empty spike trains are created
from empty lines in the txt file if parameter ignore_empty_lines=False is
given.
-rw-r--r-- | pyspike/spikes.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pyspike/spikes.py b/pyspike/spikes.py index 966ad69..271adcb 100644 --- a/pyspike/spikes.py +++ b/pyspike/spikes.py @@ -50,11 +50,15 @@ def load_spike_trains_from_txt(file_name, edges, spike_trains = [] with open(file_name, 'r') as spike_file: for line in spike_file: - if len(line) > 1 and not line.startswith(comment): - # use only the lines with actual data and not commented - spike_train = spike_train_from_string(line, edges, - separator, is_sorted) - spike_trains.append(spike_train) + if not line.startswith(comment): # ignore comments + if len(line) > 1: + # ignore empty lines + spike_train = spike_train_from_string(line, edges, + separator, is_sorted) + spike_trains.append(spike_train) + elif not(ignore_empty_lines): + # add empty spike train + spike_trains.append(SpikeTrain([], edges)) return spike_trains |