Merge branch 'master' of https://github.com/SpiNNakerManchester/PyNN8Examples

Author: Christian-B

examples/extra_models_examples/IF_cond_exp_stoc.py

@@ -112,7 +112,7 @@
     Panel(exp_data.segments[0].filter(name='gsyn_inh')[0],
           ylabel="gsyn inhibitory (mV)",
           data_labels=[exp_cell.label], yticks=True, xlim=(0, runtime)),
-    title="Simple synfire chain example",
+    title="IF_cond_exp_stoc example",
     annotations="Simulated with {}".format(sim.name())
 )
 plt.show()

examples/extra_models_examples/IF_curr_delta.py

@@ -14,19 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-A single IF neuron with exponential, current-based synapses, fed by two
-spike sources.
-
-Run as:
-
-$ python IF_curr_exp.py <simulator>
-
-where <simulator> is 'neuron', 'nest', etc
-
-Andrew Davison, UNIC, CNRS
-September 2006
-
-$Id$
+A single LIF neuron with two exponential, current-based synapses,
+and two delta, current-based synapses, fed by two spike sources.
 """
 
 import spynnaker8 as sim
@@ -109,7 +98,7 @@
     Panel(exp_data.segments[0].filter(name='gsyn_inh')[0],
           ylabel="gsyn inhibitory (mV)",
           data_labels=[exp_cell.label], yticks=True, xlim=(0, runtime)),
-    title="Simple synfire chain example",
+    title="IF_curr_delta example",
     annotations="Simulated with {}".format(sim.name())
 )
 plt.show()

…els_examples/synfire_if_curr_exp_sEMD.py …xtra_models_examples/IF_curr_exp_sEMD.pyexamples/extra_models_examples/synfire_if_curr_exp_sEMD.py renamed to examples/extra_models_examples/IF_curr_exp_sEMD.py examples/extra_models_examples/synfire_if_curr_exp_sEMD.py renamed to examples/extra_models_examples/IF_curr_exp_sEMD.py

@@ -84,7 +84,7 @@
     Panel(data.segments[0].filter(name='gsyn_inh')[0],
           ylabel="gsyn inhibitory (mV)",
           data_labels=[populations[0].label], yticks=True, xlim=(0, runtime)),
-    title="Simple synfire chain example",
+    title="Synfire chain example  with dual exponential synapse",
     annotations="Simulated with {}".format(p.name())
 )
 plt.show()

examples/extra_models_examples/synfire_if_curr_dual_exp.py

@@ -233,7 +233,7 @@ def poisson_generator(rate, rng, t_start=0.0, t_stop=1000.0, array=True,
     # raster plot of the presynaptic neuron spike times
     Panel(esp.segments[0].spiketrains,
           yticks=True, markersize=1, xlim=(0, sim_time)),
-    title="Simple synfire chain example",
+    title="Brunnel example",
     annotations="Simulated with {}".format(pynn.name())
 )
 plt.show()

examples/pynnBrunnel.py

@@ -190,9 +190,9 @@
 Figure(
     # raster plot of the presynaptic neuron spike times
     Panel(pre_spikes.segments[0].spiketrains,
-          yticks=True, markersize=0.2, xlim=(0, simtime)),
+          yticks=True, markersize=0.5, xlim=(0, simtime)),
     Panel(post_spikes.segments[0].spiketrains,
-          yticks=True, markersize=0.2, xlim=(0, simtime)),
+          yticks=True, markersize=0.5, xlim=(0, simtime)),
     title="stdp example curr",
     annotations="Simulated with {}".format(sim.name()))
 plt.show()

examples/stdp_example.py

@@ -190,9 +190,9 @@
 Figure(
     # raster plot of the presynaptic neuron spike times
     Panel(pre_spikes.segments[0].spiketrains,
-          yticks=True, markersize=0.2, xlim=(0, simtime)),
+          yticks=True, markersize=0.5, xlim=(0, simtime)),
     Panel(post_spikes.segments[0].spiketrains,
-          yticks=True, markersize=0.2, xlim=(0, simtime)),
+          yticks=True, markersize=0.5, xlim=(0, simtime)),
     title="stdp example cond",
     annotations="Simulated with {}".format(sim.name()))
 plt.show()

examples/stdp_example_cond.py

@@ -50,9 +50,8 @@
 injectionConnection_2 = [(1, nNeurons - 1, weight_to_spike, 1)]
 input_1 = list(range(0, run_time, space_between_inputs))
 input_2 = list(range(second_spike_start, run_time, space_between_inputs))
-spikeArray = {'spike_times': [input_1, input_2],
-              'max_on_chip_memory_usage_for_spikes_in_bytes': 640,
-              'space_before_notification': 320}
+spikeArray = {'spike_times': [input_1, input_2]}
+
 main_pop = p.Population(
     nNeurons, p.IF_curr_exp(**cell_params_lif), label='pop_1')
 second_main_pop = p.Population(