Context Navigation

← Previous Change
Next Change →

Changeset 1041 for trunk

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

brian/standardmodels/synapses.py (modified) (5 diffs)
nemo/standardmodels/cells.py (modified) (3 diffs)
nemo/standardmodels/synapses.py (modified) (4 diffs)
nest/standardmodels/synapses.py (modified) (6 diffs)
neuron/standardmodels/synapses.py (modified) (5 diffs)
pcsim/standardmodels/synapses.py (modified) (6 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/src/brian/standardmodels/synapses.py

r1019	r1041
24	24
25	25	class TsodyksMarkramMechanism(synapses.TsodyksMarkramMechanism):
26
	26
	27	__doc__ = synapses.TsodyksMarkramMechanism.__doc__
	28
27	29	def __init__(self, U=0.5, tau_rec=100.0, tau_facil=0.0, u0=0.0, x0=1.0, y0=0.0):
28	30	parameters = dict(locals())
…	…
36	38
37	39	class AdditiveWeightDependence(synapses.AdditiveWeightDependence):
38
	40
	41	__doc__ = synapses.AdditiveWeightDependence.__doc__
	42
39	43	def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01): # units?
40	44	parameters = dict(locals())
…	…
46	50
47	51	class MultiplicativeWeightDependence(synapses.MultiplicativeWeightDependence):
48
	52
	53	__doc__ = synapses.MultiplicativeWeightDependence.__doc__
	54
49	55	def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01):
50	56	parameters = dict(locals())
…	…
55	61
56	62	class AdditivePotentiationMultiplicativeDepression(synapses.AdditivePotentiationMultiplicativeDepression):
57
	63
	64	__doc__ = synapses.AdditivePotentiationMultiplicativeDepression.__doc__
	65
58	66	def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01):
59	67	parameters = dict(locals())
…	…
64	72
65	73
	74	class 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
66	83	class SpikePairRule(synapses.SpikePairRule):
67	84
	85	__doc__ = synapses.SpikePairRule.__doc__
	86
68	87	def __init__(self, tau_plus=20.0, tau_minus=20.0):
69	88	parameters = dict(locals())

trunk/src/nemo/standardmodels/cells.py

r1027	r1041
47	47	class SpikeSourcePoisson(cells.SpikeSourcePoisson):
48	48
	49	__doc__ = cells.SpikeSourcePoisson.__doc__
	50
49	51	translations = build_translations(
50	52	('rate', 'rate'),
…	…
93	95	class SpikeSourceArray(cells.SpikeSourceArray):
94	96
	97	__doc__ = cells.SpikeSourceArray.__doc__
	98
95	99	translations = build_translations(
96	100	('spike_times', 'spike_times'),
…	…
134	138
135	139	class 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
139	143	translations = build_translations(
140	144	('v_rest', 'v_rest'),

trunk/src/nemo/standardmodels/synapses.py

r1020	r1041
30	30	pass
31	31
32
33	32	class AdditiveWeightDependence(synapses.AdditiveWeightDependence):
	33
	34	__doc__ = synapses.AdditiveWeightDependence.__doc__
34	35
35	36	def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01): # units?
…	…
43	44	class MultiplicativeWeightDependence(synapses.MultiplicativeWeightDependence):
44	45
	46	__doc__ = synapses.MultiplicativeWeightDependence.__doc__
	47
45	48	def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01):
46	49	parameters = dict(locals())
…	…
52	55	class AdditivePotentiationMultiplicativeDepression(synapses.AdditivePotentiationMultiplicativeDepression):
53	56
	57	__doc__ = synapses.AdditivePotentiationMultiplicativeDepression.__doc__
	58
54	59	def __init__(self, w_min=0.0, w_max=1.0, A_plus=0.01, A_minus=0.01):
55	60	parameters = dict(locals())
…	…
60	65
61	66
	67	class 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
62	76	class SpikePairRule(synapses.SpikePairRule):
63
	77
	78	__doc__ = synapses.SpikePairRule.__doc__
	79
64	80	def __init__(self, tau_plus=20.0, tau_minus=20.0):
65	81	parameters = dict(locals())

trunk/src/nest/standardmodels/synapses.py

r957	r1041
79	79	class TsodyksMarkramMechanism(synapses.TsodyksMarkramMechanism):
80	80
	81	__doc__ = synapses.TsodyksMarkramMechanism.__doc__
	82
81	83	translations = build_translations(
82	84	('U', 'U'),
…	…
96	98
97	99	class 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__
104	102
105	103	translations = build_translations(
…	…
123	121
124	122	class 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
130	126	translations = build_translations(
131	127	('w_max', 'Wmax', 1000.0), # unit conversion
…	…
147	143
148	144	class 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
153	148	translations = build_translations(
154	149	('w_max', 'Wmax', 1000.0), # unit conversion
…	…
171	166
172	167	class 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
178	171	translations = build_translations(
179	172	('w_max', 'Wmax', 1000.0), # unit conversion
…	…
197	190	class SpikePairRule(synapses.SpikePairRule):
198	191
	192	__doc__ = synapses.SpikePairRule.__doc__
	193
199	194	translations = build_translations(
200	195	('tau_plus', 'tau_plus'),

trunk/src/neuron/standardmodels/synapses.py

r957	r1041
12	12	class TsodyksMarkramMechanism(synapses.TsodyksMarkramMechanism):
13	13
	14	__doc__ = synapses.TsodyksMarkramMechanism.__doc__
	15
14	16	translations = build_translations(
15	17	('U', 'U'),
…	…
30	32
31	33	class 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__
38	36
39	37	translations = build_translations(
…	…
52	50
53	51	class 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
59	55	translations = build_translations(
60	56	('w_max', 'wmax'),
…	…
71	67
72	68	class 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
77	72	translations = build_translations(
78	73	('w_max', 'wmax'),
…	…
92	87
93	88
	89	class 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
94	110	class SpikePairRule(synapses.SpikePairRule):
95
	111
	112	__doc__ = synapses.SpikePairRule.__doc__
	113
96	114	translations = build_translations(
97	115	('tau_plus', 'tauLTP'),

trunk/src/pcsim/standardmodels/synapses.py

r957	r1041
48	48	class TsodyksMarkramMechanism(synapses.TsodyksMarkramMechanism):
49	49
	50	__doc__ = synapses.TsodyksMarkramMechanism.__doc__
	51
50	52	translations = build_translations(
51	53	('U', 'U'),
…	…
68	70
69	71	class 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__
76	74
77	75	translations = build_translations(
…	…
102	100
103	101	class 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
109	105	translations = build_translations(
110	106	('w_max', 'Wex', 1e-9), # unit conversion
…	…
130	126
131	127	class 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
136	131	translations = build_translations(
137	132	('w_max', 'Wex', 1e-9), # unit conversion
…	…
156	151
157	152	class 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
163	156	translations = build_translations(
164	157	('w_max', 'Wex', 1e-9), # unit conversion
…	…
183	176
184	177	class SpikePairRule(synapses.SpikePairRule):
185
	178
	179	__doc__ = synapses.SpikePairRule.__doc__
	180
186	181	translations = build_translations(
187	182	('tau_plus', 'taupos', 1e-3),