Show
Ignore:
Timestamp:
02/17/10 22:45:18 (2 years ago)
Author:
apdavison
Message:

Moved standard model (cells and synapses) machinery out of the common module into its own module

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/pcsim/synapses.py

    r686 r713  
    55""" 
    66 
    7 from pyNN import common, synapses 
     7from pyNN import standardmodels, synapses 
    88import pypcsim 
    99 
     
    3333                             ]) 
    3434 
    35 SynapseDynamics = common.SynapseDynamics 
     35SynapseDynamics = standardmodels.SynapseDynamics 
    3636         
    37 class STDPMechanism(common.STDPMechanism): 
     37class STDPMechanism(standardmodels.STDPMechanism): 
    3838    """Specification of STDP models.""" 
    3939     
     
    4141                 voltage_dependence=None, dendritic_delay_fraction=1.0): 
    4242        # not sure what the situation is with dendritic_delay_fraction in PCSIM 
    43         common.STDPMechanism.__init__(self, timing_dependence, weight_dependence, 
     43        standardmodels.STDPMechanism.__init__(self, timing_dependence, weight_dependence, 
    4444                                      voltage_dependence, dendritic_delay_fraction) 
    4545 
     
    4747class TsodyksMarkramMechanism(synapses.TsodyksMarkramMechanism): 
    4848     
    49     translations = common.build_translations( 
     49    translations = standardmodels.build_translations( 
    5050        ('U', 'U'), 
    5151        ('tau_rec', 'D', 1e-3), 
     
    7474    """ 
    7575     
    76     translations = common.build_translations( 
     76    translations = standardmodels.build_translations( 
    7777        ('w_max',     'Wex',  1e-9), # unit conversion. This exposes a limitation of the current 
    7878                                     # translation machinery, because this value depends on the 
     
    106106    For potentiation, Dw propto w_max-w 
    107107    """ 
    108     translations = common.build_translations( 
     108    translations = standardmodels.build_translations( 
    109109        ('w_max',     'Wex',  1e-9), # unit conversion 
    110110        ('w_min',     'w_min_always_zero_in_PCSIM'), 
     
    133133    depression (Dw propto w-w_min) and is fixed for potentiation. 
    134134    """ 
    135     translations = common.build_translations( 
     135    translations = standardmodels.build_translations( 
    136136        ('w_max',     'Wex',  1e-9), # unit conversion 
    137137        ('w_min',     'w_min_always_zero_in_PCSIM'), 
     
    160160    For potentiation, Dw propto w_max-w 
    161161    """ 
    162     translations = common.build_translations( 
     162    translations = standardmodels.build_translations( 
    163163        ('w_max',     'Wex',  1e-9), # unit conversion 
    164164        ('w_min',     'w_min_always_zero_in_PCSIM'), 
     
    183183class SpikePairRule(synapses.SpikePairRule): 
    184184     
    185     translations = common.build_translations( 
     185    translations = standardmodels.build_translations( 
    186186        ('tau_plus',  'taupos', 1e-3), 
    187187        ('tau_minus', 'tauneg', 1e-3),