Permalink
Browse files

Merge branch 'master' of github.com:bernhardkaplan/bcpnn-mt

  • Loading branch information...
2 parents e7d7a86 + f51d92b commit 605d0b46a435088c6eece5ee384db24916e3b9c7 @bernhardkaplan committed May 11, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 simulation_parameters.py
  2. +2 −2 utils.py
View
@@ -108,7 +108,7 @@ def __init__(self):
x0 (y0) : start position on x-axis (y-axis)
u0 (v0) : velocity in x-direction (y-direction)
"""
- self.params['motion_params'] = (0.5, 0.5, .1, 0) # x0, y0, u0, v0
+ self.params['motion_params'] = (0.5, 0.5, 1., 0) # x0, y0, u0, v0
# ######
# NOISE
View
@@ -174,7 +174,7 @@ def get_input(tuning_prop, motion_params, t, contrast=.9, motion='dot'):
# V_X, V_Y = .5, 0.0
x0, y0, u0, v0 = motion_params
- blur_X, blur_V = .4, .5
+ blur_X, blur_V = .2, .3
# compute the motion energy input to all cells
"""
@@ -191,7 +191,7 @@ def get_input(tuning_prop, motion_params, t, contrast=.9, motion='dot'):
"""
x, y = x0 + u0*t, y0 + v0*t # current position of the blob at timet assuming a perfect translation
- x, y = np.mod(x, 1.), np.mod(y, 1.)
+ x, y = np.mod(x, 1.), np.mod(y, 1.) # we are on a torus
for cell in xrange(n_cells): # todo: vectorize
L[cell] = np.exp( -.5 * (tuning_prop[cell, 0] - x)**2/blur_X**2

0 comments on commit 605d0b4

Please sign in to comment.