From adab2aa6d573702ca685e8242fd7edccb841ff8c Mon Sep 17 00:00:00 2001 From: Mario Mulansky Date: Thu, 24 Mar 2016 16:27:51 +0100 Subject: 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. --- pyspike/spikes.py | 14 +++++++++----- 1 file 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 -- cgit v1.2.3