Changeset 1044 for trunk

Timestamp:

12/22/11 10:59:00 (5 months ago)

Author:

pierre

Message:

Update the tests in order to take into account Nemo (and dt can not be less than 1 with it, so I may change dt in some scenarios to launch it also, and to deal with the new CurrentSource? syntax. Note that I'm not familiar with the Mock objects, so test with the MockDCSource fails.... Add a scenario to check that changing the amplitude of a DC source on the fly is working

Location:

trunk/test

Files:

• system/scenarios.py (modified) (17 diffs)
• unittests/test_neuron.py (modified) (1 diff)

trunk/test/system/scenarios.py

@@ -18 +18 @@
 
 
-@register()
+@register(exclude=["nemo"])
 def scenario1(sim):
     """
@@ -39 +39 @@
     tstop = 1000.0
     delay = 0.2
+    dt    = 0.1
     weights = {
         'excitatory': 4.0e-3,
@@ -45 +46 @@
     }
        
-    sim.setup(timestep=0.1, threads=n_threads)
+    sim.setup(timestep=dt, min_delay=dt, threads=n_threads)
     all_cells = sim.Population(n_exc+n_inh, sim.IF_cond_exp, cell_params, label="All cells")
     cells = {
@@ -83 +84 @@
 
 
-@register()
+@register(exclude=["nemo"])
 def scenario1a(sim):
     """
@@ -104 +105 @@
     pconn_input = 0.01
     tstop = 1000.0
-    delay = 0.3
+    delay = 1
     w_exc = 3.0e-3
     w_inh = 45.0e-3
     w_input = 0.12
+    dt      = 0.1
        
-    sim.setup(timestep=0.1, threads=n_threads)
+    sim.setup(timestep=dt, min_delay=dt, threads=n_threads)
     excitatory_cells = sim.create(sim.IF_cond_alpha, cell_params, n=n_exc)
     inhibitory_cells = sim.create(sim.IF_cond_alpha, cell_params, n=n_inh)
@@ -134 +136 @@
 
 
-@register(exclude=["moose"])
+@register(exclude=["moose", "nemo"])
 def scenario2(sim):
     """
@@ -162 +164 @@
     neurons.initialize('v', 0.0)
     I = numpy.arange(I0, I0+1.0, 1.0/n)
-    currents = [sim.DCSource(start=t_start, stop=t_start+duration, amplitude=amp)
+    currents = [sim.DCSource({"start" : t_start, "stop" : t_start+duration, "amplitude" :amp})
                 for amp in I]
     for j, (neuron, current) in enumerate(zip(neurons, currents)):
@@ -188 +190 @@
 
 
-@register(exclude=["moose", "brian"])
+@register(exclude=["moose", "nemo", "brian"])
 def scenario3(sim):
     """
@@ -277 +279 @@
     
 
-@register()
+@register(exclude=["nemo"])
 def ticket166(sim):
     """
@@ -292 +294 @@
         pylab.rcParams['interactive'] = interactive
     
-    sim.setup(timestep=dt)
+    sim.setup(timestep=dt, min_delay=dt)
     
     spikesources = sim.Population(2, sim.SpikeSourceArray)
@@ -335 +337 @@
     """
     repeats = 3
-    sim.setup()
-    p = sim.Population(1, sim.IF_cond_exp, {"i_offset": 0.1})
+    dt      = 1
+    sim.setup(timestep=dt, min_delay=dt)
+    p = sim.Population(1, sim.IF_curr_exp, {"i_offset": 0.1})
     p.record_v()
     
@@ -351 +354 @@
 
 
-@register(exclude=['brian', 'pcsim'])
+@register(exclude=['brian', 'pcsim', 'nemo'])
 def test_reset_recording(sim):
     """
@@ -384 +387 @@
     n = 3
     data = []
+    dt   = 1
 
     for i in range(n):
-        sim.setup()
-        p = sim.Population(1, sim.IF_cond_exp, {"i_offset": 0.1})
+        sim.setup(timestep=dt, min_delay=dt)
+        p = sim.Population(1, sim.IF_curr_exp, {"i_offset": 0.1})
         p.record_v()
         sim.run(10.0)
@@ -398 +402 @@
         assert_arrays_equal(rec, data[0])
 
-@register(exclude=['pcsim', 'moose'])
+@register(exclude=['pcsim', 'moose', 'nemo'])
 def test_EIF_cond_alpha_isfa_ista(sim):
     sim.setup(timestep=0.01, min_delay=0.1, max_delay=4.0)
@@ -410 +414 @@
     sim.end()
 
-@register(exclude=['pcsim'])
+@register(exclude=['pcsim', 'nemo'])
 def test_HH_cond_exp(sim):
     sim.setup(timestep=0.001, min_delay=0.1)
@@ -437 +441 @@
     
 
-@register(exclude=['pcsim', 'moose'])
+@register(exclude=['pcsim', 'moose', 'nemo'])
 def test_record_vm_and_gsyn_from_assembly(sim):
     from pyNN.utility import init_logging
     init_logging(logfile=None, debug=True)
-    dt = 0.1
+    dt    = 0.1
     tstop = 100.0
-    sim.setup(timestep=dt)
+    sim.setup(timestep=dt, min_delay=dt)
     cells = sim.Population(5, sim.IF_cond_exp) + sim.Population(6, sim.EIF_cond_exp_isfa_ista)
     inputs = sim.Population(5, sim.SpikeSourcePoisson, {'rate': 50.0})
@@ -481 +485 @@
     sim.end()
 
-@register()
+@register(exclude=["pcsim", "nemo"])
+def test_changing_electrode(sim):
+    """
+    Check that changing the values of the electrodes on the fly is taken into account
+    """
+    repeats = 2
+    dt      = 0.1
+    simtime = 100
+    sim.setup(timestep=dt, min_delay=dt)
+    p = sim.Population(1, sim.IF_curr_exp)
+    c = sim.DCSource({'amplitude' : 0})
+    c.inject_into(p)    
+    p.record_v()
+    
+    data = []
+    for i in range(repeats):
+        sim.run(100.0)
+        c.amplitude += 0.1
+    data.append(p.get_v())
+        
+    sim.end()
+
+    assert data[0][:, 2][simtime/dt] < data[0][:, 2][-1]
+
+
+
+@register(exclude=['nemo'])
 def ticket195(sim):
     """

trunk/test/unittests/test_neuron.py

@@ -42 +42 @@
 class MockDCSource(object):
     parameter_names = ['amplitude', 'start', 'stop']
-    parameters      = {'amplitude' : 0, 'start' : 0, 'stop' : 1e12}
     def __init__(self, parameters):
         self._devices = []