Changeset 1041

Show
Ignore:
Timestamp:
12/20/11 14:00:21 (5 months ago)
Author:
pierre
Message:

Still some uniformisation of the docstrings accross synapses. Everything should be written only once in standardmodels files

Location:
trunk/src
Files:
6 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/brian/standardmodels/synapses.py

    r1019 r1041  
    2424 
    2525class TsodyksMarkramMechanism(synapses.TsodyksMarkramMechanism): 
    26      
     26 
     27    __doc__ = synapses.TsodyksMarkramMechanism.__doc__     
     28 
    2729    def __init__(self, U=0.5, tau_rec=100.0, tau_facil=0.0, u0=0.0, x0=1.0, y0=0.0): 
    2830        parameters = dict(locals()) 
     
    3638 
    3739class AdditiveWeightDependence(synapses.AdditiveWeightDependence): 
    38      
     40 
     41    __doc__ = synapses.AdditiveWeightDependence.__doc__         
     42 
    3943    def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01): # units? 
    4044        parameters = dict(locals()) 
     
    4650 
    4751class MultiplicativeWeightDependence(synapses.MultiplicativeWeightDependence): 
    48      
     52 
     53    __doc__ = synapses.MultiplicativeWeightDependence.__doc__         
     54 
    4955    def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01): 
    5056        parameters = dict(locals()) 
     
    5561 
    5662class AdditivePotentiationMultiplicativeDepression(synapses.AdditivePotentiationMultiplicativeDepression): 
    57      
     63 
     64    __doc__ = synapses.AdditivePotentiationMultiplicativeDepression.__doc__     
     65 
    5866    def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01): 
    5967        parameters = dict(locals()) 
     
    6472 
    6573 
     74class GutigWeightDependence(synapses.GutigWeightDependence): 
     75 
     76    __doc__ = synapses.GutigWeightDependence.__doc__      
     77         
     78    def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01, mu_plus=0.5, mu_minus=0.5): 
     79        parameters = dict(locals()) 
     80        parameters.pop('self') 
     81        self.parameters = parameters 
     82 
    6683class SpikePairRule(synapses.SpikePairRule): 
    6784     
     85    __doc__ = synapses.SpikePairRule.__doc__ 
     86 
    6887    def __init__(self, tau_plus=20.0, tau_minus=20.0): 
    6988        parameters = dict(locals()) 
  • trunk/src/nemo/standardmodels/cells.py

    r1027 r1041  
    4747class SpikeSourcePoisson(cells.SpikeSourcePoisson): 
    4848     
     49    __doc__ = cells.SpikeSourcePoisson.__doc__  
     50 
    4951    translations = build_translations( 
    5052        ('rate', 'rate'), 
     
    9395class SpikeSourceArray(cells.SpikeSourceArray): 
    9496 
     97    __doc__ = cells.SpikeSourceArray.__doc__     
     98 
    9599    translations = build_translations( 
    96100        ('spike_times', 'spike_times'), 
     
    134138 
    135139class IF_curr_exp(cells.IF_curr_exp): 
    136     """Leaky integrate and fire model with fixed threshold and 
    137     decaying-exponential post-synaptic current. (Separate synaptic currents for 
    138     excitatory and inhibitory synapses.""" 
     140     
     141    __doc__ = cells.IF_curr_exp.__doc__     
     142 
    139143    translations = build_translations( 
    140144        ('v_rest',     'v_rest'), 
  • trunk/src/nemo/standardmodels/synapses.py

    r1020 r1041  
    3030    pass 
    3131 
    32  
    3332class AdditiveWeightDependence(synapses.AdditiveWeightDependence): 
     33     
     34    __doc__ = synapses.AdditiveWeightDependence.__doc__ 
    3435     
    3536    def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01): # units? 
     
    4344class MultiplicativeWeightDependence(synapses.MultiplicativeWeightDependence): 
    4445     
     46    __doc__ = synapses.MultiplicativeWeightDependence.__doc__ 
     47 
    4548    def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01): 
    4649        parameters = dict(locals()) 
     
    5255class AdditivePotentiationMultiplicativeDepression(synapses.AdditivePotentiationMultiplicativeDepression): 
    5356     
     57    __doc__ = synapses.AdditivePotentiationMultiplicativeDepression.__doc__ 
     58 
    5459    def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01): 
    5560        parameters = dict(locals()) 
     
    6065 
    6166 
     67class GutigWeightDependence(standardmodels.ModelNotAvailable): 
     68     
     69    __doc__ = synapses.AdditiveWeightDependence.__doc__ 
     70     
     71    def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01, mu_plus=0.5, mu_minus=0.5): # units? 
     72        parameters = dict(locals()) 
     73        parameters.pop('self') 
     74        self.parameters = parameters 
     75 
    6276class SpikePairRule(synapses.SpikePairRule): 
    63      
     77 
     78    __doc__ = synapses.SpikePairRule.__doc__     
     79 
    6480    def __init__(self, tau_plus=20.0, tau_minus=20.0): 
    6581        parameters = dict(locals()) 
  • trunk/src/nest/standardmodels/synapses.py

    r957 r1041  
    7979class TsodyksMarkramMechanism(synapses.TsodyksMarkramMechanism): 
    8080     
     81    __doc__ = synapses.TsodyksMarkramMechanism.__doc__     
     82 
    8183    translations = build_translations( 
    8284        ('U', 'U'), 
     
    9698 
    9799class AdditiveWeightDependence(synapses.AdditiveWeightDependence): 
    98     """ 
    99     The amplitude of the weight change is fixed for depression (`A_minus`) 
    100     and for potentiation (`A_plus`). 
    101     If the new weight would be less than `w_min` it is set to `w_min`. If it would 
    102     be greater than `w_max` it is set to `w_max`. 
    103     """ 
     100 
     101    __doc__ = synapses.AdditiveWeightDependence.__doc__      
    104102     
    105103    translations = build_translations( 
     
    123121 
    124122class MultiplicativeWeightDependence(synapses.MultiplicativeWeightDependence): 
    125     """ 
    126     The amplitude of the weight change depends on the current weight. 
    127     For depression, Dw propto w-w_min 
    128     For potentiation, Dw propto w_max-w 
    129     """ 
     123     
     124    __doc__ = synapses.MultiplicativeWeightDependence.__doc__     
     125 
    130126    translations = build_translations( 
    131127        ('w_max',     'Wmax',  1000.0), # unit conversion 
     
    147143 
    148144class AdditivePotentiationMultiplicativeDepression(synapses.AdditivePotentiationMultiplicativeDepression): 
    149     """ 
    150     The amplitude of the weight change depends on the current weight for 
    151     depression (Dw propto w-w_min) and is fixed for potentiation. 
    152     """ 
     145     
     146    __doc__ = synapses.AdditivePotentiationMultiplicativeDepression.__doc__    
     147 
    153148    translations = build_translations( 
    154149        ('w_max',     'Wmax',  1000.0), # unit conversion 
     
    171166 
    172167class GutigWeightDependence(synapses.GutigWeightDependence): 
    173     """ 
    174     The amplitude of the weight change depends on the current weight. 
    175     For depression, Dw propto w-w_min 
    176     For potentiation, Dw propto w_max-w 
    177     """ 
     168 
     169    __doc__ = synapses.GutigWeightDependence.__doc__      
     170 
    178171    translations = build_translations( 
    179172        ('w_max',     'Wmax',  1000.0), # unit conversion 
     
    197190class SpikePairRule(synapses.SpikePairRule): 
    198191     
     192    __doc__ = synapses.SpikePairRule.__doc__ 
     193 
    199194    translations = build_translations( 
    200195        ('tau_plus',  'tau_plus'), 
  • trunk/src/neuron/standardmodels/synapses.py

    r957 r1041  
    1212class TsodyksMarkramMechanism(synapses.TsodyksMarkramMechanism): 
    1313     
     14    __doc__ = synapses.TsodyksMarkramMechanism.__doc__     
     15 
    1416    translations = build_translations( 
    1517        ('U', 'U'), 
     
    3032 
    3133class AdditiveWeightDependence(synapses.AdditiveWeightDependence): 
    32     """ 
    33     The amplitude of the weight change is fixed for depression (`A_minus`) 
    34     and for potentiation (`A_plus`). 
    35     If the new weight would be less than `w_min` it is set to `w_min`. If it would 
    36     be greater than `w_max` it is set to `w_max`. 
    37     """ 
     34     
     35    __doc__ = synapses.AdditiveWeightDependence.__doc__ 
    3836     
    3937    translations = build_translations( 
     
    5250 
    5351class MultiplicativeWeightDependence(synapses.MultiplicativeWeightDependence): 
    54     """ 
    55     The amplitude of the weight change depends on the current weight. 
    56     For depression, Dw propto w-w_min 
    57     For potentiation, Dw propto w_max-w 
    58     """ 
     52     
     53    __doc__ = synapses.MultiplicativeWeightDependence.__doc__  
     54 
    5955    translations = build_translations( 
    6056        ('w_max',     'wmax'), 
     
    7167 
    7268class AdditivePotentiationMultiplicativeDepression(synapses.AdditivePotentiationMultiplicativeDepression): 
    73     """ 
    74     The amplitude of the weight change depends on the current weight for 
    75     depression (Dw propto w-w_min) and is fixed for potentiation 
    76     """ 
     69     
     70    __doc__ = synapses.AdditivePotentiationMultiplicativeDepression.__doc__ 
     71 
    7772    translations = build_translations( 
    7873        ('w_max',     'wmax'), 
     
    9287 
    9388 
     89class GutigWeightDependence(synapses.GutigWeightDependence): 
     90     
     91    __doc__ = synapses.GutigWeightDependence.__doc__ 
     92 
     93    translations = build_translations( 
     94        ('w_max',     'wmax'), 
     95        ('w_min',     'wmin'), 
     96        ('A_plus',    'aLTP'), 
     97        ('A_minus',   'aLTD'), 
     98        ('mu_plus',   'muLTP'), 
     99        ('mu_minus',  'muLTD'), 
     100    ) 
     101    possible_models = set(['StdwaGuetig']) 
     102         
     103    def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01, mu_plus=0.5, mu_minus=0.5): 
     104        #synapses.AdditivePotentiationMultiplicativeDepression.__init__(self, w_min, w_max, A_plus, A_minus) 
     105        parameters = dict(locals()) 
     106        parameters.pop('self')  
     107        self.parameters = self.translate(parameters) 
     108 
     109 
    94110class SpikePairRule(synapses.SpikePairRule): 
    95      
     111 
     112    __doc__ = synapses.SpikePairRule.__doc__     
     113 
    96114    translations = build_translations( 
    97115        ('tau_plus',  'tauLTP'), 
  • trunk/src/pcsim/standardmodels/synapses.py

    r957 r1041  
    4848class TsodyksMarkramMechanism(synapses.TsodyksMarkramMechanism): 
    4949     
     50    __doc__ = synapses.TsodyksMarkramMechanism.__doc__ 
     51 
    5052    translations = build_translations( 
    5153        ('U', 'U'), 
     
    6870 
    6971class AdditiveWeightDependence(synapses.AdditiveWeightDependence): 
    70     """ 
    71     The amplitude of the weight change is fixed for depression (`A_minus`) 
    72     and for potentiation (`A_plus`). 
    73     If the new weight would be less than `w_min` it is set to `w_min`. If it would 
    74     be greater than `w_max` it is set to `w_max`. 
    75     """ 
     72     
     73    __doc__ = synapses.AdditiveWeightDependence.__doc__ 
    7674     
    7775    translations = build_translations( 
     
    102100     
    103101class MultiplicativeWeightDependence(synapses.MultiplicativeWeightDependence): 
    104     """ 
    105     The amplitude of the weight change depends on the current weight. 
    106     For depression, Dw propto w-w_min 
    107     For potentiation, Dw propto w_max-w 
    108     """ 
     102     
     103    __doc__ = synapses.MultiplicativeWeightDependence.__doc__ 
     104 
    109105    translations = build_translations( 
    110106        ('w_max',     'Wex',  1e-9), # unit conversion 
     
    130126 
    131127class AdditivePotentiationMultiplicativeDepression(synapses.AdditivePotentiationMultiplicativeDepression): 
    132     """ 
    133     The amplitude of the weight change depends on the current weight for 
    134     depression (Dw propto w-w_min) and is fixed for potentiation. 
    135     """ 
     128     
     129    __doc__ = synapses.AdditivePotentiationMultiplicativeDepression.__doc__ 
     130 
    136131    translations = build_translations( 
    137132        ('w_max',     'Wex',  1e-9), # unit conversion 
     
    156151 
    157152class GutigWeightDependence(synapses.GutigWeightDependence): 
    158     """ 
    159     The amplitude of the weight change depends on the current weight. 
    160     For depression, Dw propto w-w_min 
    161     For potentiation, Dw propto w_max-w 
    162     """ 
     153     
     154    __doc__ = synapses.GutigWeightDependence.__doc__ 
     155 
    163156    translations = build_translations( 
    164157        ('w_max',     'Wex',  1e-9), # unit conversion 
     
    183176 
    184177class SpikePairRule(synapses.SpikePairRule): 
    185      
     178 
     179    __doc__ = synapses.SpikePairRule.__doc__     
     180 
    186181    translations = build_translations( 
    187182        ('tau_plus',  'taupos', 1e-3),