Skip to content

Commit af29fa5

Browse files
chaoming0625chaoming0625
authored
small updates (#188)
small updates
2 parents ec87bb4 + e485ab8 commit af29fa5

File tree

4 files changed

+287
-84
lines changed

4 files changed

+287
-84
lines changed

‎brainpy/dyn/neurons/rate_models.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ def __init__(
673673
wII: Union[float, Tensor, Initializer, Callable] = 11., # local I-I coupling
674674

675675
# Refractory parameter
676-
r: Union[float, Tensor, Initializer, Callable] = 1,
676+
r: Union[float, Tensor, Initializer, Callable] = 1.,
677677

678678
# noise parameters
679679
x_ou_mean: Union[float, Tensor, Initializer, Callable] = 0.0,
@@ -749,7 +749,6 @@ def reset(self):
749749
if self.y_ou is not None:
750750
self.y_ou.reset()
751751

752-
# functions
753752
def F(self, x, a, theta):
754753
return 1 / (1 + bm.exp(-a * (x - theta))) - 1 / (1 + bm.exp(a * theta))
755754

‎brainpy/dyn/synapses/abstract_models.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -133,21 +133,21 @@ def __init__(
133133
raise ValueError(f'Unknown connection type: {conn_type}')
134134

135135
# variables
136-
self.delay_step = self.register_delay(self.pre.name + '.spike',
136+
self.delay_step = self.register_delay(f"{self.pre.name}.spike",
137137
delay_step=delay_step,
138138
delay_target=self.pre.spike)
139139

140140
def reset(self):
141141
if self.delay_step is not None:
142-
self.reset_delay(self.pre.name + '.spike', self.pre.spike)
142+
self.reset_delay(f"{self.pre.name}.spike", self.pre.spike)
143143

144144
def update(self, _t, _dt):
145145
# delays
146146
if self.delay_step is None:
147147
pre_spike = self.pre.spike
148148
else:
149-
pre_spike = self.get_delay_data(self.pre.name + '.spike', delay_step=self.delay_step)
150-
self.update_delay(self.pre.name + '.spike', delay_data=self.pre.spike)
149+
pre_spike = self.get_delay_data(f"{self.pre.name}.spike", delay_step=self.delay_step)
150+
self.update_delay(f"{self.pre.name}.spike", delay_data=self.pre.spike)
151151

152152
# post values
153153
assert self.weight_type in ['homo', 'heter']
@@ -332,23 +332,23 @@ def __init__(
332332

333333
# variables
334334
self.g = bm.Variable(bm.zeros(self.post.num))
335-
self.delay_step = self.register_delay(self.pre.name + '.spike', delay_step, self.pre.spike)
335+
self.delay_step = self.register_delay(f"{self.pre.name}.spike", delay_step, self.pre.spike)
336336

337337
# function
338338
self.integral = odeint(lambda g, t: -g / self.tau, method=method)
339339

340340
def reset(self):
341341
self.g.value = bm.zeros(self.post.num)
342342
if self.delay_step is not None:
343-
self.reset_delay(self.pre.name + '.spike', self.pre.spike)
343+
self.reset_delay(f"{self.pre.name}.spike", self.pre.spike)
344344

345345
def update(self, _t, _dt):
346346
# delays
347347
if self.delay_step is None:
348348
pre_spike = self.pre.spike
349349
else:
350-
pre_spike = self.get_delay_data(self.pre.name + '.spike', self.delay_step)
351-
self.update_delay(self.pre.name + '.spike', self.pre.spike)
350+
pre_spike = self.get_delay_data(f"{self.pre.name}.spike", self.delay_step)
351+
self.update_delay(f"{self.pre.name}.spike", self.pre.spike)
352352

353353
# post values
354354
assert self.weight_type in ['homo', 'heter']
@@ -654,7 +654,7 @@ def __init__(
654654
# variables
655655
self.h = bm.Variable(bm.zeros(self.pre.num))
656656
self.g = bm.Variable(bm.zeros(self.pre.num))
657-
self.delay_step = self.register_delay(self.pre.name + '.spike', delay_step, self.pre.spike)
657+
self.delay_step = self.register_delay(f"{self.pre.name}.spike", delay_step, self.pre.spike)
658658

659659
# integral
660660
self.integral = odeint(method=method, f=JointEq([self.dg, self.dh]))
@@ -663,7 +663,7 @@ def reset(self):
663663
self.h.value = bm.zeros(self.pre.num)
664664
self.g.value = bm.zeros(self.pre.num)
665665
if self.delay_step is not None:
666-
self.reset_delay(self.pre.name + '.spike', self.pre.spike)
666+
self.reset_delay(f"{self.pre.name}.spike", self.pre.spike)
667667

668668
def dh(self, h, t):
669669
return -h / self.tau_rise
@@ -676,8 +676,8 @@ def update(self, _t, _dt):
676676
if self.delay_step is None:
677677
pre_spike = self.pre.spike
678678
else:
679-
pre_spike = self.get_delay_data(self.pre.name + '.spike', self.delay_step)
680-
self.update_delay(self.pre.name + '.spike', self.pre.spike)
679+
pre_spike = self.get_delay_data(f"{self.pre.name}.spike", self.delay_step)
680+
self.update_delay(f"{self.pre.name}.spike", self.pre.spike)
681681

682682
# update synaptic variables
683683
self.g.value, self.h.value = self.integral(self.g, self.h, _t, _dt)
@@ -1240,7 +1240,7 @@ def __init__(
12401240
# variables
12411241
self.g = bm.Variable(bm.zeros(self.pre.num, dtype=bm.float_))
12421242
self.x = bm.Variable(bm.zeros(self.pre.num, dtype=bm.float_))
1243-
self.delay_step = self.register_delay(self.pre.name + '.spike', delay_step, self.pre.spike)
1243+
self.delay_step = self.register_delay(f"{self.pre.name}.spike", delay_step, self.pre.spike)
12441244

12451245
# integral
12461246
self.integral = odeint(method=method, f=JointEq([self.dg, self.dx]))
@@ -1256,8 +1256,8 @@ def update(self, _t, _dt):
12561256
if self.delay_step is None:
12571257
delayed_pre_spike = self.pre.spike
12581258
else:
1259-
delayed_pre_spike = self.get_delay_data(self.pre.name + '.spike', self.delay_step)
1260-
self.update_delay(self.pre.name + '.spike', self.pre.spike)
1259+
delayed_pre_spike = self.get_delay_data(f"{self.pre.name}.spike", self.delay_step)
1260+
self.update_delay(f"{self.pre.name}.spike", self.pre.spike)
12611261

12621262
# update synapse variables
12631263
self.g.value, self.x.value = self.integral(self.g, self.x, _t, dt=_dt)

‎brainpy/dyn/synapses/biological_models.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ def __init__(
191191
# variables
192192
self.g = bm.Variable(bm.zeros(self.pre.num))
193193
self.spike_arrival_time = bm.Variable(bm.ones(self.pre.num) * -1e7)
194-
self.delay_step = self.register_delay(self.pre.name + '.spike',
194+
self.delay_step = self.register_delay(f"{self.pre.name}.spike",
195195
delay_step=delay_step,
196196
delay_target=self.pre.spike)
197197

@@ -201,7 +201,7 @@ def __init__(
201201
def reset(self):
202202
self.g.value = bm.zeros(self.pre.num)
203203
if self.delay_step is not None:
204-
self.reset_delay(self.pre.name + '.spike', self.pre.spike)
204+
self.reset_delay(f"{self.pre.name}.spike", self.pre.spike)
205205

206206
def dg(self, g, t, TT):
207207
dg = self.alpha * TT * (1 - g) - self.beta * g
@@ -212,8 +212,8 @@ def update(self, _t, _dt):
212212
if self.delay_step is None:
213213
pre_spike = self.pre.spike
214214
else:
215-
pre_spike = self.get_delay_data(self.pre.name + '.spike', self.delay_step)
216-
self.update_delay(self.pre.name + '.spike', self.pre.spike)
215+
pre_spike = self.get_delay_data(f"{self.pre.name}.spike", self.delay_step)
216+
self.update_delay(f"{self.pre.name}.spike", self.pre.spike)
217217

218218
# spike arrival time
219219
self.spike_arrival_time.value = bm.where(pre_spike, _t, self.spike_arrival_time)

0 commit comments

Comments
 (0)