[glumpy] push by Nicolas.Rougier@gmail.com - Cosmetic changes on 2012-03-22 09:05 GMT

[glu...@googlecode.com]

Revision: 3f245ffae339
Author: Nicolas Rougier <Nicolas...@inria.fr>
Date: Thu Mar 22 02:05:20 2012
Log: Cosmetic changes

http://code.google.com/p/glumpy/source/detail?r=3f245ffae339

Modified:
/demos/boids.py
/demos/histogram.py

=======================================
--- /demos/boids.py Thu Mar 22 01:27:10 2012
+++ /demos/boids.py Thu Mar 22 02:05:20 2012
@@ -39,8 +39,8 @@

if __name__ == '__main__':

- fig = figure(size=(800,800))
- trackball = Trackball(65, 135, 1., 2.5)
+ fig = figure(size=(512,512))
+ trackball = Trackball(65, 135, 1., 2.0)

@fig.event
def on_mouse_drag(x, y, dx, dy, button):
@@ -56,7 +56,7 @@
boids['position_1'],
boids['position_2']]):
gl.glColor(0+i*.25,0+i*.25,0+i*.25,0.5)
- gl.glPointSize(6.0-2*i)
+ gl.glPointSize(6.0-i)
gl.glBegin(gl.GL_POINTS)
for j in range(len(boids)):
gl.glVertex( P[j,0], P[j,1], P[j,2] )
@@ -65,15 +65,12 @@

@fig.timer(60.0)
def timer(dt):
- move(boids, dt)
- fig.redraw()
-
- def move(boids,dt):
global t

t += 0.5*dt
target[...] = np.array([np.sin(t),np.sin(2*t),np.cos(3*t)])*.1
- t += .5*dt
+
+ t += 0.5*dt
predator[...] = np.array([np.sin(t),np.sin(2*t),np.cos(3*t)])*.2

boids['position_2'] = boids['position_1']
@@ -93,13 +90,11 @@
A = -(V - V.sum(axis=0)/n)
# Repulsion: steer to avoid crowding local flockmates
R = -((np.repeat(P,n,axis=0).reshape(n,n,3)-P)*Mr).sum(axis=0)
-
- # Target
+ # Target : Follow target
T = target - P
-
- # Predator
+ # Predator : Move away from predator
dP = P - predator
- D = np.maximum(0, .4 - np.sqrt(dP[:,0]**2 +dP[:,1]**2+dP[:,2]**2) )
+ D = np.maximum(0, 0.35 - np.sqrt(dP[:,0]**2
+dP[:,1]**2+dP[:,2]**2) )
dP[:,0] *= D
dP[:,1] *= D
dP[:,2] *= D
@@ -107,6 +102,8 @@
boids['velocity'] += 0.0005*C + 0.01*A + 0.01*R + 0.0005*T +
0.005*dP
boids['position'] += boids['velocity']

+ fig.redraw()
+

t = 0
n = 500
=======================================
--- /demos/histogram.py Thu Mar 22 01:27:10 2012
+++ /demos/histogram.py Thu Mar 22 02:05:20 2012
@@ -121,8 +121,8 @@
if __name__ == '__main__':

- fig = figure(size=(800,800))
- trackball = Trackball(65, 135, 1., 2.5)
+ fig = figure(size=(640,480))
+ trackball = Trackball(65, 135, 1., 2.)
Z = 0.25*gaussian((32,32), center = (.5,.0))
fill, outline = bars(Z)
t = 0