diff --git a/examples/extra_models_examples/stdp_triplet.py b/examples/extra_models_examples/stdp_triplet.py index 3d3eaac2..4505dbd3 100644 --- a/examples/extra_models_examples/stdp_triplet.py +++ b/examples/extra_models_examples/stdp_triplet.py @@ -152,17 +152,18 @@ def generate_fixed_frequency_test_data( size="xx-large") line_styles = ["--", "-"] -for m_w, d_w, d_e, l, t in zip(weights, data_w, data_e, line_styles, delta_t): +for m_w, d_w, d_e, line_style, t in zip( + weights, data_w, data_e, line_styles, delta_t): # Calculate deltas from end weights delta_w = [(w - start_w) / start_w for w in m_w] # Plot experimental data and error bars axis.errorbar( - frequencies, d_w, yerr=d_e, color="black", linestyle=l, + frequencies, d_w, yerr=d_e, color="black", linestyle=line_style, label=r"Experimental data, delta $(\Delta{t}=%dms)$" % t) # Plot model data - axis.plot(frequencies, delta_w, color="blue", linestyle=l, + axis.plot(frequencies, delta_w, color="blue", linestyle=line_style, label=r"Triplet rule, delta $(\Delta{t}=%dms)$" % t) axis.legend(loc="upper right", bbox_to_anchor=(1.0, 1.0)) diff --git a/pendulum/spike_filter.py b/pendulum/spike_filter.py index 0f0e616d..5bf35a5a 100644 --- a/pendulum/spike_filter.py +++ b/pendulum/spike_filter.py @@ -69,7 +69,7 @@ def send_spikes(width, height, min_x, min_y, run_time, label, connection): start_time = None max_x = min_x + width max_y = min_y + height - y_shift = get_n_bits(width) + y_shift = get_n_bits(width) #noqa 841 with open("spikes.csv") as f: first_time = -1 line = read_csv_line(f) @@ -85,9 +85,9 @@ def send_spikes(width, height, min_x, min_y, run_time, label, connection): line = next_line filtered_lines = [ - l for l in same_time_lines - if (l.x >= min_x and l.x < max_x and l.y >= min_y and - l.y < max_y)] + line for line in same_time_lines + if (line.x >= min_x and line.x < max_x and line.y >= min_y and + line.y < max_y)] if not filtered_lines: continue diff --git a/spiNNaker_start/spinnaker_start.py b/spiNNaker_start/spinnaker_start.py index 2b650e4b..aac8e508 100644 --- a/spiNNaker_start/spinnaker_start.py +++ b/spiNNaker_start/spinnaker_start.py @@ -52,7 +52,7 @@ from spinn_utilities.overrides import overrides from spinnman.config_setup import unittest_setup -from spinnman.spalloc import SpallocClient, SpallocState +from spinnman.spalloc import SpallocClient from spinn_utilities.config_holder import set_config from spinn_machine.machine import Machine