Changeset 395

Show
Ignore:
Timestamp:
06/26/08 11:16:18 (5 months ago)
Author:
apdavison
Message:

Removed dependence on NeuroTools/pygsl of some of the tests.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/test/simpleNetwork.py

    r391 r395  
    1010 
    1111import sys 
     12import numpy 
    1213 
    1314simulator_name = sys.argv[-1] 
     
    1516exec("from pyNN.%s import *" % simulator_name) 
    1617 
    17 from NeuroTools.stgen import StGen 
     18tstop = 1000.0 
     19rate = 100.0 
    1820 
    19 tstop = 1000.0 
    20  
    21 setup(timestep=0.1,min_delay=1.0,max_delay=1.0) 
     21setup(timestep=0.1, min_delay=0.2, max_delay=1.0) 
    2222     
    2323cell_params = {'tau_refrac':2.0,'v_thresh':-50.0,'tau_syn_E':2.0, 'tau_syn_I':2.0} 
    2424output_population = Population(2, IF_curr_alpha, cell_params, "output") 
    2525 
    26 spikeGenerator = StGen() 
    27 spike_times = list(spikeGenerator.poisson_generator(100.0/1000.0,tstop)) # rate in spikes/ms 
     26number = int(2*tstop*rate/1000.0) 
     27numpy.random.seed(26278342) 
     28spike_times = numpy.add.accumulate(numpy.random.exponential(1000.0/rate, size=number)) 
     29assert spike_times.max() > tstop 
    2830 
    2931input_population  = Population(1, SpikeSourceArray, {'spike_times': spike_times }, "input") 
  • trunk/test/simpleNetworkL.py

    r391 r395  
    1111 
    1212import sys 
     13import numpy 
    1314 
    1415simulator_name = sys.argv[-1] 
     
    1617exec("from pyNN.%s import *" % simulator_name) 
    1718 
    18 from NeuroTools.stgen import StGen 
    19  
    2019tstop = 1000.0 # all times in milliseconds 
     20rate = 100.0 # spikes/s 
    2121 
    2222setup(timestep=0.1,min_delay=0.2) 
     
    2626ifcell2 = create(IF_curr_alpha, cell_params) 
    2727 
    28 spikeGenerator = StGen() 
    29 spike_times = list(spikeGenerator.poisson_generator(100.0/1000.0,tstop)) # rate in spikes/ms 
     28number = int(2*tstop*rate/1000.0) 
     29numpy.random.seed(637645386) 
     30spike_times = numpy.add.accumulate(numpy.random.exponential(1000.0/rate, size=number)) 
     31assert spike_times.max() > tstop 
    3032 
    3133spike_source = create(SpikeSourceArray, {'spike_times': spike_times }) 
     
    3436conn2 = connect(spike_source, ifcell2, weight=1.0) 
    3537     
    36 record_v(ifcell1, "Results/simpleNetworkL_1_%s.v" % simulator_name) 
    37 record_v(ifcell2, "Results/simpleNetworkL_2_%s.v" % simulator_name) 
     38record_v([ifcell1, ifcell2], "Results/simpleNetworkL_%s.v" % simulator_name) 
    3839run(tstop) 
    3940     
  • trunk/test/small_network.py

    r391 r395  
    1111 
    1212import sys 
     13import numpy 
    1314 
    1415simulator_name = sys.argv[-1] 
    1516 
    1617exec("from pyNN.%s import *" % simulator_name) 
    17 from NeuroTools.stgen import StGen 
    1818 
    1919# === Define parameters ======================================================== 
    2020 
    21 n = 10    # Number of cells 
     21n = 5    # Number of cells 
    2222w = 0.2   # synaptic weight (nA) 
    2323cell_params = { 
     
    3838# === Build the network ======================================================== 
    3939 
    40 setup(timestep=dt,max_delay=syn_delay) 
     40setup(timestep=dt, max_delay=syn_delay) 
    4141 
    4242cells = Population((n,), IF_curr_alpha, cell_params, "cells") 
    4343 
    44 spikeGenerator = StGen() 
    45 spike_times = list(spikeGenerator.poisson_generator((input_rate/1000.0),simtime)) # rate in spikes/ms 
     44number = int(2*simtime*input_rate/1000.0) 
     45numpy.random.seed(26278342) 
     46spike_times = numpy.add.accumulate(numpy.random.exponential(1000.0/input_rate, size=number)) 
     47assert spike_times.max() > simtime 
     48 
    4649spike_source = Population((n,), SpikeSourceArray,{'spike_times': spike_times}) 
    4750 
     
    6568 
    6669end() 
    67 sys.exit(0)